Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-katip for openSUSE:Factory checked in at 2022-08-10 17:13:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-katip (Old) and /work/SRC/openSUSE:Factory/.ghc-katip.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-katip" Wed Aug 10 17:13:21 2022 rev:5 rq:994044 version:0.8.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-katip/ghc-katip.changes 2022-02-11 23:11:10.331251860 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-katip.new.1521/ghc-katip.changes 2022-08-10 17:14:24.485881528 +0200 @@ -1,0 +2,12 @@ +Sat May 21 00:09:49 UTC 2022 - Peter Simons <[email protected]> + +- Update katip to version 0.8.7.2. + 0.8.7.2 + ======= + * MTL 2.3 compatibility [#140](https://github.com/Soostone/katip/pull/140) + + 0.8.7.1 + ======= + * Text 2 compatibility [#138](https://github.com/Soostone/katip/pull/138) + +------------------------------------------------------------------- Old: ---- katip-0.8.7.0.tar.gz katip.cabal New: ---- katip-0.8.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-katip.spec ++++++ --- /var/tmp/diff_new_pack.rENk1k/_old 2022-08-10 17:14:25.361883815 +0200 +++ /var/tmp/diff_new_pack.rENk1k/_new 2022-08-10 17:14:25.369883836 +0200 @@ -19,13 +19,12 @@ %global pkg_name katip %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.7.0 +Version: 0.8.7.2 Release: 0 Summary: A structured logging framework License: BSD-3-Clause 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-async-devel @@ -82,7 +81,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ katip-0.8.7.0.tar.gz -> katip-0.8.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katip-0.8.7.0/changelog.md new/katip-0.8.7.2/changelog.md --- old/katip-0.8.7.0/changelog.md 2021-11-05 20:09:31.000000000 +0100 +++ new/katip-0.8.7.2/changelog.md 2022-05-21 02:09:24.000000000 +0200 @@ -1,3 +1,11 @@ +0.8.7.2 +======= +* MTL 2.3 compatibility [#140](https://github.com/Soostone/katip/pull/140) + +0.8.7.1 +======= +* Text 2 compatibility [#138](https://github.com/Soostone/katip/pull/138) + 0.8.7.0 ======= * Aeson 2 compatibility [#131](https://github.com/Soostone/katip/pull/131) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katip-0.8.7.0/katip.cabal new/katip-0.8.7.2/katip.cabal --- old/katip-0.8.7.0/katip.cabal 2021-11-05 20:09:18.000000000 +0100 +++ new/katip-0.8.7.2/katip.cabal 2022-05-21 02:08:41.000000000 +0200 @@ -1,5 +1,5 @@ name: katip -version: 0.8.7.0 +version: 0.8.7.2 synopsis: A structured logging framework. description: Katip is a structured logging framework. See README.md for more details. @@ -25,7 +25,7 @@ test/Katip/Tests/Scribes/Handle.hs test/Katip/Tests/Scribes/Handle-text.golden test/Katip/Tests/Format/Time.hs -tested-with: GHC == 8.0.1, GHC == 8.2.2, GHC == 8.4.3 +tested-with: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2 source-repository head type: git @@ -54,8 +54,8 @@ OverloadedStrings build-depends: base >=4.9.0.0 && <5 - , aeson >=0.6 - , async < 3.0.0.0 + , aeson >=1.0.0.0 + , async >= 2.0.0.0 && < 3.0.0.0 , auto-update >= 0.1 , bytestring >= 0.9 , containers >=0.4 @@ -65,7 +65,7 @@ , old-locale >= 1.0 , string-conv >= 0.1 , template-haskell >= 2.8 - , text >= 0.11 + , text >= 1.2.4.0 , time >= 1 , transformers >= 0.3 , transformers-compat @@ -73,13 +73,13 @@ , monad-control >= 1.0 , mtl >= 2.0 , transformers-base >= 0.3 - , resourcet >= 1.1 + , resourcet >= 1.2.0 , scientific >= 0.3.3.0 , microlens >= 0.2.0.0 , microlens-th >= 0.1.0.0 , semigroups , unliftio-core >= 0.1 - , stm >= 2.4 + , stm >= 2.4.4.1 hs-source-dirs: src default-language: Haskell2010 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katip-0.8.7.0/src/Katip/Core.hs new/katip-0.8.7.2/src/Katip/Core.hs --- old/katip-0.8.7.0/src/Katip/Core.hs 2021-11-05 20:09:18.000000000 +0100 +++ new/katip-0.8.7.2/src/Katip/Core.hs 2022-02-14 21:59:21.000000000 +0100 @@ -70,6 +70,7 @@ import qualified Data.Map.Strict as M import Data.Maybe (fromMaybe) import Data.Semigroup as SG +import qualified Data.Set as Set import Data.String import Data.String.Conv import Data.Text (Text) @@ -438,6 +439,13 @@ mappend = (<>) +-- | Compares two payload selections for equivalence. With SomeKeys, ordering +-- and duplicates are ignored. +equivalentPayloadSelection :: PayloadSelection -> PayloadSelection -> Bool +equivalentPayloadSelection AllKeys AllKeys = True +equivalentPayloadSelection (SomeKeys a) (SomeKeys b) = Set.fromList a == Set.fromList b +equivalentPayloadSelection _ _ = False + ------------------------------------------------------------------------------- -- | Katip requires JSON objects to be logged as context. This -- typeclass provides a default instance which uses ToJSON and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katip-0.8.7.0/src/Katip/Format/Time.hs new/katip-0.8.7.2/src/Katip/Format/Time.hs --- old/katip-0.8.7.0/src/Katip/Format/Time.hs 2021-10-22 21:52:19.000000000 +0200 +++ new/katip-0.8.7.2/src/Katip/Format/Time.hs 2022-05-13 00:32:05.000000000 +0200 @@ -1,3 +1,5 @@ +{-# LANGUAGE CPP #-} + -- | Time and memory efficient time encoding helper functions. module Katip.Format.Time ( formatAsLogTime, @@ -11,7 +13,12 @@ import qualified Data.Text.Array as TA import Data.Text.Internal (Text (..)) import Data.Time (Day, DiffTime, UTCTime (..), toGregorian) -import Data.Word (Word16) +import Data.Word +#if MIN_VERSION_text(2,0,0) + (Word8) +#else + (Word16) +#endif import Unsafe.Coerce (unsafeCoerce) -- Note: All functions here are optimized to never allocate anything @@ -178,14 +185,24 @@ -- Copyright: (c) 2015-2016 Bryan O'Sullivan -- License: BSD3 -data T = T {-# UNPACK #-} !Word16 {-# UNPACK #-} !Word16 +data T = T +#if MIN_VERSION_text(2,0,0) + {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 +#else + {-# UNPACK #-} !Word16 {-# UNPACK #-} !Word16 +#endif twoDigits :: Int -> T twoDigits a = T (digit hi) (digit lo) where (hi, lo) = a `quotRem` 10 -digit :: Int -> Word16 +digit :: Int -> +#if MIN_VERSION_text(2,0,0) + Word8 +#else + Word16 +#endif digit x = fromIntegral (x + 48) data TimeOfDay64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katip-0.8.7.0/src/Katip/Monadic.hs new/katip-0.8.7.2/src/Katip/Monadic.hs --- old/katip-0.8.7.0/src/Katip/Monadic.hs 2021-11-05 20:09:18.000000000 +0100 +++ new/katip-0.8.7.2/src/Katip/Monadic.hs 2022-05-21 02:08:28.000000000 +0200 @@ -43,11 +43,13 @@ ------------------------------------------------------------------------------- import Control.Applicative import Control.Exception.Safe +import Control.Monad as CM import Control.Monad.Base import Control.Monad.Error.Class #if MIN_VERSION_base(4, 9, 0) import qualified Control.Monad.Fail as MF #endif +import Control.Monad.Fix as MFix import Control.Monad.IO.Class import Control.Monad.IO.Unlift import Control.Monad.Reader @@ -71,7 +73,8 @@ ( WriterT, mapWriterT, ) -import Control.Monad.Writer hiding ((<>)) +import qualified Control.Monad.Writer as Lazy (WriterT, mapWriterT) +import Control.Monad.Writer.Class as WC import Data.Aeson #if MIN_VERSION_aeson(2, 0, 0) import qualified Data.Aeson.KeyMap as KM @@ -233,11 +236,11 @@ getKatipNamespace = lift getKatipNamespace localKatipNamespace = Strict.mapWriterT . localKatipNamespace -instance (Monoid w, KatipContext m, Katip (WriterT w m)) => KatipContext (WriterT w m) where +instance (Monoid w, KatipContext m, Katip (Lazy.WriterT w m)) => KatipContext (Lazy.WriterT w m) where getKatipContext = lift getKatipContext - localKatipContext = mapWriterT . localKatipContext + localKatipContext = Lazy.mapWriterT . localKatipContext getKatipNamespace = lift getKatipNamespace - localKatipNamespace = mapWriterT . localKatipNamespace + localKatipNamespace = Lazy.mapWriterT . localKatipNamespace instance (Monoid w, KatipContext m, Katip (Strict.RWST r w s m)) => KatipContext (Strict.RWST r w s m) where getKatipContext = lift getKatipContext @@ -367,12 +370,12 @@ MonadMask, MonadBase b, MonadState s, - MonadWriter w, + WC.MonadWriter w, MonadError e, - MonadPlus, + CM.MonadPlus, MonadResource, Alternative, - MonadFix, + MFix.MonadFix, MonadTrans ) @@ -481,11 +484,11 @@ MonadMask, MonadBase b, MonadState s, - MonadWriter w, + WC.MonadWriter w, MonadError e, - MonadPlus, + CM.MonadPlus, Alternative, - MonadFix, + MFix.MonadFix, MonadReader r ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katip-0.8.7.0/test/Katip/Tests/Scribes/Handle.hs new/katip-0.8.7.2/test/Katip/Tests/Scribes/Handle.hs --- old/katip-0.8.7.0/test/Katip/Tests/Scribes/Handle.hs 2021-11-05 20:09:18.000000000 +0100 +++ new/katip-0.8.7.2/test/Katip/Tests/Scribes/Handle.hs 2022-02-14 21:59:21.000000000 +0100 @@ -73,6 +73,11 @@ goldenTextPath = "test/Katip/Tests/Scribes/Handle-text-aeson2.golden" goldenJsonPath :: FilePath goldenJsonPath = "test/Katip/Tests/Scribes/Handle-json-aeson2.golden" +#elif MIN_VERSION_unordered_containers(0, 2, 16) +goldenTextPath :: FilePath +goldenTextPath = "test/Katip/Tests/Scribes/Handle-text-aeson2.golden" +goldenJsonPath :: FilePath +goldenJsonPath = "test/Katip/Tests/Scribes/Handle-json-aeson2.golden" #else goldenTextPath :: FilePath goldenTextPath = "test/Katip/Tests/Scribes/Handle-text.golden" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/katip-0.8.7.0/test/Katip/Tests.hs new/katip-0.8.7.2/test/Katip/Tests.hs --- old/katip-0.8.7.0/test/Katip/Tests.hs 2021-11-05 20:09:18.000000000 +0100 +++ new/katip-0.8.7.2/test/Katip/Tests.hs 2022-02-14 21:59:21.000000000 +0100 @@ -79,10 +79,19 @@ let everything = liftPayload (SimpleLogPayload [("foo", AnyLogPayload ("a" :: Text))]) conservative = liftPayload (ConservativePayload "always" "rarely") both = everything <> conservative - payloadKeys V2 both @?= SomeKeys ["often_shown", "rarely_shown", "foo"] - payloadKeys V1 both @?= SomeKeys ["often_shown", "foo"] + assertEquivalentPayloadSelection + (payloadKeys V2 both) + (SomeKeys somePayloadKeys) + assertEquivalentPayloadSelection + (payloadKeys V1 both) + (SomeKeys ["often_shown", "foo"]) ] +assertEquivalentPayloadSelection :: PayloadSelection -> PayloadSelection -> Assertion +assertEquivalentPayloadSelection a b + | equivalentPayloadSelection a b = pure () + | otherwise = assertFailure ("Expected " <> show a <> " =~ " <> show b) + #if MIN_VERSION_aeson(2, 0, 0) singletonMap :: K.Key -> v -> KM.KeyMap v singletonMap = KM.singleton @@ -91,6 +100,14 @@ singletonMap = HM.singleton #endif +#if MIN_VERSION_unordered_containers(0, 2, 16) +somePayloadKeys :: [Text] +somePayloadKeys = ["rarely_shown", "often_shown", "foo"] +#else +somePayloadKeys :: [Text] +somePayloadKeys = ["often_shown", "rarely_shown", "foo"] +#endif + ------------------------------------------------------------------------------- closeScribeTests :: TestTree closeScribeTests =
