2fb7e4e...master · typeable/http-api-data

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

.ghcideleted−1

since splitsnapshots

@@ -1 +0,0 @@

1−:set -itest -isrc -optP-include -optP .stack-work/dist/x86_64-osx/Cabal-1.24.0.0/build/autogen/cabal_macros.h -optP-I -optPinclude

.github/workflows/haskell-ci.ymlnew file+283

@@ -0,0 +1,283 @@

1+# This GitHub workflow config has been generated by a script via

2+#

3+# haskell-ci 'github' 'cabal.project'

4+#

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

6+#

7+# haskell-ci regenerate

8+#

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

10+#

11+# version: 0.15.20220609

12+#

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

14+#

15+name: Haskell-CI

16+on:

17+ push:

18+ branches:

19+ - master

20+ pull_request:

21+ branches:

22+ - master

23+jobs:

24+ linux:

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

26+ runs-on: ubuntu-20.04

27+ timeout-minutes:

28+ 60

29+ container:

30+ image: buildpack-deps:bionic

31+ continue-on-error: ${{ matrix.allow-failure }}

32+ strategy:

33+ matrix:

34+ include:

35+ - compiler: ghc-9.4.0.20220523

36+ compilerKind: ghc

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

43+ setup-method: ghcup

44+ allow-failure: false

45+ - compiler: ghc-9.0.2

46+ compilerKind: ghc

47+ compilerVersion: 9.0.2

48+ setup-method: ghcup

49+ allow-failure: false

50+ - compiler: ghc-8.10.7

51+ compilerKind: ghc

52+ compilerVersion: 8.10.7

53+ setup-method: ghcup

54+ allow-failure: false

55+ - compiler: ghc-8.8.4

56+ compilerKind: ghc

57+ compilerVersion: 8.8.4

58+ setup-method: hvr-ppa

59+ allow-failure: false

60+ - compiler: ghc-8.6.5

61+ compilerKind: ghc

62+ compilerVersion: 8.6.5

63+ setup-method: hvr-ppa

64+ allow-failure: false

65+ - compiler: ghc-8.4.4

66+ compilerKind: ghc

67+ compilerVersion: 8.4.4

68+ setup-method: hvr-ppa

69+ allow-failure: false

70+ - compiler: ghc-8.2.2

71+ compilerKind: ghc

72+ compilerVersion: 8.2.2

73+ setup-method: hvr-ppa

74+ allow-failure: false

75+ - compiler: ghc-8.0.2

76+ compilerKind: ghc

77+ compilerVersion: 8.0.2

78+ setup-method: hvr-ppa

79+ allow-failure: false

80+ fail-fast: false

81+ steps:

82+ - name: apt

83+ run: |

84+ apt-get update

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

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

87+ mkdir -p "$HOME/.ghcup/bin"

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

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

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)

93+ else

94+ apt-add-repository -y 'ppa:hvr/ghc'

95+ apt-get update

96+ apt-get install -y "$HCNAME"

97+ mkdir -p "$HOME/.ghcup/bin"

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

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

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

101+ fi

102+ env:

103+ HCKIND: ${{ matrix.compilerKind }}

104+ HCNAME: ${{ matrix.compiler }}

105+ HCVER: ${{ matrix.compilerVersion }}

106+ - name: Set PATH and environment variables

107+ run: |

108+ echo "$HOME/.cabal/bin" >> $GITHUB_PATH

109+ echo "LANG=C.UTF-8" >> "$GITHUB_ENV"

110+ echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"

111+ echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

112+ HCDIR=/opt/$HCKIND/$HCVER

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

114+ HC=$HOME/.ghcup/bin/$HCKIND-$HCVER

115+ echo "HC=$HC" >> "$GITHUB_ENV"

116+ echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"

117+ echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"

118+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

119+ else

120+ HC=$HCDIR/bin/$HCKIND

121+ echo "HC=$HC" >> "$GITHUB_ENV"

122+ echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"

123+ echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"

124+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

125+ fi

126+

127+ HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

128+ echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

129+ echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

130+ echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"

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

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

133+ echo "GHCJSARITH=0" >> "$GITHUB_ENV"

134+ env:

135+ HCKIND: ${{ matrix.compilerKind }}

136+ HCNAME: ${{ matrix.compiler }}

137+ HCVER: ${{ matrix.compilerVersion }}

138+ - name: env

139+ run: |

140+ env

141+ - name: write cabal config

142+ run: |

143+ mkdir -p $CABAL_DIR

144+ cat >> $CABAL_CONFIG <<EOF

145+ remote-build-reporting: anonymous

146+ write-ghc-environment-files: never

147+ remote-repo-cache: $CABAL_DIR/packages

148+ logs-dir: $CABAL_DIR/logs

149+ world-file: $CABAL_DIR/world

150+ extra-prog-path: $CABAL_DIR/bin

151+ symlink-bindir: $CABAL_DIR/bin

152+ installdir: $CABAL_DIR/bin

153+ build-summary: $CABAL_DIR/logs/build.log

154+ store-dir: $CABAL_DIR/store

155+ install-dirs user

156+ prefix: $CABAL_DIR

157+ repository hackage.haskell.org

158+ url: http://hackage.haskell.org/

159+ 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

172+ cat >> $CABAL_CONFIG <<EOF

173+ program-default-options

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

175+ EOF

176+ cat $CABAL_CONFIG

177+ - name: versions

178+ run: |

179+ $HC --version || true

180+ $HC --print-project-git-commit-id || true

181+ $CABAL --version || true

182+ - name: update cabal index

183+ run: |

184+ $CABAL v2-update -v

185+ - name: cache (tools)

186+ uses: actions/cache@v2

187+ with:

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

189+ path: ~/.haskell-ci-tools

190+ - name: install cabal-plan

191+ run: |

192+ mkdir -p $HOME/.cabal/bin

193+ curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz

194+ echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -

195+ xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan

196+ rm -f cabal-plan.xz

197+ chmod a+x $HOME/.cabal/bin/cabal-plan

198+ cabal-plan --version

199+ - name: install doctest

200+ run: |

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

203+ - name: checkout

204+ uses: actions/checkout@v2

205+ with:

206+ path: source

207+ - name: initial cabal.project for sdist

208+ run: |

209+ touch cabal.project

210+ echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project

211+ cat cabal.project

212+ - name: sdist

213+ run: |

214+ mkdir -p sdist

215+ $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist

216+ - name: unpack

217+ run: |

218+ mkdir -p unpacked

219+ find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;

220+ - name: generate cabal.project

221+ run: |

222+ PKGDIR_http_api_data="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/http-api-data-[0-9.]*')"

223+ echo "PKGDIR_http_api_data=${PKGDIR_http_api_data}" >> "$GITHUB_ENV"

224+ rm -f cabal.project cabal.project.local

225+ touch cabal.project

226+ touch cabal.project.local

227+ echo "packages: ${PKGDIR_http_api_data}" >> cabal.project

228+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package http-api-data" >> cabal.project ; fi

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

230+ cat >> cabal.project <<EOF

231+ 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

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

236+ cat cabal.project

237+ cat cabal.project.local

238+ - name: dump install plan

239+ run: |

240+ $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all

241+ cabal-plan

242+ - name: cache

243+ uses: actions/cache@v2

244+ with:

245+ key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

246+ path: ~/.cabal/store

247+ restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-

248+ - name: install dependencies

249+ run: |

250+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all

251+ $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all

252+ - name: build w/o tests

253+ run: |

254+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all

255+ - name: build

256+ run: |

257+ $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always

258+ - name: tests

259+ run: |

260+ $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct

261+ - name: doctest

262+ run: |

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

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

266+ - name: cabal check

267+ run: |

268+ cd ${PKGDIR_http_api_data} || false

269+ ${CABAL} -vnormal check

270+ - name: haddock

271+ run: |

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

