5232015 · typeable/swagger2

git.iko.soy/typeable/swagger2

on master help sign in

Merge pull request #190 from GetShopTV/relax-bounds-ghc-8.8

5232015Oleg Grenrus7 years ago

.travis.yml+23−5

compare with master

unifiedsplit

@@ -4,7 +4,7 @@

5# For more information, see https://github.com/haskell-CI/haskell-ci

7−# version: 0.3.20190413

7+# version: 0.3.20190429

9language: c

10dist: xenial

@@ -29,8 +29,11 @@ before_cache:

29 - rm -rfv $CABALHOME/packages/head.hackage

30matrix:

31 include:

32− - compiler: ghc-8.6.4

32+ - compiler: ghc-8.8.1

33+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}

34+ env: GHCHEAD=true

35+ - compiler: ghc-8.6.5

33− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}}

36+ addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}

34 - compiler: ghc-8.4.4

37 - compiler: ghc-8.4.4

35 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}

38 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}

36 - compiler: ghc-8.2.2

39 - compiler: ghc-8.2.2

@@ -41,6 +44,8 @@ matrix:

41 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}

44 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}

42 - compiler: ghc-7.8.4

45 - compiler: ghc-7.8.4

43 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}

46 addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}

47+ allow_failures:

48+ - compiler: ghc-8.8.1

44before_install:

49before_install:

45 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')

50 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')

46 - HCPKG="$HC-pkg"

51 - HCPKG="$HC-pkg"

@@ -86,12 +91,25 @@ install:

86 echo "world-file: $CABALHOME/world" >> $CABALHOME/config

91 echo "world-file: $CABALHOME/world" >> $CABALHOME/config

87 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config

92 echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config

88 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config

93 echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config

94+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config

89 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config

95 echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config

90 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config

96 echo "store-dir: $CABALHOME/store" >> $CABALHOME/config

91 echo "install-dirs user" >> $CABALHOME/config

97 echo "install-dirs user" >> $CABALHOME/config

92 echo " prefix: $CABALHOME" >> $CABALHOME/config

98 echo " prefix: $CABALHOME" >> $CABALHOME/config

93 echo "repository hackage.haskell.org" >> $CABALHOME/config

99 echo "repository hackage.haskell.org" >> $CABALHOME/config

94 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config

100 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config

101+ - |

102+ if $GHCHEAD; then

103+ echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config

104+

105+ echo "repository head.hackage" >> $CABALHOME/config

106+ echo " url: http://head.hackage.haskell.org/" >> $CABALHOME/config

107+ echo " secure: True" >> $CABALHOME/config

108+ echo " root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config

109+ echo " 2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config

110+ echo " 8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config

111+ echo " key-threshold: 3" >> $CABALHOME/config

112+ fi

95 - cat $CABALHOME/config

113 - cat $CABALHOME/config

96 - rm -fv cabal.project cabal.project.local cabal.project.freeze

114 - rm -fv cabal.project cabal.project.local cabal.project.freeze

97 - travis_retry ${CABAL} v2-update -v

115 - travis_retry ${CABAL} v2-update -v

@@ -102,7 +120,7 @@ install:

102 echo 'packages: "."' >> cabal.project

120 echo 'packages: "."' >> cabal.project

103 - |

121 - |

104 echo "write-ghc-environment-files: always" >> cabal.project

122 echo "write-ghc-environment-files: always" >> cabal.project

105− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(swagger2)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

123+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(swagger2)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

106 - cat cabal.project || true

124 - cat cabal.project || true

107 - cat cabal.project.local || true

125 - cat cabal.project.local || true

108 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi

126 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi

@@ -126,7 +144,7 @@ script:

126 echo 'packages: "swagger2-*/*.cabal"' >> cabal.project

144 echo 'packages: "swagger2-*/*.cabal"' >> cabal.project

127 - |

145 - |

128 echo "write-ghc-environment-files: always" >> cabal.project

146 echo "write-ghc-environment-files: always" >> cabal.project

129− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(swagger2)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

147+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(swagger2)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

