Hello community, here is the log from the commit of package ghc-http-conduit for openSUSE:Factory checked in at 2018-07-24 17:24:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-http-conduit (Old) and /work/SRC/openSUSE:Factory/.ghc-http-conduit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-http-conduit" Tue Jul 24 17:24:04 2018 rev:13 rq:624314 version:2.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-http-conduit/ghc-http-conduit.changes 2018-05-30 12:26:06.260741017 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-http-conduit.new/ghc-http-conduit.changes 2018-07-24 17:24:05.991431404 +0200 @@ -1,0 +2,16 @@ +Wed Jul 18 14:26:28 UTC 2018 - [email protected] + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + +------------------------------------------------------------------- +Fri Jul 13 14:31:42 UTC 2018 - [email protected] + +- Update http-conduit to version 2.3.2. + ## 2.3.2 + + * Adds `parseRequestThrow`, `parseRequestThrow_`, and + `setRequestCheckStatus` to `Network.HTTP.Simple`. + See [#304](https://github.com/snoyberg/http-client/issues/304) + +------------------------------------------------------------------- @@ -84 +99,0 @@ - Old: ---- http-conduit-2.3.1.tar.gz New: ---- http-conduit-2.3.2.tar.gz http-conduit.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-http-conduit.spec ++++++ --- /var/tmp/diff_new_pack.kCsoBN/_old 2018-07-24 17:24:06.735432353 +0200 +++ /var/tmp/diff_new_pack.kCsoBN/_new 2018-07-24 17:24:06.739432358 +0200 @@ -19,13 +19,14 @@ %global pkg_name http-conduit %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.3.1 +Version: 2.3.2 Release: 0 Summary: HTTP client package with conduit interface and HTTPS support License: BSD-2-Clause Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-bytestring-devel @@ -77,6 +78,7 @@ %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ http-conduit-2.3.1.tar.gz -> http-conduit-2.3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.3.1/ChangeLog.md new/http-conduit-2.3.2/ChangeLog.md --- old/http-conduit-2.3.1/ChangeLog.md 2018-04-09 15:40:11.000000000 +0200 +++ new/http-conduit-2.3.2/ChangeLog.md 2018-07-01 03:15:12.000000000 +0200 @@ -1,3 +1,9 @@ +## 2.3.2 + +* Adds `parseRequestThrow`, `parseRequestThrow_`, and + `setRequestCheckStatus` to `Network.HTTP.Simple`. + See [#304](https://github.com/snoyberg/http-client/issues/304) + ## 2.3.1 * Reexport Query from Network.HTTP.Types diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.3.1/Network/HTTP/Simple.hs new/http-conduit-2.3.2/Network/HTTP/Simple.hs --- old/http-conduit-2.3.1/Network/HTTP/Simple.hs 2018-04-09 15:40:11.000000000 +0200 +++ new/http-conduit-2.3.2/Network/HTTP/Simple.hs 2018-07-01 03:15:12.000000000 +0200 @@ -38,6 +38,8 @@ , H.defaultRequest , H.parseRequest , H.parseRequest_ + , parseRequestThrow + , parseRequestThrow_ -- * Request lenses -- ** Basics , setRequestMethod @@ -60,6 +62,7 @@ , setRequestBodyURLEncoded -- ** Special fields , H.setRequestIgnoreStatus + , H.setRequestCheckStatus , setRequestBasicAuth , setRequestManager , setRequestProxy @@ -86,14 +89,14 @@ import qualified Data.Aeson.Types as A import qualified Data.Aeson as A import qualified Data.Traversable as T -import Control.Exception (throwIO, Exception) +import Control.Exception (throw, throwIO, Exception) import Data.Typeable (Typeable) import qualified Data.Conduit as C import Data.Conduit (runConduit, (.|), ConduitM) import qualified Data.Conduit.Attoparsec as C import qualified Network.HTTP.Types as H import Data.Int (Int64) -import Control.Monad.Trans.Resource (MonadResource) +import Control.Monad.Trans.Resource (MonadResource, MonadThrow) import qualified Control.Exception as E (bracket) import Data.Void (Void) @@ -237,6 +240,25 @@ H.responseClose (run . withRes . fmap bodyReaderSource) +-- | Same as 'parseRequest', except will throw an 'HttpException' in the +-- event of a non-2XX response. This uses 'throwErrorStatusCodes' to +-- implement 'checkResponse'. +-- +-- Exactly the same as 'parseUrlThrow', but has a name that is more +-- consistent with the other parseRequest functions. +-- +-- @since 2.3.2 +parseRequestThrow :: MonadThrow m => String -> m HC.Request +parseRequestThrow = HC.parseUrlThrow + +-- | Same as 'parseRequestThrow', but parse errors cause an impure +-- exception. Mostly useful for static strings which are known to be +-- correctly formatted. +-- +-- @since 2.3.2 +parseRequestThrow_ :: String -> HC.Request +parseRequestThrow_ = either throw id . HC.parseUrlThrow + -- | Alternate spelling of 'httpLBS' -- -- @since 2.1.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.3.1/http-conduit.cabal new/http-conduit-2.3.2/http-conduit.cabal --- old/http-conduit-2.3.1/http-conduit.cabal 2018-04-09 15:40:11.000000000 +0200 +++ new/http-conduit-2.3.2/http-conduit.cabal 2018-07-02 07:58:27.000000000 +0200 @@ -1,5 +1,5 @@ name: http-conduit -version: 2.3.1 +version: 2.3.2 license: BSD3 license-file: LICENSE author: Michael Snoyman <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.3.1/test/CookieTest.hs new/http-conduit-2.3.2/test/CookieTest.hs --- old/http-conduit-2.3.1/test/CookieTest.hs 2016-12-19 16:29:45.000000000 +0100 +++ new/http-conduit-2.3.2/test/CookieTest.hs 2018-07-01 03:15:12.000000000 +0200 @@ -139,7 +139,7 @@ (Just default_cookie, createCookieJar []) (removeExistingCookieFromCookieJar default_cookie $ createCookieJar [default_cookie]) testRemoveNonexistantCookie :: IO () -testRemoveNonexistantCookie = assertEqual "Removing a nonexistant cookie doesn't work" +testRemoveNonexistantCookie = assertEqual "Removing a nonexistent cookie doesn't work" (Nothing, createCookieJar [default_cookie]) (removeExistingCookieFromCookieJar (default_cookie {cookie_name = fromString "key2"}) $ createCookieJar [default_cookie]) testRemoveCorrectCookie :: IO () @@ -379,7 +379,7 @@ where set_cookie = default_set_cookie {setCookiePath = Just $ fromString "/a/path"} testReceiveSetCookieNoPath :: IO () -testReceiveSetCookieNoPath = assertEqual "Path gets set correctly when nonexistant" +testReceiveSetCookieNoPath = assertEqual "Path gets set correctly when nonexistent" (fromString "/a/path/to") (cookie_path $ head $ destroyCookieJar $ receiveSetCookie set_cookie request default_time True $ createCookieJar []) where set_cookie = default_set_cookie {setCookiePath = Nothing} request = default_request {HC.path = fromString "/a/path/to/nowhere"} @@ -487,7 +487,7 @@ removeTests :: Spec removeTests = do it "Removing a cookie works" testRemoveCookie - it "Removing a nonexistant cookie doesn't work" testRemoveNonexistantCookie + it "Removing a nonexistent cookie doesn't work" testRemoveNonexistantCookie it "Removing the correct cookie" testRemoveCorrectCookie evictionTests :: Spec @@ -528,7 +528,7 @@ it "Expiry gets set based on max age if no expiry is given" testReceiveSetCookieNoExpiry it "Expiry gets set based on given value if no max age is given" testReceiveSetCookieNoMaxAge it "Expiry gets set to a future date if no expiry and no max age are given" testReceiveSetCookieNoExpiryNoMaxAge - it "Path gets set correctly when nonexistant" testReceiveSetCookieNoPath + it "Path gets set correctly when nonexistent" testReceiveSetCookieNoPath it "Path gets set correctly" testReceiveSetCookiePath it "Creation time gets set correctly" testReceiveSetCookieCreationTime it "Last access time gets set correctly" testReceiveSetCookieAccessTime ++++++ http-conduit.cabal ++++++ name: http-conduit version: 2.3.2 x-revision: 1 license: BSD3 license-file: LICENSE author: Michael Snoyman <[email protected]> maintainer: Michael Snoyman <[email protected]> synopsis: HTTP client package with conduit interface and HTTPS support. description: Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/http-conduit>. category: Web, Conduit stability: Stable cabal-version: >= 1.8 build-type: Simple homepage: http://www.yesodweb.com/book/http-conduit extra-source-files: test/main.hs , test/CookieTest.hs , multipart-example.bin , nyan.gif , certificate.pem , key.pem , README.md , ChangeLog.md library build-depends: base >= 4 && < 5 , aeson >= 0.8 , bytestring >= 0.9.1.4 , transformers >= 0.2 , resourcet >= 1.1 , conduit >= 1.2 , conduit-extra >= 1.1 , http-types >= 0.7 , http-client >= 0.5.13 && < 0.6 , http-client-tls >= 0.3 && < 0.4 , mtl , unliftio-core if !impl(ghc>=7.9) build-depends: void >= 0.5.5 exposed-modules: Network.HTTP.Conduit Network.HTTP.Client.Conduit Network.HTTP.Simple ghc-options: -Wall test-suite test main-is: main.hs other-modules: CookieTest type: exitcode-stdio-1.0 hs-source-dirs: test ghc-options: -Wall cpp-options: -DDEBUG build-depends: base >= 4 && < 5 , HUnit , hspec >= 1.3 , data-default-class , connection >= 0.2 , warp-tls , time , blaze-builder , bytestring , text , transformers , conduit >= 1.1 , utf8-string , case-insensitive , unliftio , network , wai >= 3.0 && < 3.3 , warp >= 3.0.0.2 && < 3.3 , wai-conduit , http-types , cookie , http-client , http-conduit , conduit-extra , streaming-commons , aeson , temporary , resourcet source-repository head type: git location: git://github.com/snoyberg/http-client.git
