git.iko.soy/servant-quickcheck
on master help sign in
Merge pull request #62 from haskell-servant/servant-0.16

Allow servant-0.16

commit638580ba49a1854feca81bc639865c2e8a080d12 authorOleg Grenrus <oleg.grenrus@iki.fi> dateThu 28 Feb 2019, 00:05 (8 years ago) parente69d4028803b1c
2 files changed+161−158
compare with master
unifiedsplit
.travis.yml+48−45 servant-quickcheck.cabal+113−113
.travis.yml+48−45
@@ -1,11 +1,11 @@
11# This Travis job script has been generated by a script via
22#
3−# runghc make_travis_yml_2.hs '--branch' 'master' '-o' '.travis.yml' 'servant-quickcheck.cabal'
3+# haskell-ci '--branches' 'master' '-o' '.travis.yml' 'servant-quickcheck.cabal'
44#
55# For more information, see https://github.com/haskell-CI/haskell-ci
66#
77language: c
8−sudo: false
8+dist: xenial
99
1010git:
1111 submodules: false # whether to recursively clone submodules
@@ -20,68 +20,68 @@ cache:
2020 - $HOME/.cabal/store
2121
2222before_cache:
23− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
23+ - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2424 # remove files that are regenerated by 'cabal update'
25− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
26− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
27− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
28− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
29− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
25+ - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
26+ - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
27+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
28+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
29+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
3030
31− - rm -rfv $HOME/.cabal/packages/head.hackage
31+ - rm -rfv $CABALHOME/packages/head.hackage
3232
3333matrix:
3434 include:
35− - compiler: "ghc-8.6.1"
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]}}
35+ - compiler: "ghc-8.6.3"
36+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}
3837 - compiler: "ghc-8.4.4"
39− # env: TEST=--disable-tests BENCH=--disable-benchmarks
4038 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
4139 - compiler: "ghc-8.2.2"
42− # env: TEST=--disable-tests BENCH=--disable-benchmarks
4340 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
4441 - compiler: "ghc-8.0.2"
45− # env: TEST=--disable-tests BENCH=--disable-benchmarks
4642 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
4743 - compiler: "ghc-7.10.3"
48− # env: TEST=--disable-tests BENCH=--disable-benchmarks
4944 addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
5045
5146before_install:
52− - HC=${CC}
47+ - HC=/opt/ghc/bin/${CC}
48+ - HCVER=$(echo "$TRAVIS_COMPILER" | sed 's/ghc-//')
49+ - echo $HCVER
5350 - HCPKG=${HC/ghc/ghc-pkg}
5451 - unset CC
52+ - CABAL=/opt/ghc/bin/cabal
53+ - CABALHOME=$HOME/.cabal
54+ - export PATH="$CABALHOME/bin:$PATH"
5555 - ROOTDIR=$(pwd)
56− - mkdir -p $HOME/.local/bin
57− - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
5856 - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
5957 - echo $HCNUMVER
6058
6159install:
62− - cabal --version
60+ - ${CABAL} --version
6361 - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
64− - BENCH=${BENCH---enable-benchmarks}
65− - TEST=${TEST---enable-tests}
66− - HADDOCK=${HADDOCK-true}
67− - UNCONSTRAINED=${UNCONSTRAINED-true}
68− - NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
62+ - TEST=--enable-tests
63+ - BENCH=--enable-benchmarks
6964 - GHCHEAD=${GHCHEAD-false}
70− - travis_retry cabal update -v
71− - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
65+ - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CABALHOME=$APPDATA/cabal; else export CABALHOME=$HOME/.cabal; fi
66+ - travis_retry ${CABAL} update -v
67+ - sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config
7268 - rm -fv cabal.project cabal.project.local
73− - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
74− - "printf 'packages: \".\"\\n' > cabal.project"
69+ - grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'
70+ - rm -f cabal.project
71+ - touch cabal.project
72+ - "printf 'packages: \".\"\\n' >> cabal.project"
73+ - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
7574 - touch cabal.project.local
76− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant-quickcheck | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
75+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-quickcheck)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
7776 - cat cabal.project || true
7877 - cat cabal.project.local || true
79− - if [ -f "./configure.ac" ]; then
80− (cd "." && autoreconf -i);
81− fi
78+ - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
8279 - rm -f cabal.project.freeze
83− - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
84− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
80+ - ${CABAL} new-freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry
81+ - "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
82+ - rm "cabal.project.freeze"
83+ - ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
84+ - ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
8585 - rm -rf .ghc.environment.* "."/dist
8686 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
8787
@@ -89,30 +89,33 @@ install:
8989# any command which exits with a non-zero exit code causes the build to fail.
9090script:
9191 # test that source-distributions can be generated
92− - cabal new-sdist all
92+ - ${CABAL} new-sdist all
9393 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
9494 - cd ${DISTDIR} || false
9595 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
96− - "printf 'packages: servant-quickcheck-*/*.cabal\\n' > cabal.project"
96+ - rm -f cabal.project
97+ - touch cabal.project
98+ - "printf 'packages: \"servant-quickcheck-*/*.cabal\"\\n' >> cabal.project"
99+ - "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
97100 - touch cabal.project.local
98− - "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant-quickcheck | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
101+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-quickcheck)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
99102 - cat cabal.project || true
100103 - cat cabal.project.local || true
101104 # this builds all libraries and executables (without tests/benchmarks)
102− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
105+ - ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all
103106
104107 # build & run tests, build benchmarks
105− - cabal new-build -w ${HC} ${TEST} ${BENCH} all
106− - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
108+ - ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all
109+ - if [ "x$TEST" = "x--enable-tests" ]; then ${CABAL} new-test -w ${HC} ${TEST} ${BENCH} all; fi
107110
108111 # cabal check
109− - (cd servant-quickcheck-* && cabal check)
112+ - (cd servant-quickcheck-* && ${CABAL} check)
110113
111114 # haddock
112− - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
115+ - ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all
113116
114117 # Build without installed constraints for packages in global-db
115− - if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi
118+ - rm -f cabal.project.local; ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all;
116119
117−# REGENDATA ["--branch","master","-o",".travis.yml","servant-quickcheck.cabal"]
120+# REGENDATA ["--branches","master","-o",".travis.yml","servant-quickcheck.cabal"]
118121# EOF
servant-quickcheck.cabal+113−113
@@ -1,29 +1,22 @@
1−name: servant-quickcheck
2−version: 0.0.7.3
3−synopsis: QuickCheck entire APIs
1+name: servant-quickcheck
2+version: 0.0.7.3
3+synopsis: QuickCheck entire APIs
44description:
5− This packages provides QuickCheck properties that are tested across an entire
6− API.
7−
8−license: BSD3
9−license-file: LICENSE
10−author: Julian K. Arni
11−maintainer: jkarni@gmail.com
12−category: Web
13−build-type: Simple
14−cabal-version: >=1.10
15−extra-source-files:
16− CHANGELOG.yaml
17−tested-with:
18− GHC ==7.10.3
19− || ==8.0.2
20− || ==8.2.2
21− || ==8.4.4
22− || ==8.6.1
5+ This packages provides QuickCheck properties that are tested across an entire
6+ API.
237
8+license: BSD3
9+license-file: LICENSE
10+author: Julian K. Arni
11+maintainer: jkarni@gmail.com
12+category: Web
13+build-type: Simple
14+cabal-version: >=1.10
15+extra-source-files: CHANGELOG.yaml
16+tested-with: GHC ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3
2417
2518source-repository head
26− type: git
19+ type: git
2720 location: https://github.com/haskell-servant/servant-quickcheck
2821
2922flag long-tests
@@ -31,108 +24,115 @@ flag long-tests
3124 default: False
3225
3326library
34− exposed-modules: Servant.QuickCheck
35− , Servant.QuickCheck.Internal
36− , Servant.QuickCheck.Internal.Predicates
37− , Servant.QuickCheck.Internal.HasGenRequest
38− , Servant.QuickCheck.Internal.QuickCheck
39− , Servant.QuickCheck.Internal.Equality
40− , Servant.QuickCheck.Internal.ErrorTypes
41− build-depends: base >=4.8 && <4.13
42− , base-compat-batteries >= 0.10.1 && <0.11
43− , aeson > 0.8 && < 2
44− , bytestring == 0.10.*
45− , case-insensitive == 1.2.*
46− , clock >= 0.7 && < 0.8
47− , data-default-class >= 0.0 && < 0.2
48− , hspec >= 2.5.6 && < 2.6
27+ exposed-modules:
28+ Servant.QuickCheck
29+ Servant.QuickCheck.Internal
30+ Servant.QuickCheck.Internal.Equality
31+ Servant.QuickCheck.Internal.ErrorTypes
32+ Servant.QuickCheck.Internal.HasGenRequest
33+ Servant.QuickCheck.Internal.Predicates
34+ Servant.QuickCheck.Internal.QuickCheck
35+
36+ build-depends:
37+ aeson >=0.8 && <2
38+ , base >=4.8 && <4.13
39+ , base-compat-batteries >=0.10.1 && <0.11
40+ , bytestring >=0.10 && <0.11
41+ , case-insensitive >=1.2 && <1.3
42+ , clock >=0.7 && <0.8
43+ , data-default-class >=0.0 && <0.2
44+ , hspec >=2.5.6 && <2.8
45+ , http-client >=0.4.30 && <0.7
46+ , http-media >=0.6 && <0.8
47+ , http-types >=0.8 && <0.13
48+ , mtl >=2.1 && <2.3
49+ , pretty >=1.1 && <1.2
50+ , process >=1.2 && <1.7
51+ , QuickCheck >=2.7 && <2.13
52+ , servant >=0.13 && <0.15
53+ , servant-client >=0.13 && <0.15
54+ , servant-server >=0.13 && <0.15
55+ , split >=0.2 && <0.3
56+ , string-conversions >=0.3 && <0.5
57+ , temporary >=1.2 && <1.4
58+ , text >=1 && <2
59+ , time >=1.5 && <1.9
60+ , warp >=3.2.4 && <3.3
4961
50− , http-client >= 0.4.30 && < 0.6
51− , http-media >= 0.6 && <0.8
52− , http-types > 0.8 && < 0.13
53− , mtl > 2.1 && < 2.3
54− , pretty == 1.1.*
55− , process >= 1.2 && < 1.7
56− , QuickCheck > 2.7 && < 2.13
57− , servant >= 0.13 && < 0.15
58− , servant-client >= 0.13 && < 0.15
59− , servant-server >= 0.13 && < 0.15
60− , split == 0.2.*
61− , string-conversions > 0.3 && < 0.5
62− , temporary >= 1.2 && <1.4
63− , text == 1.*
64− , time >= 1.5 && < 1.9
65− , warp >= 3.2.4 && < 3.3
62+ if !impl(ghc >=8.0)
63+ build-depends: semigroups >=0.18.3 && <0.19
6664
67− if !impl(ghc >= 8.0)
68− build-depends:
69− semigroups >= 0.18.3 && <0.19
65+ hs-source-dirs: src
66+ default-extensions:
67+ NoImplicitPrelude
68+ ConstraintKinds
69+ DataKinds
70+ DeriveDataTypeable
71+ DeriveFunctor
72+ DeriveGeneric
73+ FlexibleContexts
74+ FlexibleInstances
75+ FunctionalDependencies
76+ GADTs
77+ KindSignatures
78+ MultiParamTypeClasses
79+ OverloadedStrings
80+ RankNTypes
81+ ScopedTypeVariables
82+ TypeOperators
7083
71− hs-source-dirs: src
72− default-extensions: TypeOperators
73− , FlexibleInstances
74− , FlexibleContexts
75− , DataKinds
76− , GADTs
77− , MultiParamTypeClasses
78− , DeriveFunctor
79− , KindSignatures
80− , RankNTypes
81− , ConstraintKinds
82− , DeriveGeneric
83− , ScopedTypeVariables
84− , OverloadedStrings
85− , FunctionalDependencies
86− , NoImplicitPrelude
87− , DeriveDataTypeable
88− default-language: Haskell2010
84+ default-language: Haskell2010
8985
9086test-suite spec
91− type: exitcode-stdio-1.0
92− ghc-options: -Wall -threaded
93− default-language: Haskell2010
94− hs-source-dirs: test
95− main-is: Spec.hs
96− other-modules: Servant.QuickCheck.InternalSpec
97− build-tool-depends: hspec-discover:hspec-discover
98− build-depends: base
99− , base-compat-batteries
100− , aeson
101− , servant-quickcheck
102− , bytestring
103− , hspec
104− , hspec-core >= 2.5.5 && < 2.6
105− , http-client
106− , blaze-html
107− , warp
108− , servant-server
109− , servant-client
110− , servant
111− , servant-blaze
112− , transformers
113− , QuickCheck
114− , quickcheck-io
115− default-extensions: TypeOperators
116− , FlexibleInstances
117− , FlexibleContexts
118− , GADTs
119− , DataKinds
120− , NoImplicitPrelude
121− , OverloadedStrings
122− , ScopedTypeVariables
87+ type: exitcode-stdio-1.0
88+ ghc-options: -Wall -threaded
89+ default-language: Haskell2010
90+ hs-source-dirs: test
91+ main-is: Spec.hs
92+ other-modules: Servant.QuickCheck.InternalSpec
93+ build-tool-depends: hspec-discover:hspec-discover -any
94+ build-depends:
95+ aeson
96+ , base
97+ , base-compat-batteries
98+ , blaze-html
99+ , bytestring
100+ , hspec
101+ , hspec-core >=2.5.5 && <2.8
102+ , http-client
103+ , QuickCheck
104+ , quickcheck-io
105+ , servant
106+ , servant-blaze
107+ , servant-client
108+ , servant-quickcheck
109+ , servant-server
110+ , transformers
111+ , warp
112+
113+ default-extensions:
114+ NoImplicitPrelude
115+ DataKinds
116+ FlexibleContexts
117+ FlexibleInstances
118+ GADTs
119+ OverloadedStrings
120+ ScopedTypeVariables
121+ TypeOperators
122+
123123 if flag(long-tests)
124− cpp-options: -DLONG_TESTS
124+ cpp-options: -DLONG_TESTS
125125
126126test-suite example
127− type: exitcode-stdio-1.0
128− main-is: Main.hs
129− hs-source-dirs:
130− example
131− ghc-options: -Wall
127+ type: exitcode-stdio-1.0
128+ main-is: Main.hs
129+ hs-source-dirs: example
130+ ghc-options: -Wall
132131 build-depends:
133132 base
134133 , hspec
135− , servant-server
136134 , servant-quickcheck
135+ , servant-server
137136 , text
137+
138138 default-language: Haskell2010