130 - cat cabal.project || true

148 - cat cabal.project || true

131 - cat cabal.project.local || true

149 - cat cabal.project.local || true

132 # Building...

150 # Building...

src/Data/Swagger/Schema/Generator.hs+4−1

@@ -26,6 +26,8 @@ import Test.QuickCheck (arbitrary)

26import Test.QuickCheck.Gen

27import Test.QuickCheck.Property

29+-- | Note: 'schemaGen' may 'error', if schema type is not specified,

30+-- and cannot be inferred.

29schemaGen :: Definitions Schema -> Schema -> Gen Value

31schemaGen :: Definitions Schema -> Schema -> Gen Value

30schemaGen _ schema

32schemaGen _ schema

31 | Just cases <- schema ^. paramSchema . enum_ = elements cases

33 | Just cases <- schema ^. paramSchema . enum_ = elements cases

@@ -34,7 +36,8 @@ schemaGen defns schema =

34 Nothing ->

36 Nothing ->

35 case inferSchemaTypes schema of

37 case inferSchemaTypes schema of

36 [ inferredType ] -> schemaGen defns (schema & type_ ?~ inferredType)

38 [ inferredType ] -> schemaGen defns (schema & type_ ?~ inferredType)

39+ -- Gen is not MonadFail

37− _ -> fail "unable to infer schema type"

40+ _ -> error "unable to infer schema type"

38 Just SwaggerBoolean -> Bool <$> elements [True, False]

41 Just SwaggerBoolean -> Bool <$> elements [True, False]

39 Just SwaggerNull -> pure Null

42 Just SwaggerNull -> pure Null

40 Just SwaggerNumber

43 Just SwaggerNumber

swagger2.cabal+5−4

@@ -29,7 +29,8 @@ tested-with:

29 || ==8.0.2

30 || ==8.2.2

31 || ==8.4.4

32− || ==8.6.4

32+ || ==8.6.5

33+ || ==8.8.1

34custom-setup

35custom-setup

35 setup-depends:

36 setup-depends:

@@ -64,7 +65,7 @@ library

64 , bytestring >=0.10.4.0 && <0.11

65 , bytestring >=0.10.4.0 && <0.11

65 , containers >=0.5.5.1 && <0.7

66 , containers >=0.5.5.1 && <0.7

66 , template-haskell >=2.9.0.0 && <2.15

67 , template-haskell >=2.9.0.0 && <2.15

67− , time >=1.4.2 && <1.9

68+ , time >=1.4.2 && <1.10

68 , transformers >=0.3.0.0 && <0.6

69 , transformers >=0.3.0.0 && <0.6

70 build-depends:

71 build-depends:

@@ -78,11 +79,11 @@ library

78 -- cookie 0.4.3 is needed by GHC 7.8 due to time>=1.4 constraint

79 -- cookie 0.4.3 is needed by GHC 7.8 due to time>=1.4 constraint

79 , cookie >=0.4.3 && <0.5

80 , cookie >=0.4.3 && <0.5

80 , generics-sop >=0.3.2.0 && <0.6

81 , generics-sop >=0.3.2.0 && <0.6

81− , hashable >=1.2.7.0 && <1.3

82+ , hashable >=1.2.7.0 && <1.4

82 , http-media >=0.7.1.2 && <0.9

83 , http-media >=0.7.1.2 && <0.9

83 , insert-ordered-containers >=0.2.1.0 && <0.3

84 , insert-ordered-containers >=0.2.1.0 && <0.3

84 , lens >=4.16.1 && <4.18

85 , lens >=4.16.1 && <4.18

85− , network >=2.6.3.5 && <3.1

86+ , network >=2.6.3.5 && <3.2

86 , scientific >=0.3.6.2 && <0.4

87 , scientific >=0.3.6.2 && <0.4

87 , transformers-compat >=0.3 && <0.7

88 , transformers-compat >=0.3 && <0.7

88 , unordered-containers >=0.2.9.0 && <0.3

89 , unordered-containers >=0.2.9.0 && <0.3