git.iko.soy/typeable/swagger2
on master help sign in
Merge pull request #170 from phadej/relax-bounds
99dfd9fOleg Grenrus
.travis.yml+4−5
compare with master
unifiedsplit
@@ -35,9 +35,9 @@ matrix:
35 - compiler: "ghc-8.6.1"
35 - compiler: "ghc-8.6.1"
36 # env: TEST=--disable-tests BENCH=--disable-benchmarks
36 # env: TEST=--disable-tests BENCH=--disable-benchmarks
37 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
37 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
38− - compiler: "ghc-8.4.3"
38+ - compiler: "ghc-8.4.4"
39 # env: TEST=--disable-tests BENCH=--disable-benchmarks
39 # env: TEST=--disable-tests BENCH=--disable-benchmarks
40− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
40+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
41 - compiler: "ghc-8.2.2"
41 - compiler: "ghc-8.2.2"
42 env: HADDOCK=false
42 env: HADDOCK=false
43 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
43 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
@@ -92,8 +92,8 @@ install:
92# any command which exits with a non-zero exit code causes the build to fail.
92# any command which exits with a non-zero exit code causes the build to fail.
93script:
93script:
94 # test that source-distributions can be generated
94 # test that source-distributions can be generated
95− - (cd "." && cabal sdist)
95+ - cabal new-sdist all
96− - mv "."/dist/swagger2-*.tar.gz ${DISTDIR}/
96+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
97 - cd ${DISTDIR} || false
97 - cd ${DISTDIR} || false
98 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
98 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
99 - "printf 'packages: swagger2-*/*.cabal\\n' > cabal.project"
99 - "printf 'packages: swagger2-*/*.cabal\\n' > cabal.project"
@@ -112,7 +112,6 @@ script:
112 - (cd swagger2-* && cabal check)
112 - (cd swagger2-* && cabal check)
113
113
114 # haddock
114 # haddock
115− - rm -rf ./dist-newstyle
116 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
115 - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
117
116
118 # Build without installed constraints for packages in global-db
117 # Build without installed constraints for packages in global-db
swagger2.cabal+4−3
@@ -1,6 +1,7 @@
1cabal-version: >=1.10
1cabal-version: >=1.10
2name: swagger2
2name: swagger2
3version: 2.3.0.1
3version: 2.3.0.1
4+x-revision: 1
4
5
5synopsis: Swagger 2.0 data model
6synopsis: Swagger 2.0 data model
6category: Web, Swagger
7category: Web, Swagger
@@ -28,7 +29,7 @@ tested-with:
28 || ==7.10.3
29 || ==7.10.3
29 || ==8.0.2
30 || ==8.0.2
30 || ==8.2.2
31 || ==8.2.2
31− || ==8.4.3
32+ || ==8.4.4
32 || ==8.6.1
33 || ==8.6.1
33
34
34custom-setup
35custom-setup
@@ -79,7 +80,7 @@ library
79 , http-media >=0.7.1.2 && <0.8
80 , http-media >=0.7.1.2 && <0.8
80 , insert-ordered-containers >=0.2.1.0 && <0.3
81 , insert-ordered-containers >=0.2.1.0 && <0.3
81 , lens >=4.16.1 && <4.18
82 , lens >=4.16.1 && <4.18
82− , network >=2.6.3.5 && <2.8
83+ , network >=2.6.3.5 && <2.9
83 , scientific >=0.3.6.2 && <0.4
84 , scientific >=0.3.6.2 && <0.4
84 , transformers-compat >=0.3 && <0.7
85 , transformers-compat >=0.3 && <0.7
85 , unordered-containers >=0.2.9.0 && <0.3
86 , unordered-containers >=0.2.9.0 && <0.3
@@ -116,7 +117,7 @@ test-suite spec
116 build-depends:
117 build-depends:
117 hspec >=2.5.5 && <2.6
118 hspec >=2.5.5 && <2.6
118 , HUnit >=1.6.0.0 && <1.7
119 , HUnit >=1.6.0.0 && <1.7
119− , QuickCheck >=2.11.3 && <2.12
120+ , QuickCheck >=2.11.3 && <2.13
120 , quickcheck-instances >=0.3.19 && <0.14
121 , quickcheck-instances >=0.3.19 && <0.14
121 , utf8-string >=1.0.1.1 && <1.1
122 , utf8-string >=1.0.1.1 && <1.1
122
123