master..dfec252 · servant-quickcheck

git.iko.soy/servant-quickcheck

5 files changed+15−42

unifiedsplit

.travis.yml+10−18 CHANGELOG.yaml−10 cabal.project−2 servant-quickcheck.cabal+5−5 src/Servant/QuickCheck/Internal/QuickCheck.hs−7

.travis.yml+10−18

@@ -2,13 +2,9 @@

22#

33# haskell-ci '--config=cabal.haskell-ci' 'servant-quickcheck.cabal'

44#

5−# To regenerate the script (for example after adjusting tested-with) run

6−#

7−# haskell-ci regenerate

8−#

95# For more information, see https://github.com/haskell-CI/haskell-ci

106#

11−# version: 0.10.1

7+# version: 0.9.20200121

128#

139version: ~> 1.0

1410language: c

@@ -36,20 +32,20 @@ before_cache:

3632 - rm -rfv $CABALHOME/packages/head.hackage

3733jobs:

3834 include:

39− - compiler: ghc-8.8.3

40− 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.3","cabal-install-3.2"]}}

35+ - compiler: ghc-8.8.1

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"]}}

4137 os: linux

4238 - compiler: ghc-8.6.5

43− 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.2"]}}

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"]}}

4440 os: linux

4541 - compiler: ghc-8.4.4

46− 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.2"]}}

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"]}}

4743 os: linux

4844 - compiler: ghc-8.2.2

49− 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.2"]}}

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"]}}

5046 os: linux

5147 - compiler: ghc-8.0.2

52− 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.2"]}}

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"]}}

5349 os: linux

5450before_install:

5551 - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')

@@ -99,8 +95,6 @@ install:

9995 - touch cabal.project

10096 - |

10197 echo "packages: ." >> cabal.project

102− - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-quickcheck' >> cabal.project ; fi

103− - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"

10498 - |

10599 - "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"

106100 - cat cabal.project || true

@@ -109,8 +103,8 @@ install:

109103 - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}

110104 - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"

111105 - rm cabal.project.freeze

112− - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all

113− - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all

106+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all

107+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all

114108script:

115109 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

116110 # Packaging...

@@ -126,8 +120,6 @@ script:

126120 - touch cabal.project

127121 - |

128122 echo "packages: ${PKGDIR_servant_quickcheck}" >> cabal.project

129− - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-quickcheck' >> cabal.project ; fi

130− - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"

131123 - |

132124 - "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"

133125 - cat cabal.project || true

@@ -154,5 +146,5 @@ script:

154146 # Constraint set base-compat-0.11

155147 - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all

156148

157−# REGENDATA ("0.10.1",["--config=cabal.haskell-ci","servant-quickcheck.cabal"])

149+# REGENDATA ("0.9.20200121",["--config=cabal.haskell-ci","servant-quickcheck.cabal"])

158150# EOF

CHANGELOG.yaml−10

@@ -1,14 +1,4 @@

11releases:

2− - version: "0.0.9.0"

3− changes:

4− - description: "Support servant-0.15 (#65)"

5− authors: fizruk

6− date: 2020-06-25

7−

8− - description: "Relax constraints for GHC 8.10 (#70)"

9− authors: felixmulder

10− date: 2020-06-20

11−

122 - version: "0.0.8.0"

133 changes:

144 - description: Support for servant-0.17

cabal.project−2

@@ -1,4 +1,2 @@

11packages: .

22tests: true

3−

4−allow-newer: servant-blaze:servant

servant-quickcheck.cabal+5−5

@@ -1,5 +1,5 @@

11name: servant-quickcheck

2−version: 0.0.9.1

2+version: 0.0.8.0

33synopsis: QuickCheck entire APIs

44description:

55 This packages provides QuickCheck properties that are tested across an entire

@@ -13,7 +13,7 @@ category: Web

1313build-type: Simple

1414cabal-version: >=1.10

1515extra-source-files: CHANGELOG.yaml

16−tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || == 8.8.3

16+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || == 8.8.1

1717

1818source-repository head

1919 type: git

@@ -49,9 +49,9 @@ library

4949 , pretty >=1.1 && <1.2

5050 , process >=1.2 && <1.7

5151 , QuickCheck >=2.7 && <2.15

52− , servant >=0.17 && <0.19

53− , servant-client >=0.17 && <0.19

54− , servant-server >=0.17 && <0.19

52+ , servant >=0.15 && <0.18

53+ , servant-client >=0.15 && <0.18

54+ , servant-server >=0.15 && <0.18

5555 , split >=0.2 && <0.3

5656 , string-conversions >=0.3 && <0.5

5757 , temporary >=1.2 && <1.4

src/Servant/QuickCheck/Internal/QuickCheck.hs−7

@@ -11,9 +11,6 @@ import Network.Wai.Handler.Warp (withApplication)

1111import Prelude.Compat

1212import Servant (Context (EmptyContext), HasServer,

1313 Server, serveWithContext)

14−#if MIN_VERSION_servant_server(0,18,0)

15−import Servant (DefaultErrorFormatters, ErrorFormatters, HasContextEntry, type (.++))

16−#endif

1714import Servant.Client (BaseUrl (..), Scheme (..))

1815import System.IO.Unsafe (unsafePerformIO)

1916import Test.Hspec (Expectation, expectationFailure)

@@ -40,11 +37,7 @@ withServantServer api = withServantServerAndContext api EmptyContext

4037-- application.

4138--

4239-- /Since 0.0.0.0/

43−#if MIN_VERSION_servant_server(0,18,0)

44−withServantServerAndContext :: (HasServer a ctx, HasContextEntry (ctx .++ DefaultErrorFormatters) ErrorFormatters)

45−#else

4640withServantServerAndContext :: HasServer a ctx

47−#endif

4841 => Proxy a -> Context ctx -> IO (Server a) -> (BaseUrl -> IO r) -> IO r

4942withServantServerAndContext api ctx server t

5043 = withApplication (return . serveWithContext api ctx =<< server) $ \port ->