273+ - name: unconstrained build

274+ run: |

275+ rm -f cabal.project.local

276+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all

277+ - name: prepare for constraint sets

278+ run: |

279+ rm -f cabal.project.local

280+ - name: constraint set text-show

281+ run: |

282+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' --dependencies-only -j2 all

283+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all

.travis.ymldeleted−168

@@ -1,168 +0,0 @@

1−# This Travis job script has been generated by a script via

2−#

3−# haskell-ci '--config=cabal.haskell-ci' 'http-api-data.cabal'

4−#

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

6−#

7−# haskell-ci regenerate

8−#

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

10−#

11−# version: 0.10.3

12−#

13−version: ~> 1.0

14−language: c

15−os: linux

16−dist: xenial

17−git:

18− # whether to recursively clone submodules

19− submodules: false

20−branches:

21− only:

22− - master

23−cache:

24− directories:

25− - $HOME/.cabal/packages

26− - $HOME/.cabal/store

27− - $HOME/.hlint

28−before_cache:

29− - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log

30− # remove files that are regenerated by 'cabal update'

31− - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*

32− - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json

33− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache

34− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar

35− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx

36− - rm -rfv $CABALHOME/packages/head.hackage

37−jobs:

38− include:

39− - compiler: ghc-8.10.2

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

41− os: linux

42− - compiler: ghc-8.8.4

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

44− os: linux

45− - compiler: ghc-8.6.5

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

47− os: linux

48− - compiler: ghc-8.4.4

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

50− os: linux

51− - compiler: ghc-8.2.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.2.2","cabal-install-3.2"]}}

53− os: linux

54− - compiler: ghc-8.0.2

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

56− os: linux

57− - compiler: ghc-7.10.3

58− 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-7.10.3","cabal-install-3.2"]}}

59− os: linux

60− - compiler: ghc-7.8.4

61− 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-7.8.4","cabal-install-3.2"]}}

62− os: linux

63−before_install:

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

65− - WITHCOMPILER="-w $HC"

66− - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')

67− - HCPKG="$HC-pkg"

68− - unset CC

69− - CABAL=/opt/ghc/bin/cabal

70− - CABALHOME=$HOME/.cabal

71− - export PATH="$CABALHOME/bin:$PATH"

72− - TOP=$(pwd)

73− - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"

74− - echo $HCNUMVER

75− - CABAL="$CABAL -vnormal+nowrap"

76− - set -o pipefail

77− - TEST=--enable-tests

78− - BENCH=--enable-benchmarks

79− - HEADHACKAGE=false

80− - rm -f $CABALHOME/config

81− - |

82− echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config

83− echo "remote-build-reporting: anonymous" >> $CABALHOME/config

84− echo "write-ghc-environment-files: always" >> $CABALHOME/config

85− echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config

86− echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config

87− echo "world-file: $CABALHOME/world" >> $CABALHOME/config

88− echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config

89− echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config

90− echo "installdir: $CABALHOME/bin" >> $CABALHOME/config

91− echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config

92− echo "store-dir: $CABALHOME/store" >> $CABALHOME/config

93− echo "install-dirs user" >> $CABALHOME/config

94− echo " prefix: $CABALHOME" >> $CABALHOME/config

95− echo "repository hackage.haskell.org" >> $CABALHOME/config

96− echo " url: http://hackage.haskell.org/" >> $CABALHOME/config

97−install:

98− - ${CABAL} --version

99− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

100− - |

101− echo "program-default-options" >> $CABALHOME/config

102− echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config

103− - cat $CABALHOME/config

104− - rm -fv cabal.project cabal.project.local cabal.project.freeze

105− - travis_retry ${CABAL} v2-update -v

106− - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 81000 ] ; then ${CABAL} v2-install $WITHCOMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17' ; fi

107− # Generate cabal.project

108− - rm -rf cabal.project cabal.project.local cabal.project.freeze

109− - touch cabal.project

110− - |

111− echo "packages: ." >> cabal.project

