From f9989bbf79d46d4cbb6333e39915f1f2ad0651c9 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 15 Sep 2019 18:22:05 +0300 Subject: [PATCH 1/4] Updates: 2019-09 --- .travis.yml | 67 ++++++++++++++++++++++++---------------- CHANGELOG.yaml | 6 ++++ cabal.haskell-ci | 7 +++++ cabal.project | 2 ++ servant-quickcheck.cabal | 16 +++++----- 5 files changed, 64 insertions(+), 34 deletions(-) create mode 100644 cabal.haskell-ci create mode 100644 cabal.project diff --git a/.travis.yml b/.travis.yml index 9f1c2b3..b28fa71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ # This Travis job script has been generated by a script via # -# haskell-ci '--branches' 'master' '-o' '.travis.yml' 'servant-quickcheck.cabal' +# haskell-ci '--config=cabal.haskell-ci' 'servant-quickcheck.cabal' # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.3.20190413 +# version: 0.5.20190908 # language: c dist: xenial @@ -29,23 +29,27 @@ before_cache: - rm -rfv $CABALHOME/packages/head.hackage matrix: include: - - compiler: ghc-8.6.4 - addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}} + - compiler: ghc-8.8.1 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}} + - compiler: ghc-8.6.5 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}} - compiler: ghc-8.4.4 - addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}} + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}} - compiler: ghc-8.2.2 - addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}} + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}} - compiler: ghc-8.0.2 - addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}} + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}} before_install: - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//') + - WITHCOMPILER="-w $HC" + - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//') - HCPKG="$HC-pkg" - unset CC - CABAL=/opt/ghc/bin/cabal - CABALHOME=$HOME/.cabal - export PATH="$CABALHOME/bin:$PATH" - TOP=$(pwd) - - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) + - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')" - echo $HCNUMVER - CABAL="$CABAL -vnormal+nowrap+markoutput" - set -o pipefail @@ -72,22 +76,27 @@ install: - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - TEST=--enable-tests - BENCH=--enable-benchmarks - - GHCHEAD=${GHCHEAD-false} + - HEADHACKAGE=false - rm -f $CABALHOME/config - | echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config echo "remote-build-reporting: anonymous" >> $CABALHOME/config + echo "write-ghc-environment-files: always" >> $CABALHOME/config echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config echo "world-file: $CABALHOME/world" >> $CABALHOME/config echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config + echo "installdir: $CABALHOME/bin" >> $CABALHOME/config echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config echo "store-dir: $CABALHOME/store" >> $CABALHOME/config echo "install-dirs user" >> $CABALHOME/config echo " prefix: $CABALHOME" >> $CABALHOME/config echo "repository hackage.haskell.org" >> $CABALHOME/config echo " url: http://hackage.haskell.org/" >> $CABALHOME/config + - | + echo "program-default-options" >> $CABALHOME/config + echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config - cat $CABALHOME/config - rm -fv cabal.project cabal.project.local cabal.project.freeze - travis_retry ${CABAL} v2-update -v @@ -95,18 +104,17 @@ install: - rm -rf cabal.project cabal.project.local cabal.project.freeze - touch cabal.project - | - echo 'packages: "."' >> cabal.project + echo "packages: ." >> cabal.project - | - echo "write-ghc-environment-files: always" >> cabal.project - - "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" + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-quickcheck)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true - cat cabal.project.local || true - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi - - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output + - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" - rm cabal.project.freeze - - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output - - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output script: - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) # Packaging... @@ -114,32 +122,39 @@ script: # Unpacking... - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - cd ${DISTDIR} || false - - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; + - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \; + - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \; + - PKGDIR_servant_quickcheck="$(find . -maxdepth 1 -type d -regex '.*/servant-quickcheck-[0-9.]*')" # Generate cabal.project - rm -rf cabal.project cabal.project.local cabal.project.freeze - touch cabal.project - | - echo 'packages: "servant-quickcheck-*/*.cabal"' >> cabal.project + echo "packages: ${PKGDIR_servant_quickcheck}" >> cabal.project - | - echo "write-ghc-environment-files: always" >> cabal.project - - "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" + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-quickcheck)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - cat cabal.project || true - cat cabal.project.local || true # Building... # this builds all libraries and executables (without tests/benchmarks) - - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output # Building with tests and benchmarks... # build & run tests, build benchmarks - - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output # Testing... - - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output + - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output # cabal check... - - (cd servant-quickcheck-* && ${CABAL} -vnormal check) + - (cd ${PKGDIR_servant_quickcheck} && ${CABAL} -vnormal check) # haddock... - - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output + - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output # Building without installed constraints for packages in global-db... - rm -f cabal.project.local - - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output + # Constraint sets + - rm -rf cabal.project.local + # Constraint set base-compat-0.10 + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.10.*' all | color_cabal_output + # Constraint set base-compat-0.11 + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all | color_cabal_output -# REGENDATA ["--branches","master","-o",".travis.yml","servant-quickcheck.cabal"] +# REGENDATA ["--config=cabal.haskell-ci","servant-quickcheck.cabal"] # EOF diff --git a/CHANGELOG.yaml b/CHANGELOG.yaml index 786ca24..d3488ca 100644 --- a/CHANGELOG.yaml +++ b/CHANGELOG.yaml @@ -1,5 +1,11 @@ releases: + - version: "0.8" + changes: + - description: Support GHC-8.8. Allow newer versions of other dependencies. + authors: phadej + date: 2019-09-15 + - version: "0.0.7.3" changes: - description: Support for servant-0.14 diff --git a/cabal.haskell-ci b/cabal.haskell-ci new file mode 100644 index 0000000..f9157cc --- /dev/null +++ b/cabal.haskell-ci @@ -0,0 +1,7 @@ +branches: master + +constraint-set base-compat-0.10 + constraints: base-compat ==0.10.* + +constraint-set base-compat-0.11 + constraints: base-compat ==0.11.* diff --git a/cabal.project b/cabal.project new file mode 100644 index 0000000..b0a523c --- /dev/null +++ b/cabal.project @@ -0,0 +1,2 @@ +packages: . +tests: true diff --git a/servant-quickcheck.cabal b/servant-quickcheck.cabal index d415809..00151bd 100644 --- a/servant-quickcheck.cabal +++ b/servant-quickcheck.cabal @@ -1,5 +1,5 @@ name: servant-quickcheck -version: 0.0.7.4 +version: 0.0.8 synopsis: QuickCheck entire APIs description: This packages provides QuickCheck properties that are tested across an entire @@ -13,7 +13,7 @@ category: Web build-type: Simple cabal-version: >=1.10 extra-source-files: CHANGELOG.yaml -tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.4 +tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || == 8.8.1 source-repository head type: git @@ -35,11 +35,11 @@ library build-depends: aeson >=0.8 && <2 - , base >=4.9 && <4.13 - , base-compat-batteries >=0.10.1 && <0.11 + , base >=4.9 && <4.14 + , base-compat-batteries >=0.10.1 && <0.12 , bytestring >=0.10 && <0.11 , case-insensitive >=1.2 && <1.3 - , clock >=0.7 && <0.8 + , clock >=0.7 && <0.9 , data-default-class >=0.0 && <0.2 , hspec >=2.5.6 && <2.8 , http-client >=0.4.30 && <0.7 @@ -56,11 +56,11 @@ library , string-conversions >=0.3 && <0.5 , temporary >=1.2 && <1.4 , text >=1 && <2 - , time >=1.5 && <1.9 - , warp >=3.2.4 && <3.3 + , time >=1.5 && <1.10 + , warp >=3.2.4 && <3.4 if !impl(ghc >=8.0) - build-depends: semigroups >=0.18.3 && <0.19 + build-depends: semigroups >=0.18.3 && <0.20 hs-source-dirs: src default-extensions: From 8e8e9b501b6909ec81f1f71c417e347b65765633 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 16 Sep 2019 02:10:04 +0300 Subject: [PATCH 2/4] Change version back to 0.0.7.4 There are no changes since the tag in the src/ --- CHANGELOG.yaml | 6 ------ servant-quickcheck.cabal | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.yaml b/CHANGELOG.yaml index d3488ca..786ca24 100644 --- a/CHANGELOG.yaml +++ b/CHANGELOG.yaml @@ -1,11 +1,5 @@ releases: - - version: "0.8" - changes: - - description: Support GHC-8.8. Allow newer versions of other dependencies. - authors: phadej - date: 2019-09-15 - - version: "0.0.7.3" changes: - description: Support for servant-0.14 diff --git a/servant-quickcheck.cabal b/servant-quickcheck.cabal index 00151bd..20cb5e7 100644 --- a/servant-quickcheck.cabal +++ b/servant-quickcheck.cabal @@ -1,5 +1,6 @@ name: servant-quickcheck -version: 0.0.8 +version: 0.0.7.4 +x-revision: 1 synopsis: QuickCheck entire APIs description: This packages provides QuickCheck properties that are tested across an entire From 13d32d6768750687f1f9b8093e8ba96d1ef799ca Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Thu, 23 Jan 2020 23:38:03 +0200 Subject: [PATCH 3/4] Support servant-0.17 --- .travis.yml | 72 ++++++++----------- CHANGELOG.yaml | 5 ++ servant-quickcheck.cabal | 9 ++- .../QuickCheck/Internal/HasGenRequest.hs | 15 ++-- 4 files changed, 49 insertions(+), 52 deletions(-) diff --git a/.travis.yml b/.travis.yml index b28fa71..ff561d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,11 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.5.20190908 +# version: 0.9.20200121 # +version: ~> 1.0 language: c +os: linux dist: xenial git: # whether to recursively clone submodules @@ -18,6 +20,7 @@ cache: directories: - $HOME/.cabal/packages - $HOME/.cabal/store + - $HOME/.hlint before_cache: - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log # remove files that are regenerated by 'cabal update' @@ -27,18 +30,23 @@ before_cache: - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx - rm -rfv $CABALHOME/packages/head.hackage -matrix: +jobs: include: - compiler: ghc-8.8.1 - addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}} + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}} + os: linux - compiler: ghc-8.6.5 - addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}} + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}} + os: linux - compiler: ghc-8.4.4 - addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}} + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}} + os: linux - compiler: ghc-8.2.2 - addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}} + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}} + os: linux - compiler: ghc-8.0.2 - addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}} + addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}} + os: linux before_install: - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//') - WITHCOMPILER="-w $HC" @@ -51,29 +59,8 @@ before_install: - TOP=$(pwd) - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')" - echo $HCNUMVER - - CABAL="$CABAL -vnormal+nowrap+markoutput" + - CABAL="$CABAL -vnormal+nowrap" - set -o pipefail - - | - echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk - echo 'BEGIN { state = "output"; }' >> .colorful.awk - echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk - echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk - echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk - echo ' if (state == "cabal") {' >> .colorful.awk - echo ' print blue($0)' >> .colorful.awk - echo ' } else {' >> .colorful.awk - echo ' print $0' >> .colorful.awk - echo ' }' >> .colorful.awk - echo '}' >> .colorful.awk - - cat .colorful.awk - - | - color_cabal_output () { - awk -f $TOP/.colorful.awk - } - - echo text | color_cabal_output -install: - - ${CABAL} --version - - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - TEST=--enable-tests - BENCH=--enable-benchmarks - HEADHACKAGE=false @@ -94,6 +81,9 @@ install: echo " prefix: $CABALHOME" >> $CABALHOME/config echo "repository hackage.haskell.org" >> $CABALHOME/config echo " url: http://hackage.haskell.org/" >> $CABALHOME/config +install: + - ${CABAL} --version + - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - | echo "program-default-options" >> $CABALHOME/config echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config @@ -110,15 +100,15 @@ install: - cat cabal.project || true - cat cabal.project.local || true - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi - - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output + - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" - rm cabal.project.freeze - - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output - - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all script: - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) # Packaging... - - ${CABAL} v2-sdist all | color_cabal_output + - ${CABAL} v2-sdist all # Unpacking... - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - cd ${DISTDIR} || false @@ -136,25 +126,25 @@ script: - cat cabal.project.local || true # Building... # this builds all libraries and executables (without tests/benchmarks) - - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all # Building with tests and benchmarks... # build & run tests, build benchmarks - - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all # Testing... - - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output + - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all # cabal check... - (cd ${PKGDIR_servant_quickcheck} && ${CABAL} -vnormal check) # haddock... - - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output + - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all # Building without installed constraints for packages in global-db... - rm -f cabal.project.local - - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all # Constraint sets - rm -rf cabal.project.local # Constraint set base-compat-0.10 - - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.10.*' all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.10.*' all # Constraint set base-compat-0.11 - - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all -# REGENDATA ["--config=cabal.haskell-ci","servant-quickcheck.cabal"] +# REGENDATA ("0.9.20200121",["--config=cabal.haskell-ci","servant-quickcheck.cabal"]) # EOF diff --git a/CHANGELOG.yaml b/CHANGELOG.yaml index 786ca24..184234c 100644 --- a/CHANGELOG.yaml +++ b/CHANGELOG.yaml @@ -1,4 +1,9 @@ releases: + - version: "0.0.8.0" + changes: + - description: Support for servant-0.17 + authors: phadej + date: 2019-01-23 - version: "0.0.7.3" changes: diff --git a/servant-quickcheck.cabal b/servant-quickcheck.cabal index 20cb5e7..ed42aba 100644 --- a/servant-quickcheck.cabal +++ b/servant-quickcheck.cabal @@ -1,6 +1,5 @@ name: servant-quickcheck -version: 0.0.7.4 -x-revision: 1 +version: 0.0.8.0 synopsis: QuickCheck entire APIs description: This packages provides QuickCheck properties that are tested across an entire @@ -50,9 +49,9 @@ library , pretty >=1.1 && <1.2 , process >=1.2 && <1.7 , QuickCheck >=2.7 && <2.14 - , servant >=0.16 && <0.17 - , servant-client >=0.16 && <0.17 - , servant-server >=0.16 && <0.17 + , servant >=0.17 && <0.18 + , servant-client >=0.17 && <0.18 + , servant-server >=0.17 && <0.18 , split >=0.2 && <0.3 , string-conversions >=0.3 && <0.5 , temporary >=1.2 && <1.4 diff --git a/src/Servant/QuickCheck/Internal/HasGenRequest.hs b/src/Servant/QuickCheck/Internal/HasGenRequest.hs index 81fede8..042299b 100644 --- a/src/Servant/QuickCheck/Internal/HasGenRequest.hs +++ b/src/Servant/QuickCheck/Internal/HasGenRequest.hs @@ -63,18 +63,14 @@ instance (KnownSymbol path, HasGenRequest b) => HasGenRequest (path :> b) where (oldf, old) = genRequest (Proxy :: Proxy b) new = cs $ symbolVal (Proxy :: Proxy path) -#if MIN_VERSION_servant(0,11,0) instance HasGenRequest EmptyAPI where genRequest _ = (0, error "EmptyAPIs cannot be queried.") -#endif -#if MIN_VERSION_servant(0,12,0) instance HasGenRequest api => HasGenRequest (Summary d :> api) where genRequest _ = genRequest (Proxy :: Proxy api) instance HasGenRequest api => HasGenRequest (Description d :> api) where genRequest _ = genRequest (Proxy :: Proxy api) -#endif instance (Arbitrary c, HasGenRequest b, ToHttpApiData c ) => HasGenRequest (Capture' mods x c :> b) where @@ -86,7 +82,6 @@ instance (Arbitrary c, HasGenRequest b, ToHttpApiData c ) (oldf, old) = genRequest (Proxy :: Proxy b) new = arbitrary :: Gen c -#if MIN_VERSION_servant(0,8,0) instance (Arbitrary c, HasGenRequest b, ToHttpApiData c ) => HasGenRequest (CaptureAll x c :> b) where genRequest _ = (oldf, do @@ -97,7 +92,6 @@ instance (Arbitrary c, HasGenRequest b, ToHttpApiData c ) where (oldf, old) = genRequest (Proxy :: Proxy b) new = arbitrary :: Gen [c] -#endif instance (Arbitrary c, KnownSymbol h, HasGenRequest b, ToHttpApiData c) => HasGenRequest (Header' mods h c :> b) where @@ -174,6 +168,15 @@ instance (ReflectMethod method) , method = reflectMethod (Proxy :: Proxy method) }) +instance (ReflectMethod method) + => HasGenRequest (NoContentVerb (method :: k)) where + genRequest _ = (1, return $ \burl -> defaultRequest + { host = cs $ baseUrlHost burl + , port = baseUrlPort burl + , secure = baseUrlScheme burl == Https + , method = reflectMethod (Proxy :: Proxy method) + }) + instance (HasGenRequest a) => HasGenRequest (RemoteHost :> a) where genRequest _ = genRequest (Proxy :: Proxy a) From 2bf03e822a897c88c06da7e1be739cd36243cb4b Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Sun, 7 Jun 2020 09:58:56 +0200 Subject: [PATCH 4/4] Relax constraints for GHC 8.10 --- servant-quickcheck.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/servant-quickcheck.cabal b/servant-quickcheck.cabal index ed42aba..90b2349 100644 --- a/servant-quickcheck.cabal +++ b/servant-quickcheck.cabal @@ -35,20 +35,20 @@ library build-depends: aeson >=0.8 && <2 - , base >=4.9 && <4.14 + , base >=4.9 && <4.15 , base-compat-batteries >=0.10.1 && <0.12 , bytestring >=0.10 && <0.11 , case-insensitive >=1.2 && <1.3 , clock >=0.7 && <0.9 , data-default-class >=0.0 && <0.2 , hspec >=2.5.6 && <2.8 - , http-client >=0.4.30 && <0.7 + , http-client >=0.4.30 && <0.8 , http-media >=0.6 && <0.9 , http-types >=0.8 && <0.13 , mtl >=2.1 && <2.3 , pretty >=1.1 && <1.2 , process >=1.2 && <1.7 - , QuickCheck >=2.7 && <2.14 + , QuickCheck >=2.7 && <2.15 , servant >=0.17 && <0.18 , servant-client >=0.17 && <0.18 , servant-server >=0.17 && <0.18 @@ -56,7 +56,7 @@ library , string-conversions >=0.3 && <0.5 , temporary >=1.2 && <1.4 , text >=1 && <2 - , time >=1.5 && <1.10 + , time >=1.5 && <1.11 , warp >=3.2.4 && <3.4 if !impl(ghc >=8.0)