Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-criterion for openSUSE:Factory checked in at 2023-06-22 23:25:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-criterion (Old) and /work/SRC/openSUSE:Factory/.ghc-criterion.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-criterion" Thu Jun 22 23:25:20 2023 rev:8 rq:1094426 version:1.6.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-criterion/ghc-criterion.changes 2023-04-04 21:19:29.848837344 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-criterion.new.15902/ghc-criterion.changes 2023-06-22 23:25:43.801740274 +0200 @@ -1,0 +2,13 @@ +Tue May 23 23:07:17 UTC 2023 - Peter Simons <[email protected]> + +- Update criterion to version 1.6.2.0. + 1.6.2.0 + + * Require `optparse-applicative-0.18.*` as the minimum and add an explicit + dependency on `prettyprinter` and `prettyprinter-ansi-terminal`. + + 1.6.1.0 + + * Support building with `optparse-applicative-0.18.*`. + +------------------------------------------------------------------- Old: ---- criterion-1.6.0.0.tar.gz criterion.cabal New: ---- criterion-1.6.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-criterion.spec ++++++ --- /var/tmp/diff_new_pack.rMYgqy/_old 2023-06-22 23:25:44.441743539 +0200 +++ /var/tmp/diff_new_pack.rMYgqy/_new 2023-06-22 23:25:44.453743600 +0200 @@ -20,21 +20,18 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.6.0.0 +Version: 1.6.2.0 Release: 0 Summary: Robust, reliable performance measurement and analysis License: BSD-2-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: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Glob-devel BuildRequires: ghc-Glob-prof BuildRequires: ghc-aeson-devel BuildRequires: ghc-aeson-prof -BuildRequires: ghc-ansi-wl-pprint-devel -BuildRequires: ghc-ansi-wl-pprint-prof BuildRequires: ghc-base-compat-batteries-devel BuildRequires: ghc-base-compat-batteries-prof BuildRequires: ghc-base-devel @@ -73,6 +70,10 @@ BuildRequires: ghc-optparse-applicative-prof BuildRequires: ghc-parsec-devel BuildRequires: ghc-parsec-prof +BuildRequires: ghc-prettyprinter-ansi-terminal-devel +BuildRequires: ghc-prettyprinter-ansi-terminal-prof +BuildRequires: ghc-prettyprinter-devel +BuildRequires: ghc-prettyprinter-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-statistics-devel BuildRequires: ghc-statistics-prof @@ -145,7 +146,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ criterion-1.6.0.0.tar.gz -> criterion-1.6.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criterion-1.6.0.0/Criterion/Main/Options/Internal.hs new/criterion-1.6.2.0/Criterion/Main/Options/Internal.hs --- old/criterion-1.6.0.0/Criterion/Main/Options/Internal.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/criterion-1.6.2.0/Criterion/Main/Options/Internal.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -{-# LANGUAGE CPP #-} - --- | --- Module : Criterion.Main.Options.Internal --- Copyright : (c) 2022 Ryan Scott --- --- License : BSD-style --- Maintainer : [email protected] --- Stability : experimental --- Portability : GHC --- --- Provides a shim on top of @optparse-applicative@'s 'Options.tabulate' --- function that is backwards-compatible with [email protected].*@ versions of --- @optparse-applicative@. This is deliberately kept separate from the rest of --- "Criterion.Main.Options" because this function requires CPP to define, and --- there is a Haddock comment in "Criterion.Main.Options" that will cause the --- CPP preprocessor to trigger an \"unterminated comment\" error. Ugh. --- --- TODO: When we support @optparse-applicative-0.17@ as the minimum, remove --- this module and simply inline the definition of 'tabulate' in --- "Criterion.Main.Options". -module Criterion.Main.Options.Internal (tabulate) where - -import qualified Options.Applicative.Help as Options -import Options.Applicative.Help (Chunk, Doc) - -#if MIN_VERSION_optparse_applicative(0,17,0) -import Options.Applicative (ParserPrefs(..), defaultPrefs) -#endif - --- | A shim on top of 'Options.tabulate' from @optparse-applicative@ that is --- backwards-compatible with [email protected].*@ versions of @optparse-applicative@. -tabulate :: [(Doc, Doc)] -> Chunk Doc -#if MIN_VERSION_optparse_applicative(0,17,0) -tabulate = Options.tabulate (prefTabulateFill defaultPrefs) -#else -tabulate = Options.tabulate -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criterion-1.6.0.0/Criterion/Main/Options.hs new/criterion-1.6.2.0/Criterion/Main/Options.hs --- old/criterion-1.6.0.0/Criterion/Main/Options.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/criterion-1.6.2.0/Criterion/Main/Options.hs 2001-09-09 03:46:40.000000000 +0200 @@ -25,7 +25,6 @@ import Control.Monad (when) import Criterion.Analysis (validateAccessors) -import Criterion.Main.Options.Internal (tabulate) import Criterion.Types (Config(..), Verbosity(..), measureAccessors, measureKeys) import Data.Char (isSpace, toLower) @@ -35,14 +34,15 @@ import Data.Version (showVersion) import GHC.Generics (Generic) import Options.Applicative -import Options.Applicative.Help (Chunk(..)) +import Options.Applicative.Help (Chunk(..), tabulate) import Options.Applicative.Help.Pretty ((.$.)) import Options.Applicative.Types import Paths_criterion (version) import Prelude () import Prelude.Compat +import Prettyprinter (Doc, pretty) +import Prettyprinter.Render.Terminal (AnsiStyle) import Statistics.Types (mkCL,cl95) -import Text.PrettyPrint.ANSI.Leijen (Doc, text) import qualified Data.Map as M -- | How to match a benchmark name. @@ -240,8 +240,10 @@ versionInfo = "built with criterion " <> showVersion version -- We sort not by name, but by likely frequency of use. -regressionHelp :: Chunk Doc +regressionHelp :: Chunk (Doc AnsiStyle) regressionHelp = - fmap (text "Regression metrics (for use with --regress):" .$.) $ - tabulate [(text n,text d) | (n,(_,d)) <- map f measureKeys] + fmap (pretty "Regression metrics (for use with --regress):" .$.) $ + tabulate + (prefTabulateFill defaultPrefs) + [(pretty n, pretty d) | (n,(_,d)) <- map f measureKeys] where f k = (k, measureAccessors M.! k) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criterion-1.6.0.0/README.markdown new/criterion-1.6.2.0/README.markdown --- old/criterion-1.6.0.0/README.markdown 2001-09-09 03:46:40.000000000 +0200 +++ new/criterion-1.6.2.0/README.markdown 2001-09-09 03:46:40.000000000 +0200 @@ -13,14 +13,6 @@ in the <a href="/examples" target="_blank">examples directory</a>. - -# Building and installing - -To build and install criterion, just run - - cabal install criterion - - # Get involved! Please report bugs via the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criterion-1.6.0.0/changelog.md new/criterion-1.6.2.0/changelog.md --- old/criterion-1.6.0.0/changelog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/criterion-1.6.2.0/changelog.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,12 @@ +1.6.2.0 + +* Require `optparse-applicative-0.18.*` as the minimum and add an explicit + dependency on `prettyprinter` and `prettyprinter-ansi-terminal`. + +1.6.1.0 + +* Support building with `optparse-applicative-0.18.*`. + 1.6.0.0 * `criterion-measurement-0.2.0.0` adds the `measPeakMbAllocated` field to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criterion-1.6.0.0/criterion.cabal new/criterion-1.6.2.0/criterion.cabal --- old/criterion-1.6.0.0/criterion.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/criterion-1.6.2.0/criterion.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ name: criterion -version: 1.6.0.0 +version: 1.6.2.0 synopsis: Robust, reliable performance measurement and analysis license: BSD3 license-file: LICENSE @@ -29,7 +29,9 @@ GHC==8.8.4, GHC==8.10.7, GHC==9.0.2, - GHC==9.2.2 + GHC==9.2.7, + GHC==9.4.5, + GHC==9.6.1 data-files: templates/*.css @@ -75,7 +77,6 @@ Criterion.Types other-modules: - Criterion.Main.Options.Internal Criterion.Monad.Internal other-modules: @@ -85,9 +86,8 @@ -- TODO: Eventually, we should bump the lower version bounds to >=2 so that -- we can remove some CPP in Criterion.Report. See #247. aeson >= 1 && < 2.2, - ansi-wl-pprint >= 0.6.7.2, base >= 4.5 && < 5, - base-compat-batteries >= 0.10 && < 0.13, + base-compat-batteries >= 0.10 && < 0.14, binary >= 0.5.1.0, binary-orphans >= 1.0.1 && < 1.1, bytestring >= 0.9 && < 1.0, @@ -104,9 +104,10 @@ js-chart >= 2.9.4 && < 3, mtl >= 2, mwc-random >= 0.8.0.3, - -- TODO: Depend on optparse-applicative-0.17 as the minimum (see #258) - optparse-applicative >= 0.13 && < 0.18, + optparse-applicative >= 0.18 && < 0.19, parsec >= 3.1.0, + prettyprinter >= 1.7 && < 1.8, + prettyprinter-ansi-terminal >= 1.1 && < 1.2, statistics >= 0.14 && < 0.17, text >= 0.11, time, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criterion-1.6.0.0/examples/Fibber.hs new/criterion-1.6.2.0/examples/Fibber.hs --- old/criterion-1.6.0.0/examples/Fibber.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/criterion-1.6.2.0/examples/Fibber.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,8 +1,11 @@ --- The simplest/silliest of all benchmarks! +{- cabal: +build-depends: base, criterion +-} import Criterion.Main -fib :: Integer -> Integer +-- The function we're benchmarking. +fib :: Int -> Int fib m | m < 0 = error "negative!" | otherwise = go m where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/criterion-1.6.0.0/examples/criterion-examples.cabal new/criterion-1.6.2.0/examples/criterion-examples.cabal --- old/criterion-1.6.0.0/examples/criterion-examples.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/criterion-1.6.2.0/examples/criterion-examples.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -22,7 +22,9 @@ GHC==8.8.4, GHC==8.10.7, GHC==9.0.2, - GHC==9.2.2 + GHC==9.2.7, + GHC==9.4.5, + GHC==9.6.1 flag conduit-vs-pipes default: True