112− - if [ $HCNUMVER -ge 80200 ] ; then echo 'package http-api-data' >> cabal.project ; fi

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

114− - |

115− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

116− - cat cabal.project || true

117− - cat cabal.project.local || true

118− - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi

119− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}

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

121− - rm cabal.project.freeze

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

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

124−script:

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

126− # Packaging...

127− - ${CABAL} v2-sdist all

128− # Unpacking...

129− - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/

130− - cd ${DISTDIR} || false

131− - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;

132− - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;

133− - PKGDIR_http_api_data="$(find . -maxdepth 1 -type d -regex '.*/http-api-data-[0-9.]*')"

134− # Generate cabal.project

135− - rm -rf cabal.project cabal.project.local cabal.project.freeze

136− - touch cabal.project

137− - |

138− echo "packages: ${PKGDIR_http_api_data}" >> cabal.project

139− - if [ $HCNUMVER -ge 80200 ] ; then echo 'package http-api-data' >> cabal.project ; fi

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

141− - |

142− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(http-api-data)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"

143− - cat cabal.project || true

144− - cat cabal.project.local || true

145− # Building...

146− # this builds all libraries and executables (without tests/benchmarks)

147− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

148− # Building with tests and benchmarks...

149− # build & run tests, build benchmarks

150− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all

151− # Testing...

152− - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all

153− # Doctest...

154− - if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 81000 ] ; then (cd ${PKGDIR_http_api_data} && doctest src/) ; fi

155− # cabal check...

156− - (cd ${PKGDIR_http_api_data} && ${CABAL} -vnormal check)

157− # haddock...

158− - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all

159− # Building without installed constraints for packages in global-db...

160− - rm -f cabal.project.local

161− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

162− # Constraint sets

163− - rm -rf cabal.project.local

164− # Constraint set text-show

165− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='http-api-data +use-text-show' all

166−

167−# REGENDATA ("0.10.3",["--config=cabal.haskell-ci","http-api-data.cabal"])

168−# EOF

CHANGELOG.md+13

@@ -1,3 +1,16 @@

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.

8+0.4.3

9+-----

10+

11+* Add `Quarter`, `QuarterOfYear` and `Month` instances

12+* Support `bytestring-0.11`

13+

10.4.2

140.4.2

2-----

15-----

cabal.haskell-ci+2−1

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

1branches: master

2−doctest: <8.10

2+doctest: <9

3+doctest-filter-packages: base-compat

4constraint-set text-show

5constraint-set text-show

5 constraints: http-api-data +use-text-show

6 constraints: http-api-data +use-text-show

http-api-data.cabal+26−35

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

1cabal-version: >= 1.10

2name: http-api-data

3−version: 0.4.2

3+version: 0.5

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

6category: Web

@@ -24,14 +24,15 @@ extra-source-files:

24 README.md

26tested-with:

27− GHC==7.8.4,

28− GHC==7.10.3,

29 GHC==8.0.2,

27 GHC==8.0.2,

30 GHC==8.2.2,

28 GHC==8.2.2,

31 GHC==8.4.4,

29 GHC==8.4.4,

32 GHC==8.6.5,

30 GHC==8.6.5,

33 GHC==8.8.4,

31 GHC==8.8.4,

34− GHC==8.10.2

32+ GHC==8.10.7,

33+ GHC==9.0.2,

34+ GHC==9.2.3,

35+ GHC==9.4.1

36flag use-text-show

37flag use-text-show

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

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

@@ -43,40 +44,28 @@ library

43 include-dirs: include/

44 include-dirs: include/

45 -- GHC bundled

46 -- GHC bundled

46− build-depends: base >= 4.7 && < 4.15

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

47− , bytestring >= 0.10.4.0 && < 0.11

48+ , bytestring >= 0.10.8.1 && < 0.12

48− , containers >= 0.5.5.1 && < 0.7

49+ , containers >= 0.5.7.1 && < 0.7

49− , text >= 1.2.3.0 && < 1.3

50+ , text >= 1.2.3.0 && < 1.3 || >=2.0 && <2.1

50− , transformers >= 0.3 && < 0.6

51+ , transformers >= 0.5.2.0 && < 0.7

51−

52− -- so Semigroup Builder exists

53− if impl(ghc >= 8.0)

54− build-depends: bytestring >= 0.10.8.1

56 -- other-dependencies

53 -- other-dependencies

57 build-depends:

54 build-depends:

58− attoparsec >= 0.13.2.2 && < 0.14

55+ attoparsec >= 0.13.2.2 && < 0.15

59− , attoparsec-iso8601 >= 1.0.1.0 && < 1.1

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

60− , base-compat >= 0.10.5 && < 0.12

57+ , base-compat >= 0.10.5 && < 0.13

61 , cookie >= 0.4.3 && < 0.5

58 , cookie >= 0.4.3 && < 0.5

62− , hashable >= 1.2.7.0 && < 1.4

59+ , hashable >= 1.2.7.0 && < 1.5

63 , http-types >= 0.12.3 && < 0.13

60 , http-types >= 0.12.3 && < 0.13

64 , tagged >= 0.8.5 && < 0.9

61 , tagged >= 0.8.5 && < 0.9

65− , time-compat >= 1.9.2 && < 1.10

62+ , time-compat >= 1.9.5 && < 1.10

66− , unordered-containers >= 0.2.10.0 && < 0.3

63+ , unordered-containers >= 0.2.10.0 && < 0.3

67− , uuid-types >= 1.0.3 && <1.1

64+ , uuid-types >= 1.0.3 && < 1.1

68−

69− if !impl(ghc >= 7.10)

70− build-depends:

71− nats >= 1.1.2 && < 1.2,

72− void >= 0.7.3 && < 0.8

73−

74− if !impl(ghc >= 8.0)

75− build-depends: semigroups >= 0.18.5 && < 0.20

77 if flag(use-text-show)

66 if flag(use-text-show)

78 cpp-options: -DUSE_TEXT_SHOW

67 cpp-options: -DUSE_TEXT_SHOW

79− build-depends: text-show >= 3.8.2 && <3.9

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

81 exposed-modules:

70 exposed-modules:

82 Web.HttpApiData

71 Web.HttpApiData

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

96 hs-source-dirs: test

85 hs-source-dirs: test

97 ghc-options: -Wall

86 ghc-options: -Wall

98 default-language: Haskell2010

87 default-language: Haskell2010

99− build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.8

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

100 -- inherited depndencies

89 -- inherited depndencies

101 build-depends:

90 build-depends:

102 base

91 base

@@ -104,16 +93,18 @@ test-suite spec

104 , bytestring

93 , bytestring

105 , cookie

94 , cookie

106 , http-api-data

95 , http-api-data

107− , nats

108 , text

96 , text

109 , time-compat

97 , time-compat

110 , unordered-containers

98 , unordered-containers

111 , uuid-types

99 , uuid-types

112

100

101+ if !impl(ghc >= 7.10)

102+ build-depends: nats

103+

113− build-depends: HUnit >= 1.6.0.0 && <1.7

104+ build-depends: HUnit >= 1.6.0.0 && <1.7

114− , hspec >= 2.7.1 && <2.8

105+ , hspec >= 2.7.1 && <2.11

115− , QuickCheck >= 2.13.1 && <2.15

106+ , QuickCheck >= 2.13.1 && <2.15

116− , quickcheck-instances >= 0.3.21 && <0.4

107+ , quickcheck-instances >= 0.3.25.2 && <0.4

117

108

118source-repository head

109source-repository head

119 type: git

110 type: git

src/Web/Internal/FormUrlEncoded.hs+8

@@ -52,6 +52,8 @@ import Data.Text.Encoding.Error (lenientDecode)

52import qualified Data.Text.Lazy as Lazy

53import Data.Time.Compat (Day, LocalTime, NominalDiffTime,

54 UTCTime, ZonedTime)

55+import Data.Time.Calendar.Month.Compat (Month)

56+import Data.Time.Calendar.Quarter.Compat (Quarter, QuarterOfYear (..))

55import Data.Void (Void)

57import Data.Void (Void)

56import Data.Word (Word16, Word32, Word64, Word8)

58import Data.Word (Word16, Word32, Word64, Word8)

57import GHC.Exts (Constraint, IsList (..))

59import GHC.Exts (Constraint, IsList (..))

@@ -113,6 +115,9 @@ instance ToFormKey LocalTime where toFormKey = toQueryParam

113instance ToFormKey ZonedTime where toFormKey = toQueryParam

115instance ToFormKey ZonedTime where toFormKey = toQueryParam

114instance ToFormKey UTCTime where toFormKey = toQueryParam

116instance ToFormKey UTCTime where toFormKey = toQueryParam

115instance ToFormKey NominalDiffTime where toFormKey = toQueryParam

117instance ToFormKey NominalDiffTime where toFormKey = toQueryParam

118+instance ToFormKey Quarter where toFormKey = toQueryParam

119+instance ToFormKey QuarterOfYear where toFormKey = toQueryParam

120+instance ToFormKey Month where toFormKey = toQueryParam

116

121

117instance ToFormKey String where toFormKey = toQueryParam

122instance ToFormKey String where toFormKey = toQueryParam

118instance ToFormKey Text where toFormKey = toQueryParam

123instance ToFormKey Text where toFormKey = toQueryParam

@@ -172,6 +177,9 @@ instance FromFormKey LocalTime where parseFormKey = parseQueryParam

172instance FromFormKey ZonedTime where parseFormKey = parseQueryParam

177instance FromFormKey ZonedTime where parseFormKey = parseQueryParam

173instance FromFormKey UTCTime where parseFormKey = parseQueryParam

178instance FromFormKey UTCTime where parseFormKey = parseQueryParam

174instance FromFormKey NominalDiffTime where parseFormKey = parseQueryParam

179instance FromFormKey NominalDiffTime where parseFormKey = parseQueryParam

180+instance FromFormKey Quarter where parseFormKey = parseQueryParam

181+instance FromFormKey QuarterOfYear where parseFormKey = parseQueryParam

182+instance FromFormKey Month where parseFormKey = parseQueryParam

175

183

176instance FromFormKey String where parseFormKey = parseQueryParam

184instance FromFormKey String where parseFormKey = parseQueryParam

177instance FromFormKey Text where parseFormKey = parseQueryParam

185instance FromFormKey Text where parseFormKey = parseQueryParam

src/Web/Internal/HttpApiData.hs+68−9

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

32import qualified Data.Fixed as F

33import Data.Functor.Identity (Identity(Identity))

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

35+import Data.Kind (Type)

35import qualified Data.Map as Map

36import qualified Data.Map as Map

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

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

37 First (..), Last (..),

38 First (..), Last (..),

@@ -55,6 +56,9 @@ import Data.Time.Compat (Day, FormatTime, LocalTime,

55 secondsToNominalDiffTime)

56 secondsToNominalDiffTime)

56import Data.Time.Format.Compat (defaultTimeLocale,

57import Data.Time.Format.Compat (defaultTimeLocale,

57 iso8601DateFormat)

58 iso8601DateFormat)

59+import Data.Time.Calendar.Month.Compat (Month)

60+import Data.Time.Calendar.Quarter.Compat (Quarter, QuarterOfYear (..),

61+ toYearQuarter)

58import Data.Typeable (Typeable)

62import Data.Typeable (Typeable)

59import qualified Data.UUID.Types as UUID

63import qualified Data.UUID.Types as UUID

60import Data.Version (Version, parseVersion,

64import Data.Version (Version, parseVersion,

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

68import Web.Cookie (SetCookie, parseSetCookie,

72import Web.Cookie (SetCookie, parseSetCookie,

69 renderSetCookie)

73 renderSetCookie)

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

72−import Data.Kind (Type)

73−#else

74−#define Type *

75−#endif

76−

77#if USE_TEXT_SHOW

75#if USE_TEXT_SHOW

78import TextShow (TextShow, showt)

76import TextShow (TextShow, showt)

79#endif

77#endif

@@ -98,7 +96,7 @@ class ToHttpApiData a where

98 -- The default definition uses 'H.encodePathSegmentsRelative',

96 -- The default definition uses 'H.encodePathSegmentsRelative',

99 -- but this may be overriden with a more efficient version.

97 -- but this may be overriden with a more efficient version.

100 toEncodedUrlPiece :: a -> BS.Builder

98 toEncodedUrlPiece :: a -> BS.Builder

101− toEncodedUrlPiece = H.encodePathSegmentsRelative . (:[]) . toUrlPiece

99+ toEncodedUrlPiece = H.urlEncodeBuilder True . encodeUtf8 . toUrlPiece

102

100

103 -- | Convert to HTTP header value.

101 -- | Convert to HTTP header value.

104 toHeader :: a -> ByteString

102 toHeader :: a -> ByteString

@@ -516,6 +514,42 @@ instance ToHttpApiData DayOfWeek where

516

514

517 toEncodedUrlPiece = unsafeToEncodedUrlPiece

515 toEncodedUrlPiece = unsafeToEncodedUrlPiece

518

516

517+-- |

518+-- >>> toUrlPiece Q4

519+-- "q4"

520+instance ToHttpApiData QuarterOfYear where

521+ toUrlPiece Q1 = "q1"

522+ toUrlPiece Q2 = "q2"

523+ toUrlPiece Q3 = "q3"

524+ toUrlPiece Q4 = "q4"

525+

526+-- |

527+-- >>> import Data.Time.Calendar.Quarter.Compat (Quarter (..))

528+-- >>> MkQuarter 8040

529+-- 2010-Q1

530+--

531+-- >>> toUrlPiece $ MkQuarter 8040

532+-- "2010-q1"

533+--

534+instance ToHttpApiData Quarter where

535+ toUrlPiece q = case toYearQuarter q of

536+ (y, qoy) -> T.pack (show y ++ "-" ++ f qoy)

537+ where

538+ f Q1 = "q1"

539+ f Q2 = "q2"

540+ f Q3 = "q3"

541+ f Q4 = "q4"

542+

543+-- |

544+-- >>> import Data.Time.Calendar.Month.Compat (Month (..))

545+-- >>> MkMonth 24482

546+-- 2040-03

547+--

548+-- >>> toUrlPiece $ MkMonth 24482

549+-- "2040-03"

550+--

551+instance ToHttpApiData Month where

552+ toUrlPiece = T.pack . formatTime defaultTimeLocale "%Y-%m"

519

553

520instance ToHttpApiData NominalDiffTime where

554instance ToHttpApiData NominalDiffTime where

521 toUrlPiece = toUrlPiece . nominalDiffTimeToSeconds

555 toUrlPiece = toUrlPiece . nominalDiffTimeToSeconds

@@ -704,6 +738,9 @@ instance FromHttpApiData ZonedTime where parseUrlPiece = runAtto Atto.zonedTime

704-- Right 2015-10-03 00:14:24 UTC

738-- Right 2015-10-03 00:14:24 UTC

705instance FromHttpApiData UTCTime where parseUrlPiece = runAtto Atto.utcTime

739instance FromHttpApiData UTCTime where parseUrlPiece = runAtto Atto.utcTime

706

740

741+-- |

742+-- >>> parseUrlPiece "Monday" :: Either Text DayOfWeek

743+-- Right Monday

707instance FromHttpApiData DayOfWeek where

744instance FromHttpApiData DayOfWeek where

708 parseUrlPiece t = case Map.lookup (T.toLower t) m of

745 parseUrlPiece t = case Map.lookup (T.toLower t) m of

709 Just dow -> Right dow

746 Just dow -> Right dow

@@ -715,6 +752,30 @@ instance FromHttpApiData DayOfWeek where

715

752

716instance FromHttpApiData NominalDiffTime where parseUrlPiece = fmap secondsToNominalDiffTime . parseUrlPiece

753instance FromHttpApiData NominalDiffTime where parseUrlPiece = fmap secondsToNominalDiffTime . parseUrlPiece

717

754

755+-- |

756+-- >>> parseUrlPiece "2021-01" :: Either Text Month

757+-- Right 2021-01

758+instance FromHttpApiData Month where parseUrlPiece = runAtto Atto.month

759+

760+-- |

761+-- >>> parseUrlPiece "2021-q1" :: Either Text Quarter

762+-- Right 2021-Q1

763+instance FromHttpApiData Quarter where parseUrlPiece = runAtto Atto.quarter

764+

765+-- |

766+-- >>> parseUrlPiece "q2" :: Either Text QuarterOfYear

767+-- Right Q2

768+--

769+-- >>> parseUrlPiece "Q3" :: Either Text QuarterOfYear

770+-- Right Q3

771+instance FromHttpApiData QuarterOfYear where

772+ parseUrlPiece t = case T.toLower t of

773+ "q1" -> return Q1

774+ "q2" -> return Q2

775+ "q3" -> return Q3

776+ "q4" -> return Q4

777+ _ -> Left "Invalid quarter of year"

778+

718instance FromHttpApiData All where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text Bool)

779instance FromHttpApiData All where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text Bool)

