master..b6f0834 · typeable/req

git.iko.soy/typeable/req

on b6f0834 help sign in

.github/workflows/ci.yaml+10−8

since splitsnapshots

unifiedsplit

@@ -12,14 +12,16 @@ jobs:

12 runs-on: ubuntu-latest

13 steps:

14 - uses: actions/checkout@v4

15− - uses: haskell-actions/run-ormolu@v17

15+ - uses: haskell-actions/run-ormolu@v14

16 build:

17 runs-on: ubuntu-latest

18 needs: ormolu

19 strategy:

20 matrix:

21− cabal: ["3.12"]

21+ cabal: ["3.10"]

22− ghc: ["9.6.3", "9.8.2", "9.10.1"]

22+ ghc: ["9.4.7", "9.6.3", "9.8.1"]

23+ env:

24+ CONFIG: "--enable-tests --enable-benchmarks --flags=dev"

23 steps:

25 steps:

24 - uses: actions/checkout@v4

26 - uses: actions/checkout@v4

25 - uses: haskell-actions/setup@v2

27 - uses: haskell-actions/setup@v2

@@ -28,8 +30,8 @@ jobs:

28 ghc-version: ${{ matrix.ghc }}

30 ghc-version: ${{ matrix.ghc }}

29 cabal-version: ${{ matrix.cabal }}

31 cabal-version: ${{ matrix.cabal }}

30 - run: cabal update

32 - run: cabal update

31− - run: cabal freeze

33+ - run: cabal freeze $CONFIG

32− - uses: actions/cache@v4.2.3

34+ - uses: actions/cache@v3.3.1

33 with:

35 with:

34 path: |

36 path: |

35 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}

37 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}

@@ -38,10 +40,10 @@ jobs:

38 restore-keys: |

40 restore-keys: |

39 ${{ runner.os }}-${{ matrix.ghc }}-

41 ${{ runner.os }}-${{ matrix.ghc }}-

40 - run: cabal format && git diff --exit-code --color=always

42 - run: cabal format && git diff --exit-code --color=always

41− - run: cabal build

43+ - run: cabal build $CONFIG

42 - run: |

44 - run: |

43 docker pull kennethreitz/httpbin

45 docker pull kennethreitz/httpbin

44 docker run -p 1234:80 kennethreitz/httpbin &

46 docker run -p 1234:80 kennethreitz/httpbin &

45− cabal test

47+ cabal test $CONFIG

46− - run: cabal haddock

48+ - run: cabal haddock $CONFIG

47 - run: cabal sdist

49 - run: cabal sdist

CHANGELOG.md−10

@@ -1,13 +1,3 @@

1−## Req 3.13.4

2−

3−* Fixed empty ciphersuite list when compiling against `tls < 2.0.6`

