master..835683c · typeable/req

.github/workflows/ci.yaml+9−7

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@v15

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

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@v4.0.0

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−6

@@ -1,9 +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

1## Req 3.13.3

8

2

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

3* Works with `crypton-connection-0.4` and newer.

Network/HTTP/Req.hs+8−7

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

585 withReqManager (m request)

586

587-- | 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

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

589-- 'L.Manager' controls.

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

591−withReqManager m = m globalManager

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

592

593-- | 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

@@ -601,7 +601,7 @@ withReqManager m = m globalManager

601-- 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

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

604−globalManager :: L.Manager

604+globalManager :: IORef L.Manager

605globalManager = unsafePerformIO $ do

606 context <- NC.initConnectionContext

607 let settings =

@@ -610,7 +610,7 @@ globalManager = unsafePerformIO $ do

610 def

611 Nothing

612 manager <- L.newManager settings

613− return manager

613+ newIORef manager

614{-# NOINLINE globalManager #-}

615

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

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

716 -- @since 3.6.0

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

718 }

719+ deriving (Typeable)

719

720

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

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

721--

722--

@@ -1024,7 +1025,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

1025-- > -- 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)

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

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

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

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

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

1028

1029

1029type role Url nominal

1030type role Url nominal

1030

1031

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

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

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

2012 -- failed

2013 -- failed

2013 JsonHttpException String

2014 JsonHttpException String

2014− deriving (Show, Generic)

2015+ deriving (Show, Typeable, Generic)

2015

2016

2016instance Exception HttpException

2017instance Exception HttpException

2017

2018

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

2048 Http

2049 Http

2049 | -- | HTTPS

2050 | -- | HTTPS

2050 Https

2051 Https

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

2052+ 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)

8

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+5−5

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

1cabal-version: 2.4

2name: req

3−version: 3.13.4

3+version: 3.13.3

4license: BSD-3-Clause

5license-file: LICENSE.md

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

@@ -39,9 +39,9 @@ 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.4 && <0.5,

44− data-default-class >=0.2.0.0,

44+ data-default-class,

45 exceptions >=0.6 && <0.11,

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

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

@@ -89,7 +89,7 @@ test-suite pure-tests

89 retry >=0.8 && <0.10,

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

91 text >=0.2 && <2.2,

92− time >=1.2 && <1.15

92+ time >=1.2 && <1.13

93

94 if flag(dev)

95 ghc-options: