2876152 · typeable/http-api-data

git.iko.soy/typeable/http-api-data

Use attoparsec-iso8601-1.1

commit2876152c66f273421b7253d8d596baeaddcccc6a authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 15 Jun 2022, 18:02 (4 years ago) parentcf535bc

4 files changed+60−61

compare with master

unifiedsplit

.github/workflows/haskell-ci.yml+41−30 CHANGELOG.md+7 http-api-data.cabal+11−25 src/Web/Internal/HttpApiData.hs+1−6

.github/workflows/haskell-ci.yml+41−30

@@ -8,9 +8,9 @@

88#

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

1010#

11−# version: 0.13.20211111

11+# version: 0.15.20220609

1212#

13−# REGENDATA ("0.13.20211111",["github","cabal.project"])

13+# REGENDATA ("0.15.20220609",["github","cabal.project"])

1414#

1515name: Haskell-CI

1616on:

@@ -23,7 +23,7 @@ on:

2323jobs:

2424 linux:

2525 name: Haskell-CI - Linux - ${{ matrix.compiler }}

26− runs-on: ubuntu-18.04

26+ runs-on: ubuntu-20.04

2727 timeout-minutes:

2828 60

2929 container:

@@ -32,15 +32,20 @@ jobs:

3232 strategy:

3333 matrix:

3434 include:

35− - compiler: ghc-9.2.1

35+ - compiler: ghc-9.4.0.20220523

3636 compilerKind: ghc

37− compilerVersion: 9.2.1

37+ compilerVersion: 9.4.0.20220523

38+ setup-method: ghcup

39+ allow-failure: true

40+ - compiler: ghc-9.2.3

41+ compilerKind: ghc

42+ compilerVersion: 9.2.3

3843 setup-method: ghcup

3944 allow-failure: false

40− - compiler: ghc-9.0.1

45+ - compiler: ghc-9.0.2

4146 compilerKind: ghc

42− compilerVersion: 9.0.1

43− setup-method: hvr-ppa

47+ compilerVersion: 9.0.2

48+ setup-method: ghcup

4449 allow-failure: false

4550 - compiler: ghc-8.10.7

4651 compilerKind: ghc

@@ -72,16 +77,6 @@ jobs:

7277 compilerVersion: 8.0.2

7378 setup-method: hvr-ppa

7479 allow-failure: false

75− - compiler: ghc-7.10.3

76− compilerKind: ghc

77− compilerVersion: 7.10.3

78− setup-method: hvr-ppa

79− allow-failure: false

80− - compiler: ghc-7.8.4

81− compilerKind: ghc

82− compilerVersion: 7.8.4

83− setup-method: hvr-ppa

84− allow-failure: false

8580 fail-fast: false

8681 steps:

8782 - name: apt

@@ -90,18 +85,19 @@ jobs:

9085 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5

9186 if [ "${{ matrix.setup-method }}" = ghcup ]; then

9287 mkdir -p "$HOME/.ghcup/bin"

93− curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"

88+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"

9489 chmod a+x "$HOME/.ghcup/bin/ghcup"

95− "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"

96− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0

90+ if $HEADHACKAGE; then "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; fi

91+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)

92+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

9793 else

9894 apt-add-repository -y 'ppa:hvr/ghc'

9995 apt-get update

10096 apt-get install -y "$HCNAME"

10197 mkdir -p "$HOME/.ghcup/bin"

102− curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"

98+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"

10399 chmod a+x "$HOME/.ghcup/bin/ghcup"

104− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0

100+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

105101 fi

106102 env:

107103 HCKIND: ${{ matrix.compilerKind }}

@@ -132,7 +128,7 @@ jobs:

132128 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

133129 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

134130 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"

135− echo "HEADHACKAGE=false" >> "$GITHUB_ENV"

131+ if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi

136132 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"

137133 echo "GHCJSARITH=0" >> "$GITHUB_ENV"

138134 env:

@@ -161,6 +157,18 @@ jobs:

161157 repository hackage.haskell.org

162158 url: http://hackage.haskell.org/

163159 EOF

160+ if $HEADHACKAGE; then

161+ cat >> $CABAL_CONFIG <<EOF

162+ repository head.hackage.ghc.haskell.org

163+ url: https://ghc.gitlab.haskell.org/head.hackage/

164+ secure: True

165+ root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d

166+ 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329

167+ f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89

168+ key-threshold: 3

169+ active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override

170+ EOF

171+ fi

164172 cat >> $CABAL_CONFIG <<EOF

165173 program-default-options

166174 ghc-options: $GHCJOBS +RTS -M3G -RTS

@@ -177,7 +185,7 @@ jobs:

177185 - name: cache (tools)

178186 uses: actions/cache@v2

179187 with:

180− key: ${{ runner.os }}-${{ matrix.compiler }}-tools-13a8fe6d

188+ key: ${{ runner.os }}-${{ matrix.compiler }}-tools-445c2459

181189 path: ~/.haskell-ci-tools

182190 - name: install cabal-plan

183191 run: |

@@ -190,8 +198,8 @@ jobs:

190198 cabal-plan --version

191199 - name: install doctest

192200 run: |

193− if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17' ; fi

194− if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi

201+ if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi

202+ if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi

195203 - name: checkout

196204 uses: actions/checkout@v2

197205 with:

@@ -221,6 +229,9 @@ jobs:

221229 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi

222230 cat >> cabal.project <<EOF

223231 EOF

232+ if $HEADHACKAGE; then

233+ echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project

234+ fi

224235 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(http-api-data)$/; }' >> cabal.project.local

225236 cat cabal.project

226237 cat cabal.project.local

@@ -250,15 +261,15 @@ jobs:

250261 - name: doctest

251262 run: |

252263 perl -i -e 'while (<ARGV>) { print unless /package-id\s+(base-compat)-\d+(\.\d+)*/; }' .ghc.environment.*

253− if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_http_api_data} || false ; fi

254− if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src/ ; fi

264+ if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_http_api_data} || false ; fi

265+ if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src/ ; fi

255266 - name: cabal check

256267 run: |

257268 cd ${PKGDIR_http_api_data} || false

258269 ${CABAL} -vnormal check

259270 - name: haddock

260271 run: |

261− $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

272+ $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

262273 - name: unconstrained build

263274 run: |

264275 rm -f cabal.project.local

CHANGELOG.md+7

@@ -1,3 +1,10 @@

1+0.5

2+---

4+* Use `attoparsec-iso8601-1.1.0.0`.

5+ `Day` and `UTCTime` parsers require at least 4 digits now, which is a breaking change.

6+* Drop GHC-7.8 and GHC-7.10 support.

180.4.3

29-----

310

http-api-data.cabal+11−25

@@ -1,7 +1,6 @@

11cabal-version: >= 1.10

22name: http-api-data

3−version: 0.4.3

4−x-revision: 6

3+version: 0.5

65synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.

76category: Web

@@ -25,16 +24,15 @@ extra-source-files:

2524 README.md

2625

2726tested-with:

28− GHC==7.8.4,

29− GHC==7.10.3,

3027 GHC==8.0.2,

3128 GHC==8.2.2,

3229 GHC==8.4.4,

3330 GHC==8.6.5,

3431 GHC==8.8.4,

3532 GHC==8.10.7,

36− GHC==9.0.1,

37− GHC==9.2.1

33+ GHC==9.0.2,

34+ GHC==9.2.3,

35+ GHC==9.4.1

3836

3937flag use-text-show

4038 description: Use text-show library for efficient ToHttpApiData implementations.

@@ -46,20 +44,16 @@ library

4644 include-dirs: include/

4745

4846 -- GHC bundled

49− build-depends: base >= 4.7 && < 4.17

50− , bytestring >= 0.10.4.0 && < 0.12

51− , containers >= 0.5.5.1 && < 0.7

47+ build-depends: base >= 4.9 && < 4.17

48+ , bytestring >= 0.10.8.1 && < 0.12

49+ , containers >= 0.5.7.1 && < 0.7

5250 , text >= 1.2.3.0 && < 1.3 || >=2.0 && <2.1

53− , transformers >= 0.3 && < 0.7

54−

55− -- so Semigroup Builder exists

56− if impl(ghc >= 8.0)

57− build-depends: bytestring >= 0.10.8.1

51+ , transformers >= 0.5.2.0 && < 0.7

5852

5953 -- other-dependencies

6054 build-depends:

6155 attoparsec >= 0.13.2.2 && < 0.15

62− , attoparsec-iso8601 >= 1.0.2.0 && < 1.1

56+ , attoparsec-iso8601 >= 1.1.0.0 && < 1.2

6357 , base-compat >= 0.10.5 && < 0.13

6458 , cookie >= 0.4.3 && < 0.5

6559 , hashable >= 1.2.7.0 && < 1.5

@@ -69,14 +63,6 @@ library

6963 , unordered-containers >= 0.2.10.0 && < 0.3

7064 , uuid-types >= 1.0.3 && < 1.1

7165

72− if !impl(ghc >= 7.10)

73− build-depends:

74− nats >= 1.1.2 && < 1.2,

75− void >= 0.7.3 && < 0.8

76−

77− if !impl(ghc >= 8.0)

78− build-depends: semigroups >= 0.18.5 && < 0.21

79−

8066 if flag(use-text-show)

8167 cpp-options: -DUSE_TEXT_SHOW

8268 build-depends: text-show >= 3.8.2 && <3.10

@@ -99,7 +85,7 @@ test-suite spec

9985 hs-source-dirs: test

10086 ghc-options: -Wall

10187 default-language: Haskell2010

102− build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.10

88+ build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.11

10389 -- inherited depndencies

10490 build-depends:

10591 base

@@ -116,7 +102,7 @@ test-suite spec

116102 build-depends: nats

117103

118104 build-depends: HUnit >= 1.6.0.0 && <1.7

119− , hspec >= 2.7.1 && <2.10

105+ , hspec >= 2.7.1 && <2.11

120106 , QuickCheck >= 2.13.1 && <2.15

121107 , quickcheck-instances >= 0.3.25.2 && <0.4

122108

src/Web/Internal/HttpApiData.hs+1−6

@@ -32,6 +32,7 @@ import Data.Data (Data)

3232import qualified Data.Fixed as F

3333import Data.Functor.Identity (Identity(Identity))

3434import Data.Int (Int16, Int32, Int64, Int8)

35+import Data.Kind (Type)

3536import qualified Data.Map as Map

3637import Data.Monoid (All (..), Any (..), Dual (..),

3738 First (..), Last (..),

@@ -71,12 +72,6 @@ import Text.Read (readMaybe)

7172import Web.Cookie (SetCookie, parseSetCookie,

7273 renderSetCookie)

7374

74−#if MIN_VERSION_base(4,9,0)

75−import Data.Kind (Type)

76−#else

77−#define Type *

78−#endif

79−

8075#if USE_TEXT_SHOW

8176import TextShow (TextShow, showt)

8277#endif