719instance FromHttpApiData Any where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text Bool)

780instance FromHttpApiData Any where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text Bool)

720

781

@@ -804,5 +865,3 @@ runAtto :: Atto.Parser a -> Text -> Either Text a

804runAtto p t = case Atto.parseOnly (p <* Atto.endOfInput) t of

865runAtto p t = case Atto.parseOnly (p <* Atto.endOfInput) t of

805 Left err -> Left (T.pack err)

866 Left err -> Left (T.pack err)

806 Right x -> Right x

867 Right x -> Right x

807−

808−

test/Web/Internal/HttpApiDataSpec.hs+6

@@ -14,6 +14,8 @@ import qualified Data.Text as T

14import qualified Data.Text.Encoding as TE

15import qualified Data.Text.Lazy as L

16import Data.Time.Compat

17+import Data.Time.Calendar.Month.Compat (Month)

18+import Data.Time.Calendar.Quarter.Compat (Quarter, QuarterOfYear (..))

17import qualified Data.UUID.Types as UUID

19import qualified Data.UUID.Types as UUID

18import Data.Version

20import Data.Version

19import Data.Word

21import Data.Word

@@ -87,6 +89,10 @@ spec = do

87 checkUrlPiece (Proxy :: Proxy UTCTime) "UTCTime"

89 checkUrlPiece (Proxy :: Proxy UTCTime) "UTCTime"

88 checkUrlPiece (Proxy :: Proxy NominalDiffTime) "NominalDiffTime"

90 checkUrlPiece (Proxy :: Proxy NominalDiffTime) "NominalDiffTime"

89 checkUrlPiece (Proxy :: Proxy DayOfWeek) "DayOfWeek"

91 checkUrlPiece (Proxy :: Proxy DayOfWeek) "DayOfWeek"

92+ checkUrlPiece (Proxy :: Proxy Quarter) "Quarter"

93+ checkUrlPiece (Proxy :: Proxy QuarterOfYear) "QuarterOfYear"

94+ checkUrlPiece (Proxy :: Proxy Month) "Month"

95+ checkUrlPiece (Proxy :: Proxy DayOfWeek) "DayOfWeek"

90 checkUrlPiece (Proxy :: Proxy Version) "Version"

96 checkUrlPiece (Proxy :: Proxy Version) "Version"

91 checkUrlPiece (Proxy :: Proxy UUID.UUID) "UUID"

97 checkUrlPiece (Proxy :: Proxy UUID.UUID) "UUID"

92 checkUrlPiece' setCookieGen "Cookie"

98 checkUrlPiece' setCookieGen "Cookie"