diff --git a/ghc-tasty.changes b/ghc-tasty.changes index 5809462..3aba5af 100644 --- a/ghc-tasty.changes +++ b/ghc-tasty.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Sun Nov 3 00:34:02 UTC 2024 - Peter Simons + +- Update tasty to version 1.5.2. + Version 1.5.2 + -------------- + + _2024-11-03_ + + * Partially revert [#393](https://github.com/UnkindPartition/tasty/pull/393) + to fix progress reporting outside of Emacs. + * Do not depend on `unbounded-delays` on `ppc64`, `s390x` and `riscv64` + ([#371](https://github.com/UnkindPartition/tasty/pull/371), + [#422](https://github.com/UnkindPartition/tasty/pull/422), + [#423](https://github.com/UnkindPartition/tasty/pull/423)). + + Version 1.5.1 + -------------- + + _2024-06-22_ + + * Performance improvements + ([#389](https://github.com/UnkindPartition/tasty/pull/389), + [#390](https://github.com/UnkindPartition/tasty/pull/390)). + * Progress reporting in Emacs: use `\r` instead of ANSI escape sequences + ([#393](https://github.com/UnkindPartition/tasty/pull/393)). + * Console reporter: fix unintended change to `foldHeading` + ([#396](https://github.com/UnkindPartition/tasty/pull/396)). + * Prune empty test subtrees from `TestTree` + ([#403](https://github.com/UnkindPartition/tasty/pull/403)). + * Add `instance Eq Timeout` and `instance Ord Timeout` + ([#415](https://github.com/UnkindPartition/tasty/pull/415)). + * Add ability to supply options for launchers and reporters at the top-level of test tree + ([#417](https://github.com/UnkindPartition/tasty/pull/417)). + +- "riscv64-unbounded-delays.patch" is now obsolete. + ------------------------------------------------------------------- Fri Jul 19 19:57:20 UTC 2024 - Christian Boltz diff --git a/ghc-tasty.spec b/ghc-tasty.spec index c63dc46..c546278 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -19,17 +19,12 @@ %global pkg_name tasty %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.5 +Version: 1.5.2 Release: 0 Summary: Modern and extensible testing framework License: MIT 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/2.cabal#/%{pkg_name}.cabal -# https://github.com/UnkindPartition/tasty/pull/371 (riscv64) -# https://github.com/UnkindPartition/tasty/pull/422 (s390x, merged upstream) -# https://github.com/UnkindPartition/tasty/pull/423 (ppc64, merged upstream) -Patch0: riscv64-unbounded-delays.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-ansi-terminal-prof @@ -82,9 +77,7 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof) This package provides the Haskell %{pkg_name} profiling library. %prep -%setup -q -n %{pkg_name}-%{version} -tr -d '\r' <%{SOURCE1} >%{pkg_name}.cabal -%autopatch -p0 +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build diff --git a/riscv64-unbounded-delays.patch b/riscv64-unbounded-delays.patch deleted file mode 100644 index 23ac913..0000000 --- a/riscv64-unbounded-delays.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tasty.cabal.orig 2024-03-01 20:46:02.849342429 +0000 -+++ tasty.cabal 2024-03-01 20:46:12.567277033 +0000 -@@ -69,7 +69,7 @@ - ansi-terminal >= 0.9 && < 1.2 - - -- No reason to depend on unbounded-delays on 64-bit architecture -- if(!arch(x86_64) && !arch(aarch64)) -+ if(!arch(x86_64) && !arch(aarch64) && !arch(ppc64) && !arch(riscv64) && !arch(s390x)) - build-depends: - unbounded-delays >= 0.1 && < 0.2 - diff --git a/tasty-1.5.2.tar.gz b/tasty-1.5.2.tar.gz new file mode 100644 index 0000000..cceebf2 --- /dev/null +++ b/tasty-1.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:729cb0454fb9be2285eb51fe3bb191bd6096bd11d5fe08eda1ca59517731b737 +size 66288 diff --git a/tasty-1.5.tar.gz b/tasty-1.5.tar.gz deleted file mode 100644 index cff9fb2..0000000 --- a/tasty-1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca5cf7852a210e691d4dce67ee34de7ccb8ae390a3a68ecffde307e326d029ac -size 65023 diff --git a/tasty.cabal b/tasty.cabal deleted file mode 100644 index 63a30d6..0000000 --- a/tasty.cabal +++ /dev/null @@ -1,93 +0,0 @@ -cabal-version: >=1.10 -name: tasty -version: 1.5 -x-revision: 2 -synopsis: Modern and extensible testing framework -description: Tasty is a modern testing framework for Haskell. - It lets you combine your unit tests, golden - tests, QuickCheck/SmallCheck properties, and any - other types of tests into a single test suite. -license: MIT -license-file: LICENSE -author: Roman Cheplyaka -maintainer: Roman Cheplyaka -homepage: https://github.com/UnkindPartition/tasty -bug-reports: https://github.com/UnkindPartition/tasty/issues --- copyright: -category: Testing -build-type: Simple -extra-source-files: CHANGELOG.md, README.md - -Source-repository head - type: git - location: https://github.com/UnkindPartition/tasty.git - subdir: core - -flag unix - description: - Depend on the unix package to install signal handlers - default: True - -library - exposed-modules: - Test.Tasty, - Test.Tasty.Options, - Test.Tasty.Providers, - Test.Tasty.Providers.ConsoleFormat, - Test.Tasty.Runners - Test.Tasty.Ingredients, - Test.Tasty.Ingredients.Basic - Test.Tasty.Ingredients.ConsoleReporter - - -- for testing only - Test.Tasty.Patterns.Types - Test.Tasty.Patterns.Parser - Test.Tasty.Patterns.Printer - Test.Tasty.Patterns.Eval - other-modules: - Control.Concurrent.Async - Test.Tasty.Parallel, - Test.Tasty.Core, - Test.Tasty.Options.Core, - Test.Tasty.Options.Env, - Test.Tasty.Patterns, - Test.Tasty.Patterns.Expr, - Test.Tasty.Run, - Test.Tasty.Runners.Reducers, - Test.Tasty.Runners.Utils, - Test.Tasty.CmdLine, - Test.Tasty.Ingredients.ListTests - Test.Tasty.Ingredients.IncludingOptions - - build-depends: - base >= 4.9 && < 5, - stm >= 2.3 && < 2.6, - containers >= 0.5.8 && < 0.8, - transformers >= 0.5 && < 0.7, - tagged >= 0.5 && < 0.9, - optparse-applicative >= 0.14 && < 0.19, - ansi-terminal >= 0.9 && < 1.2 - - -- No reason to depend on unbounded-delays on 64-bit architecture - if(!arch(x86_64) && !arch(aarch64)) - build-depends: - unbounded-delays >= 0.1 && < 0.2 - - if(!impl(ghc >= 8.0)) - build-depends: semigroups < 0.21 - - if(!impl(ghc >= 8.4)) - build-depends: time >= 1.4 && < 1.13 - - if !os(windows) && !impl(ghcjs) - cpp-options: -DUSE_WCWIDTH - if flag(unix) - build-depends: unix < 2.9 - - -- hs-source-dirs: - default-language: Haskell2010 - default-extensions: CPP, ScopedTypeVariables, DeriveDataTypeable - ghc-options: - -Wall - -Wno-incomplete-uni-patterns - -Wcompat