4− (see [PR 175](https://github.com/mrkkrp/req/pull/175)). As a side effect, now

5− compatible with older versions of `crypton-connection` (>= 0.3).

6−

7−## Req 3.13.3

8−

9−* Works with `crypton-connection-0.4` and newer.

10−

11## Req 3.13.2

1## Req 3.13.2

13* Disable the problematic `httpbin-tests` test suite by default. Only enable

3* Disable the problematic `httpbin-tests` test suite by default. Only enable

Network/HTTP/Req.hs+9−9

@@ -236,7 +236,6 @@ import Data.ByteString qualified as B

236import Data.ByteString.Lazy qualified as BL

237import Data.CaseInsensitive qualified as CI

238import Data.Data (Data)

239−import Data.Default.Class (def)

240import Data.Function (on)

239import Data.Function (on)

241import Data.IORef

240import Data.IORef

242import Data.Kind (Constraint, Type)

241import Data.Kind (Constraint, Type)

@@ -585,10 +584,10 @@ req' method url body options m = do

585 withReqManager (m request)

584 withReqManager (m request)

586

585

587-- | Perform an action using the global implicit 'L.Manager' that the rest

586-- | Perform an action using the global implicit 'L.Manager' that the rest

588−-- of the library uses. This allows us to reuse connections that the

587+-- of the library uses. This allows to reuse connections that the

589-- 'L.Manager' controls.

588-- 'L.Manager' controls.

590withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a

589withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a

591−withReqManager m = m globalManager

590+withReqManager m = liftIO (readIORef globalManager) >>= m

592

591

593-- | The global 'L.Manager' that 'req' uses. Here we just go with the

592-- | The global 'L.Manager' that 'req' uses. Here we just go with the

594-- default settings, so users don't need to deal with this manager stuff at

593-- default settings, so users don't need to deal with this manager stuff at

@@ -601,16 +600,16 @@ withReqManager m = m globalManager

601-- manager. From that moment on the 'IORef' will be just reused—exactly the

600-- manager. From that moment on the 'IORef' will be just reused—exactly the

602-- behavior we want here in order to maximize connection sharing. GHC could

601-- behavior we want here in order to maximize connection sharing. GHC could

603-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.

602-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.

604−globalManager :: L.Manager

603+globalManager :: IORef L.Manager

605globalManager = unsafePerformIO $ do

604globalManager = unsafePerformIO $ do

606 context <- NC.initConnectionContext

605 context <- NC.initConnectionContext

607 let settings =

606 let settings =

608 L.mkManagerSettingsContext

607 L.mkManagerSettingsContext

609 (Just context)

608 (Just context)

610− def

609+ (NC.TLSSettingsSimple False False False)

611 Nothing

610 Nothing

612 manager <- L.newManager settings

611 manager <- L.newManager settings

613− return manager

612+ newIORef manager

614{-# NOINLINE globalManager #-}

613{-# NOINLINE globalManager #-}

615

614

616----------------------------------------------------------------------------

615----------------------------------------------------------------------------

@@ -716,6 +715,7 @@ data HttpConfig = HttpConfig

716 -- @since 3.6.0

715 -- @since 3.6.0

717 httpConfigBodyPreviewLength :: forall a. (Num a) => a

716 httpConfigBodyPreviewLength :: forall a. (Num a) => a

718 }

717 }

718+ deriving (Typeable)

719

720-- | The default value of 'HttpConfig'.

721--

@@ -1024,7 +1024,7 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where

1024-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84

1025data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)

1026 -- NOTE The second value is the path segments in reversed order.

1027− deriving (Eq, Ord, Show, Data, Generic)

1027+ deriving (Eq, Ord, Show, Data, Typeable, Generic)

1028

1029type role Url nominal

1030

@@ -2011,7 +2011,7 @@ data HttpException

2011 | -- | A wrapper with Aeson-produced 'String' describing why decoding

2012 -- failed

2013 JsonHttpException String

2014− deriving (Show, Generic)

2014+ deriving (Show, Typeable, Generic)

2015

2016instance Exception HttpException

2017

@@ -2048,4 +2048,4 @@ data Scheme

2048 Http

2049 | -- | HTTPS

2050 Https

2051− deriving (Eq, Ord, Show, Data, Generic, TH.Lift)

2051+ deriving (Eq, Ord, Show, Data, Typeable, Generic, TH.Lift)

README.md+1−1

@@ -4,7 +4,7 @@

4[![Hackage](https://img.shields.io/hackage/v/req.svg?style=flat)](https://hackage.haskell.org/package/req)

5[![Stackage Nightly](http://stackage.org/package/req/badge/nightly)](http://stackage.org/nightly/package/req)

6[![Stackage LTS](http://stackage.org/package/req/badge/lts)](http://stackage.org/lts/package/req)

7−[![CI](https://github.com/mrkkrp/req/actions/workflows/ci.yaml/badge.svg)](https://github.com/mrkkrp/req/actions/workflows/ci.yaml)

7+![CI](https://github.com/mrkkrp/req/workflows/CI/badge.svg?branch=master)

9* [Related packages](#related-packages)

10* [Blog posts](#blog-posts)

cabal.projectdeleted−4

@@ -1,4 +0,0 @@

1−packages: .

2−tests: True

3−benchmarks: True

4−constraints: req +dev

req.cabal+8−11

@@ -1,11 +1,11 @@

1cabal-version: 2.4

2name: req

3−version: 3.13.4

3+version: 3.13.1

4license: BSD-3-Clause

5license-file: LICENSE.md

6maintainer: Mark Karpov <markkarpov92@gmail.com>

7author: Mark Karpov <markkarpov92@gmail.com>

8−tested-with: ghc ==9.6.3 ghc ==9.8.2 ghc ==9.10.1

8+tested-with: ghc ==9.4.7 ghc ==9.6.3 ghc ==9.8.1

9homepage: https://github.com/mrkkrp/req

10bug-reports: https://github.com/mrkkrp/req/issues

11synopsis: HTTP client library

@@ -39,9 +39,8 @@ library

39 blaze-builder >=0.3 && <0.5,

40 bytestring >=0.10.8 && <0.13,

41 case-insensitive >=0.2 && <1.3,

42− containers >=0.5 && <0.8,

42+ containers >=0.5 && <0.7,

43− crypton-connection >=0.4.2 && <0.5,

43+ crypton-connection >=0.2.2 && <0.4,

44− data-default-class >=0.2.0.0,

45 exceptions >=0.6 && <0.11,

44 exceptions >=0.6 && <0.11,

46 http-api-data >=0.2 && <0.7,

45 http-api-data >=0.2 && <0.7,

47 http-client >=0.7.13.1 && <0.8,

46 http-client >=0.7.13.1 && <0.8,

@@ -51,16 +50,14 @@ library

51 monad-control >=1.0 && <1.1,

50 monad-control >=1.0 && <1.1,

52 mtl >=2.0 && <3.0,

51 mtl >=2.0 && <3.0,

53 retry >=0.8 && <0.10,

52 retry >=0.8 && <0.10,

54− template-haskell >=2.19 && <2.23,

53+ template-haskell >=2.19 && <2.22,

55 text >=0.2 && <2.2,

54 text >=0.2 && <2.2,

56 transformers >=0.5.3.0 && <0.7,

55 transformers >=0.5.3.0 && <0.7,

57 transformers-base,

56 transformers-base,

58 unliftio-core >=0.1.1 && <0.3

57 unliftio-core >=0.1.1 && <0.3

60 if flag(dev)

59 if flag(dev)

61− ghc-options:

62− -Wall -Werror -Wpartial-fields -Wunused-packages

60+ ghc-options: -Wall -Werror -Wpartial-fields -Wunused-packages

63− -Wno-unused-imports

65 else

62 else

66 ghc-options: -O2 -Wall

63 ghc-options: -O2 -Wall

@@ -87,9 +84,9 @@ test-suite pure-tests

87 modern-uri >=0.3 && <0.4,

84 modern-uri >=0.3 && <0.4,

88 req,

85 req,

89 retry >=0.8 && <0.10,

86 retry >=0.8 && <0.10,

90− template-haskell >=2.19 && <2.23,

87+ template-haskell >=2.19 && <2.22,

91 text >=0.2 && <2.2,

88 text >=0.2 && <2.2,

92− time >=1.2 && <1.15

89+ time >=1.2 && <1.13

94 if flag(dev)

91 if flag(dev)

95 ghc-options:

92 ghc-options: