haskell/servant-quickcheck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #63 from haskell-servant/updates

Browse Source 
Support servant-0.16 and http-media-0.8
This commit is contained in:
Oleg Grenrus 2019-04-17 12:28:42 +03:00 committed by GitHub
commit f6fb9033e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 97 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
.travis.yml
View File

@ -4,21 +4,20 @@
# #
# For more information, see https://github.com/haskell-CI/haskell-ci # For more information, see https://github.com/haskell-CI/haskell-ci
# #
# version: 0.3.20190413
#
language: c language: c
dist: xenial dist: xenial
git: git:
submodules: false # whether to recursively clone submodules # whether to recursively clone submodules
submodules: false
branches: branches:
only: only:
- master - master
cache: cache:
directories: directories:
- $HOME/.cabal/packages - $HOME/.cabal/packages
- $HOME/.cabal/store - $HOME/.cabal/store
before_cache: before_cache:
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
# remove files that are regenerated by 'cabal update' # remove files that are regenerated by 'cabal update'
@ -27,95 +26,120 @@ before_cache:
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
- rm -rfv $CABALHOME/packages/head.hackage - rm -rfv $CABALHOME/packages/head.hackage
matrix: matrix:
include: include:
- compiler: "ghc-8.6.3" - compiler: ghc-8.6.4
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}} addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.4","cabal-install-2.4"]}}
- compiler: "ghc-8.4.4" - compiler: ghc-8.4.4
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}} addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
- compiler: "ghc-8.2.2" - compiler: ghc-8.2.2
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}} addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
- compiler: "ghc-8.0.2" - compiler: ghc-8.0.2
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}} addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
- compiler: "ghc-7.10.3"
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
before_install: before_install:
- HC=/opt/ghc/bin/${CC} - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
- HCVER=$(echo "$TRAVIS_COMPILER" | sed 's/ghc-//') - HCPKG="$HC-pkg"
- echo $HCVER
- HCPKG=${HC/ghc/ghc-pkg}
- unset CC - unset CC
- CABAL=/opt/ghc/bin/cabal - CABAL=/opt/ghc/bin/cabal
- CABALHOME=$HOME/.cabal - CABALHOME=$HOME/.cabal
- export PATH="$CABALHOME/bin:$PATH" - export PATH="$CABALHOME/bin:$PATH"
- ROOTDIR=$(pwd) - TOP=$(pwd)
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
- echo $HCNUMVER - echo $HCNUMVER
- CABAL="$CABAL -vnormal+nowrap+markoutput"
- 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: install:
- ${CABAL} --version - ${CABAL} --version
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
- TEST=--enable-tests - TEST=--enable-tests
- BENCH=--enable-benchmarks - BENCH=--enable-benchmarks
- GHCHEAD=${GHCHEAD-false} - GHCHEAD=${GHCHEAD-false}
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CABALHOME=$APPDATA/cabal; else export CABALHOME=$HOME/.cabal; fi - rm -f $CABALHOME/config
- travis_retry ${CABAL} update -v - |
- sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
- rm -fv cabal.project cabal.project.local echo "remote-build-reporting: anonymous" >> $CABALHOME/config
- grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$' echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
- rm -f cabal.project 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 "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
- cat $CABALHOME/config
- rm -fv cabal.project cabal.project.local cabal.project.freeze
- travis_retry ${CABAL} v2-update -v
# Generate cabal.project
- rm -rf cabal.project cabal.project.local cabal.project.freeze
- touch cabal.project - touch cabal.project
- "printf 'packages: \".\"\\n' >> cabal.project" - |
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project" echo 'packages: "."' >> cabal.project
- touch cabal.project.local - |
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)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- cat cabal.project || true - cat cabal.project || true
- cat cabal.project.local || true - cat cabal.project.local || true
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
- rm -f cabal.project.freeze - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
- ${CABAL} new-freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
- "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" - rm cabal.project.freeze
- rm "cabal.project.freeze" - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
- rm -rf .ghc.environment.* "."/dist
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
# Here starts the actual work to be performed for the package under test;
# any command which exits with a non-zero exit code causes the build to fail.
script: script:
# test that source-distributions can be generated - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
- ${CABAL} new-sdist all # Packaging...
- ${CABAL} v2-sdist all | color_cabal_output
# Unpacking...
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
- cd ${DISTDIR} || false - cd ${DISTDIR} || false
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
- rm -f cabal.project # Generate cabal.project
- rm -rf cabal.project cabal.project.local cabal.project.freeze
- touch cabal.project - touch cabal.project
- "printf 'packages: \"servant-quickcheck-*/*.cabal\"\\n' >> cabal.project" - |
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project" echo 'packages: "servant-quickcheck-*/*.cabal"' >> cabal.project
- touch cabal.project.local - |
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)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
- cat cabal.project || true - cat cabal.project || true
- cat cabal.project.local || true - cat cabal.project.local || true
# Building...
# this builds all libraries and executables (without tests/benchmarks) # this builds all libraries and executables (without tests/benchmarks)
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
# Building with tests and benchmarks...
# build & run tests, build benchmarks # build & run tests, build benchmarks
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
- if [ "x$TEST" = "x--enable-tests" ]; then ${CABAL} new-test -w ${HC} ${TEST} ${BENCH} all; fi # Testing...
- ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
# cabal check # cabal check...
- (cd servant-quickcheck-* && ${CABAL} check) - (cd servant-quickcheck-* && ${CABAL} -vnormal check)
# haddock...
# haddock - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
- ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all # Building without installed constraints for packages in global-db...
- rm -f cabal.project.local
# Build without installed constraints for packages in global-db - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks all | color_cabal_output
- rm -f cabal.project.local; ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all;
# REGENDATA ["--branches","master","-o",".travis.yml","servant-quickcheck.cabal"] # REGENDATA ["--branches","master","-o",".travis.yml","servant-quickcheck.cabal"]
# EOF # EOF

16
servant-quickcheck.cabal
View File

@ -1,5 +1,5 @@
name: servant-quickcheck name: servant-quickcheck
version: 0.0.7.3 version: 0.0.7.4
synopsis: QuickCheck entire APIs synopsis: QuickCheck entire APIs
description: description:
This packages provides QuickCheck properties that are tested across an entire This packages provides QuickCheck properties that are tested across an entire
@ -13,7 +13,7 @@ category: Web
build-type: Simple build-type: Simple
cabal-version: >=1.10 cabal-version: >=1.10
extra-source-files: CHANGELOG.yaml extra-source-files: CHANGELOG.yaml
tested-with: GHC ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3 tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.4
source-repository head source-repository head
type: git type: git
@ -35,7 +35,7 @@ library
build-depends: build-depends:
aeson >=0.8 && <2 aeson >=0.8 && <2
, base >=4.8 && <4.13 , base >=4.9 && <4.13
, base-compat-batteries >=0.10.1 && <0.11 , base-compat-batteries >=0.10.1 && <0.11
, bytestring >=0.10 && <0.11 , bytestring >=0.10 && <0.11
, case-insensitive >=1.2 && <1.3 , case-insensitive >=1.2 && <1.3
@ -43,15 +43,15 @@ library
, data-default-class >=0.0 && <0.2 , data-default-class >=0.0 && <0.2
, hspec >=2.5.6 && <2.8 , hspec >=2.5.6 && <2.8
, http-client >=0.4.30 && <0.7 , http-client >=0.4.30 && <0.7
, http-media >=0.6 && <0.8 , http-media >=0.6 && <0.9
, http-types >=0.8 && <0.13 , http-types >=0.8 && <0.13
, mtl >=2.1 && <2.3 , mtl >=2.1 && <2.3
, pretty >=1.1 && <1.2 , pretty >=1.1 && <1.2
, process >=1.2 && <1.7 , process >=1.2 && <1.7
, QuickCheck >=2.7 && <2.13 , QuickCheck >=2.7 && <2.14
, servant >=0.13 && <0.15 , servant >=0.16 && <0.17
, servant-client >=0.13 && <0.15 , servant-client >=0.16 && <0.17
, servant-server >=0.13 && <0.15 , servant-server >=0.16 && <0.17
, split >=0.2 && <0.3 , split >=0.2 && <0.3
, string-conversions >=0.3 && <0.5 , string-conversions >=0.3 && <0.5
, temporary >=1.2 && <1.4 , temporary >=1.2 && <1.4

14
test/Servant/QuickCheck/InternalSpec.hs
View File

@ -23,12 +23,7 @@ import Test.QuickCheck.Gen (generate, unGen)
import Test.QuickCheck.Random (mkQCGen) import Test.QuickCheck.Random (mkQCGen)
#if MIN_VERSION_servant(0,8,0) import Servant.Test.ComprehensiveAPI (comprehensiveAPIWithoutStreamingOrRaw)
import Servant.API.Internal.Test.ComprehensiveAPI (comprehensiveAPIWithoutRaw)
#else
import Servant.API.Internal.Test.ComprehensiveAPI (ComprehensiveAPI,
comprehensiveAPI)
#endif
import Servant.QuickCheck import Servant.QuickCheck
import Servant.QuickCheck.Internal (genRequest, runGenRequest, import Servant.QuickCheck.Internal (genRequest, runGenRequest,
@ -154,7 +149,7 @@ isComprehensiveSpec :: Spec
isComprehensiveSpec = describe "HasGenRequest" $ do isComprehensiveSpec = describe "HasGenRequest" $ do
it "has instances for all 'servant' combinators" $ do it "has instances for all 'servant' combinators" $ do
let _g = genRequest comprehensiveAPIWithoutRaw let _g = genRequest comprehensiveAPIWithoutStreamingOrRaw
True `shouldBe` True -- This is a type-level check True `shouldBe` True -- This is a type-level check
deepPathSpec :: Spec deepPathSpec :: Spec
@ -374,8 +369,3 @@ noOfTestCases = 20000
#else #else
noOfTestCases = 1000 noOfTestCases = 1000
#endif #endif
#if !MIN_VERSION_servant(0,8,0)
comprehensiveAPIWithoutRaw :: Proxy ComprehensiveAPI
comprehensiveAPIWithoutRaw = comprehensiveAPI
#endif