git.iko.soy/servant-quickcheck
on master help sign in
Merge pull request #68 from haskell-servant/servant-0.17
092ebe5Oleg Grenrus
.travis.yml+31−41
compare with master
unifiedsplit
@@ -4,9 +4,11 @@
4#
4#
5# For more information, see https://github.com/haskell-CI/haskell-ci
5# For more information, see https://github.com/haskell-CI/haskell-ci
6#
6#
7−# version: 0.5.20190908
7+# version: 0.9.20200121
8#
8#
9+version: ~> 1.0
9language: c
10language: c
11+os: linux
10dist: xenial
12dist: xenial
11git:
13git:
12 # whether to recursively clone submodules
14 # whether to recursively clone submodules
@@ -18,6 +20,7 @@ cache:
18 directories:
20 directories:
19 - $HOME/.cabal/packages
21 - $HOME/.cabal/packages
20 - $HOME/.cabal/store
22 - $HOME/.cabal/store
23+ - $HOME/.hlint
21before_cache:
24before_cache:
22 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
25 - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
23 # remove files that are regenerated by 'cabal update'
26 # remove files that are regenerated by 'cabal update'
@@ -27,18 +30,23 @@ before_cache:
27 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
30 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
28 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
31 - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
29 - rm -rfv $CABALHOME/packages/head.hackage
32 - rm -rfv $CABALHOME/packages/head.hackage
30−matrix:
33+jobs:
31 include:
34 include:
32 - compiler: ghc-8.8.1
35 - compiler: ghc-8.8.1
33− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
36+ 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"]}}
37+ os: linux
34 - compiler: ghc-8.6.5
38 - compiler: ghc-8.6.5
35− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
39+ 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"]}}
40+ os: linux
36 - compiler: ghc-8.4.4
41 - compiler: ghc-8.4.4
37− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
42+ 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"]}}
43+ os: linux
38 - compiler: ghc-8.2.2
44 - compiler: ghc-8.2.2
39− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
45+ 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"]}}
46+ os: linux
40 - compiler: ghc-8.0.2
47 - compiler: ghc-8.0.2
41− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
48+ 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"]}}
49+ os: linux
42before_install:
50before_install:
43 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
51 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
44 - WITHCOMPILER="-w $HC"
52 - WITHCOMPILER="-w $HC"
@@ -51,29 +59,8 @@ before_install:
51 - TOP=$(pwd)
59 - TOP=$(pwd)
52 - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
60 - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
53 - echo $HCNUMVER
61 - echo $HCNUMVER
54− - CABAL="$CABAL -vnormal+nowrap+markoutput"
62+ - CABAL="$CABAL -vnormal+nowrap"
55 - set -o pipefail
63 - set -o pipefail
56− - |
57− echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
58− echo 'BEGIN { state = "output"; }' >> .colorful.awk
59− echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
60− echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
61− echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
62− echo ' if (state == "cabal") {' >> .colorful.awk
63− echo ' print blue($0)' >> .colorful.awk
64− echo ' } else {' >> .colorful.awk
65− echo ' print $0' >> .colorful.awk
66− echo ' }' >> .colorful.awk
67− echo '}' >> .colorful.awk
68− - cat .colorful.awk
69− - |
70− color_cabal_output () {
71− awk -f $TOP/.colorful.awk
72− }
73− - echo text | color_cabal_output
74−install:
75− - ${CABAL} --version
76− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
77 - TEST=--enable-tests
64 - TEST=--enable-tests
78 - BENCH=--enable-benchmarks
65 - BENCH=--enable-benchmarks
79 - HEADHACKAGE=false
66 - HEADHACKAGE=false
@@ -94,6 +81,9 @@ install:
94 echo " prefix: $CABALHOME" >> $CABALHOME/config
81 echo " prefix: $CABALHOME" >> $CABALHOME/config
95 echo "repository hackage.haskell.org" >> $CABALHOME/config
82 echo "repository hackage.haskell.org" >> $CABALHOME/config
96 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
83 echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
84+install:
85+ - ${CABAL} --version
86+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
97 - |
87 - |
98 echo "program-default-options" >> $CABALHOME/config
88 echo "program-default-options" >> $CABALHOME/config
99 echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
89 echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
@@ -110,15 +100,15 @@ install:
110 - cat cabal.project || true
100 - cat cabal.project || true
111 - cat cabal.project.local || true
101 - cat cabal.project.local || true
112 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
102 - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
113− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
103+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
114 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
104 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
115 - rm cabal.project.freeze
105 - rm cabal.project.freeze
116− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
106+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
117− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
107+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
118script:
108script:
119 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
109 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
120 # Packaging...
110 # Packaging...
121− - ${CABAL} v2-sdist all | color_cabal_output
111+ - ${CABAL} v2-sdist all
122 # Unpacking...
112 # Unpacking...
123 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
113 - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
124 - cd ${DISTDIR} || false
114 - cd ${DISTDIR} || false
@@ -136,25 +126,25 @@ script:
136 - cat cabal.project.local || true
126 - cat cabal.project.local || true
137 # Building...
127 # Building...
138 # this builds all libraries and executables (without tests/benchmarks)
128 # this builds all libraries and executables (without tests/benchmarks)
139− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
129+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
140 # Building with tests and benchmarks...
130 # Building with tests and benchmarks...
141 # build & run tests, build benchmarks
131 # build & run tests, build benchmarks
142− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
132+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
143 # Testing...
133 # Testing...
144− - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
134+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
145 # cabal check...
135 # cabal check...
146 - (cd ${PKGDIR_servant_quickcheck} && ${CABAL} -vnormal check)
136 - (cd ${PKGDIR_servant_quickcheck} && ${CABAL} -vnormal check)
147 # haddock...
137 # haddock...
148− - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
138+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
149 # Building without installed constraints for packages in global-db...
139 # Building without installed constraints for packages in global-db...
150 - rm -f cabal.project.local
140 - rm -f cabal.project.local
151− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
141+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
152 # Constraint sets
142 # Constraint sets
153 - rm -rf cabal.project.local
143 - rm -rf cabal.project.local
154 # Constraint set base-compat-0.10
144 # Constraint set base-compat-0.10
155− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.10.*' all | color_cabal_output
145+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.10.*' all
156 # Constraint set base-compat-0.11
146 # Constraint set base-compat-0.11
157− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all | color_cabal_output
147+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all
158
148
159−# REGENDATA ["--config=cabal.haskell-ci","servant-quickcheck.cabal"]
149+# REGENDATA ("0.9.20200121",["--config=cabal.haskell-ci","servant-quickcheck.cabal"])
160# EOF
150# EOF
CHANGELOG.yaml+5
@@ -1,4 +1,9 @@
1releases:
1releases:
2+ - version: "0.0.8.0"
3+ changes:
4+ - description: Support for servant-0.17
5+ authors: phadej
6+ date: 2019-01-23
2
7
3 - version: "0.0.7.3"
8 - version: "0.0.7.3"
4 changes:
9 changes:
servant-quickcheck.cabal+4−5
@@ -1,6 +1,5 @@
1name: servant-quickcheck
1name: servant-quickcheck
2−version: 0.0.7.4
2+version: 0.0.8.0
3−x-revision: 1
4synopsis: QuickCheck entire APIs
3synopsis: QuickCheck entire APIs
5description:
4description:
6 This packages provides QuickCheck properties that are tested across an entire
5 This packages provides QuickCheck properties that are tested across an entire
@@ -50,9 +49,9 @@ library
50 , pretty >=1.1 && <1.2
49 , pretty >=1.1 && <1.2
51 , process >=1.2 && <1.7
50 , process >=1.2 && <1.7
52 , QuickCheck >=2.7 && <2.14
51 , QuickCheck >=2.7 && <2.14
53− , servant >=0.16 && <0.17
52+ , servant >=0.17 && <0.18
54− , servant-client >=0.16 && <0.17
53+ , servant-client >=0.17 && <0.18
55− , servant-server >=0.16 && <0.17
54+ , servant-server >=0.17 && <0.18
56 , split >=0.2 && <0.3
55 , split >=0.2 && <0.3
57 , string-conversions >=0.3 && <0.5
56 , string-conversions >=0.3 && <0.5
58 , temporary >=1.2 && <1.4
57 , temporary >=1.2 && <1.4
src/Servant/QuickCheck/Internal/HasGenRequest.hs+9−6
@@ -63,18 +63,14 @@ instance (KnownSymbol path, HasGenRequest b) => HasGenRequest (path :> b) where
63 (oldf, old) = genRequest (Proxy :: Proxy b)
63 (oldf, old) = genRequest (Proxy :: Proxy b)
64 new = cs $ symbolVal (Proxy :: Proxy path)
64 new = cs $ symbolVal (Proxy :: Proxy path)
65
65
66−#if MIN_VERSION_servant(0,11,0)
67instance HasGenRequest EmptyAPI where
66instance HasGenRequest EmptyAPI where
68 genRequest _ = (0, error "EmptyAPIs cannot be queried.")
67 genRequest _ = (0, error "EmptyAPIs cannot be queried.")
69−#endif
70
68
71−#if MIN_VERSION_servant(0,12,0)
72instance HasGenRequest api => HasGenRequest (Summary d :> api) where
69instance HasGenRequest api => HasGenRequest (Summary d :> api) where
73 genRequest _ = genRequest (Proxy :: Proxy api)
70 genRequest _ = genRequest (Proxy :: Proxy api)
74
71
75instance HasGenRequest api => HasGenRequest (Description d :> api) where
72instance HasGenRequest api => HasGenRequest (Description d :> api) where
76 genRequest _ = genRequest (Proxy :: Proxy api)
73 genRequest _ = genRequest (Proxy :: Proxy api)
77−#endif
78
74
79instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
75instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
80 => HasGenRequest (Capture' mods x c :> b) where
76 => HasGenRequest (Capture' mods x c :> b) where
@@ -86,7 +82,6 @@ instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
86 (oldf, old) = genRequest (Proxy :: Proxy b)
82 (oldf, old) = genRequest (Proxy :: Proxy b)
87 new = arbitrary :: Gen c
83 new = arbitrary :: Gen c
88
84
89−#if MIN_VERSION_servant(0,8,0)
90instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
85instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
91 => HasGenRequest (CaptureAll x c :> b) where
86 => HasGenRequest (CaptureAll x c :> b) where
92 genRequest _ = (oldf, do
87 genRequest _ = (oldf, do
@@ -97,7 +92,6 @@ instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
97 where
92 where
98 (oldf, old) = genRequest (Proxy :: Proxy b)
93 (oldf, old) = genRequest (Proxy :: Proxy b)
99 new = arbitrary :: Gen [c]
94 new = arbitrary :: Gen [c]
100−#endif
101
95
102instance (Arbitrary c, KnownSymbol h, HasGenRequest b, ToHttpApiData c)
96instance (Arbitrary c, KnownSymbol h, HasGenRequest b, ToHttpApiData c)
103 => HasGenRequest (Header' mods h c :> b) where
97 => HasGenRequest (Header' mods h c :> b) where
@@ -174,6 +168,15 @@ instance (ReflectMethod method)
174 , method = reflectMethod (Proxy :: Proxy method)
168 , method = reflectMethod (Proxy :: Proxy method)
175 })
169 })
176
170
171+instance (ReflectMethod method)
172+ => HasGenRequest (NoContentVerb (method :: k)) where
173+ genRequest _ = (1, return $ \burl -> defaultRequest
174+ { host = cs $ baseUrlHost burl
175+ , port = baseUrlPort burl
176+ , secure = baseUrlScheme burl == Https
177+ , method = reflectMethod (Proxy :: Proxy method)
178+ })
179+
177instance (HasGenRequest a) => HasGenRequest (RemoteHost :> a) where
180instance (HasGenRequest a) => HasGenRequest (RemoteHost :> a) where
178 genRequest _ = genRequest (Proxy :: Proxy a)
181 genRequest _ = genRequest (Proxy :: Proxy a)
179
182