From cf6fa780c465167de5e380b861d29f072b257f10 Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Sun, 11 Mar 2018 20:05:58 +0000 Subject: [PATCH 1/4] Bump exceptions upper bound in concurrency --- concurrency/CHANGELOG.rst | 9 +++++++++ concurrency/concurrency.cabal | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/concurrency/CHANGELOG.rst b/concurrency/CHANGELOG.rst index 50d50e85..dbc69206 100644 --- a/concurrency/CHANGELOG.rst +++ b/concurrency/CHANGELOG.rst @@ -7,6 +7,15 @@ standard Haskell versioning scheme. .. _PVP: https://pvp.haskell.org/ +unreleased +---------- + +Miscellaneous +~~~~~~~~~~~~~ + +* The upper bound on :hackage:`exceptions` is <0.11. + + 1.4.0.1 (2018-02-26) -------------------- diff --git a/concurrency/concurrency.cabal b/concurrency/concurrency.cabal index 88177a1f..98b18edb 100755 --- a/concurrency/concurrency.cabal +++ b/concurrency/concurrency.cabal @@ -58,7 +58,7 @@ library build-depends: base >=4.8 && <5 , array >=0.5 && <0.6 , atomic-primops >=0.8 && <0.9 - , exceptions >=0.7 && <0.10 + , exceptions >=0.7 && <0.11 , monad-control >=1.0 && <1.1 , mtl >=2.2 && <2.3 , stm >=2.4 && <2.5 From c29aaf10cb43404f065006e28c696a2998360ccb Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Sun, 11 Mar 2018 20:06:12 +0000 Subject: [PATCH 2/4] Bump exceptions upper bound in dejafu & CPP it --- dejafu/CHANGELOG.rst | 10 ++++++++++ dejafu/Test/DejaFu/Conc.hs | 8 +++++++- dejafu/dejafu.cabal | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dejafu/CHANGELOG.rst b/dejafu/CHANGELOG.rst index 5830e5d6..ade7b8c1 100644 --- a/dejafu/CHANGELOG.rst +++ b/dejafu/CHANGELOG.rst @@ -6,6 +6,16 @@ standard Haskell versioning scheme. .. _PVP: https://pvp.haskell.org/ + +unreleased +---------- + +Miscellaneous +~~~~~~~~~~~~~ + +* The upper bound on :hackage:`exceptions` is <0.11. + + 1.3.0.2 (2018-03-11) -------------------- diff --git a/dejafu/Test/DejaFu/Conc.hs b/dejafu/Test/DejaFu/Conc.hs index 15985ebc..7d166bc1 100755 --- a/dejafu/Test/DejaFu/Conc.hs +++ b/dejafu/Test/DejaFu/Conc.hs @@ -132,7 +132,13 @@ instance Ca.MonadMask (ConcT r n) where mask mb = toConc (AMasking MaskedInterruptible (\f -> unC $ mb $ wrap f)) uninterruptibleMask mb = toConc (AMasking MaskedUninterruptible (\f -> unC $ mb $ wrap f)) -#if MIN_VERSION_exceptions(0,9,0) +#if MIN_VERSION_exceptions(0,10,0) + generalBracket acquire release use = Ca.mask $ \unmasked -> do + resource <- acquire + b <- unmasked (use resource) `Ca.catch` (\e -> release resource (Ca.ExitCaseException e) >> Ca.throwM e) + c <- release resource (Ca.ExitCaseSuccess b) + pure (b, c) +#elif MIN_VERSION_exceptions(0,9,0) -- from https://github.com/fpco/stackage/issues/3315#issuecomment-368583481 generalBracket acquire release cleanup use = Ca.mask $ \unmasked -> do resource <- acquire diff --git a/dejafu/dejafu.cabal b/dejafu/dejafu.cabal index f2fee9cc..26a78ad6 100755 --- a/dejafu/dejafu.cabal +++ b/dejafu/dejafu.cabal @@ -61,7 +61,7 @@ library , concurrency >=1.3 && <1.5 , containers >=0.5 && <0.6 , deepseq >=1.1 && <2 - , exceptions >=0.7 && <0.10 + , exceptions >=0.7 && <0.11 , leancheck >=0.6 && <0.8 , profunctors >=4.0 && <6.0 , random >=1.0 && <1.2 From a0a86521218c30bd605805179cea7971094cfece Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Sun, 11 Mar 2018 20:16:39 +0000 Subject: [PATCH 3/4] Bump exceptions upper bound in hunit-dejafu --- hunit-dejafu/CHANGELOG.rst | 9 +++++++++ hunit-dejafu/hunit-dejafu.cabal | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/hunit-dejafu/CHANGELOG.rst b/hunit-dejafu/CHANGELOG.rst index f5d1ed4e..b83ac3c3 100644 --- a/hunit-dejafu/CHANGELOG.rst +++ b/hunit-dejafu/CHANGELOG.rst @@ -7,6 +7,15 @@ standard Haskell versioning scheme. .. _PVP: https://pvp.haskell.org/ +unreleased +---------- + +Miscellaneous +~~~~~~~~~~~~~ + +* The upper bound on :hackage:`exceptions` is <0.11. + + 1.1.0.1 (2018-03-06) -------------------- diff --git a/hunit-dejafu/hunit-dejafu.cabal b/hunit-dejafu/hunit-dejafu.cabal index 88b248c7..2a28151a 100755 --- a/hunit-dejafu/hunit-dejafu.cabal +++ b/hunit-dejafu/hunit-dejafu.cabal @@ -37,7 +37,7 @@ library -- other-modules: -- other-extensions: build-depends: base >=4.8 && <5 - , exceptions >=0.7 && <0.10 + , exceptions >=0.7 && <0.11 , dejafu >=1.2 && <1.4 , HUnit >=1.2 && <1.7 -- hs-source-dirs: From 426fc4e1a173d9a530724f4626d0aacbfad7fd45 Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Sun, 11 Mar 2018 20:19:04 +0000 Subject: [PATCH 4/4] Prepare concurrency, dejafu, hunit-dejafu releases --- README.markdown | 6 +++--- concurrency/CHANGELOG.rst | 9 ++++++--- concurrency/concurrency.cabal | 4 ++-- dejafu/CHANGELOG.rst | 9 ++++++--- dejafu/dejafu.cabal | 4 ++-- doc/getting_started.rst | 6 +++--- hunit-dejafu/CHANGELOG.rst | 9 ++++++--- hunit-dejafu/hunit-dejafu.cabal | 4 ++-- 8 files changed, 30 insertions(+), 21 deletions(-) diff --git a/README.markdown b/README.markdown index df298016..c56a1695 100644 --- a/README.markdown +++ b/README.markdown @@ -45,9 +45,9 @@ There are a few different packages under the Déjà Fu umbrella: | | Version | Summary | | - | ------- | ------- | -| [concurrency][h:conc] | 1.4.0.1 | Typeclasses, functions, and data types for concurrency and STM. | -| [dejafu][h:dejafu] | 1.3.0.2 | Systematic testing for Haskell concurrency. | -| [hunit-dejafu][h:hunit] | 1.1.0.1 | Deja Fu support for the HUnit test framework. | +| [concurrency][h:conc] | 1.4.0.2 | Typeclasses, functions, and data types for concurrency and STM. | +| [dejafu][h:dejafu] | 1.3.0.3 | Systematic testing for Haskell concurrency. | +| [hunit-dejafu][h:hunit] | 1.1.0.2 | Deja Fu support for the HUnit test framework. | | [tasty-dejafu][h:tasty] | 1.1.0.1 | Deja Fu support for the Tasty test framework. | Each package has its own README and CHANGELOG in its subdirectory. diff --git a/concurrency/CHANGELOG.rst b/concurrency/CHANGELOG.rst index dbc69206..8bf8f019 100644 --- a/concurrency/CHANGELOG.rst +++ b/concurrency/CHANGELOG.rst @@ -7,13 +7,16 @@ standard Haskell versioning scheme. .. _PVP: https://pvp.haskell.org/ -unreleased ----------- +1.4.0.2 (2018-03-11) +-------------------- + +* Git: :tag:`concurrency-1.4.0.2` +* Hackage: :hackage:`concurrency-1.4.0.2` Miscellaneous ~~~~~~~~~~~~~ -* The upper bound on :hackage:`exceptions` is <0.11. +* (:pull:`245`) The upper bound on :hackage:`exceptions` is <0.11. 1.4.0.1 (2018-02-26) diff --git a/concurrency/concurrency.cabal b/concurrency/concurrency.cabal index 98b18edb..a32d2f1e 100755 --- a/concurrency/concurrency.cabal +++ b/concurrency/concurrency.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: concurrency -version: 1.4.0.1 +version: 1.4.0.2 synopsis: Typeclasses, functions, and data types for concurrency and STM. description: @@ -32,7 +32,7 @@ source-repository head source-repository this type: git location: https://github.com/barrucadu/dejafu.git - tag: concurrency-1.4.0.1 + tag: concurrency-1.4.0.2 library exposed-modules: Control.Monad.Conc.Class diff --git a/dejafu/CHANGELOG.rst b/dejafu/CHANGELOG.rst index ade7b8c1..4d82c5eb 100644 --- a/dejafu/CHANGELOG.rst +++ b/dejafu/CHANGELOG.rst @@ -7,13 +7,16 @@ standard Haskell versioning scheme. .. _PVP: https://pvp.haskell.org/ -unreleased ----------- +1.3.0.3 (2018-03-11) +-------------------- + +* Git: :tag:`dejafu-1.3.0.3` +* Hackage: :hackage:`dejafu-1.3.0.3` Miscellaneous ~~~~~~~~~~~~~ -* The upper bound on :hackage:`exceptions` is <0.11. +* (:pull:`245`) The upper bound on :hackage:`exceptions` is <0.11. 1.3.0.2 (2018-03-11) diff --git a/dejafu/dejafu.cabal b/dejafu/dejafu.cabal index 26a78ad6..75218446 100755 --- a/dejafu/dejafu.cabal +++ b/dejafu/dejafu.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: dejafu -version: 1.3.0.2 +version: 1.3.0.3 synopsis: A library for unit-testing concurrent programs. description: @@ -33,7 +33,7 @@ source-repository head source-repository this type: git location: https://github.com/barrucadu/dejafu.git - tag: dejafu-1.3.0.2 + tag: dejafu-1.3.0.3 library exposed-modules: Test.DejaFu diff --git a/doc/getting_started.rst b/doc/getting_started.rst index 0f23022f..77014339 100644 --- a/doc/getting_started.rst +++ b/doc/getting_started.rst @@ -27,9 +27,9 @@ There are a few different packages under the Déjà Fu umbrella: .. csv-table:: :header: "Package", "Version", "Summary" - ":hackage:`concurrency`", "1.4.0.1", "Typeclasses, functions, and data types for concurrency and STM" - ":hackage:`dejafu`", "1.3.0.2", "Systematic testing for Haskell concurrency" - ":hackage:`hunit-dejafu`", "1.1.0.1", "Déjà Fu support for the HUnit test framework" + ":hackage:`concurrency`", "1.4.0.2", "Typeclasses, functions, and data types for concurrency and STM" + ":hackage:`dejafu`", "1.3.0.3", "Systematic testing for Haskell concurrency" + ":hackage:`hunit-dejafu`", "1.1.0.2", "Déjà Fu support for the HUnit test framework" ":hackage:`tasty-dejafu`", "1.1.0.1", "Déjà Fu support for the tasty test framework" diff --git a/hunit-dejafu/CHANGELOG.rst b/hunit-dejafu/CHANGELOG.rst index b83ac3c3..fdd290df 100644 --- a/hunit-dejafu/CHANGELOG.rst +++ b/hunit-dejafu/CHANGELOG.rst @@ -7,13 +7,16 @@ standard Haskell versioning scheme. .. _PVP: https://pvp.haskell.org/ -unreleased ----------- +1.1.0.2 (2018-03-11) +-------------------- + +* Git: :tag:`hunit-dejafu-1.1.0.2` +* Hackage: :hackage:`hunit-dejafu-1.1.0.2` Miscellaneous ~~~~~~~~~~~~~ -* The upper bound on :hackage:`exceptions` is <0.11. +* (:pull:`245`) The upper bound on :hackage:`exceptions` is <0.11. 1.1.0.1 (2018-03-06) diff --git a/hunit-dejafu/hunit-dejafu.cabal b/hunit-dejafu/hunit-dejafu.cabal index 2a28151a..a2fbab73 100755 --- a/hunit-dejafu/hunit-dejafu.cabal +++ b/hunit-dejafu/hunit-dejafu.cabal @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: hunit-dejafu -version: 1.1.0.1 +version: 1.1.0.2 synopsis: Deja Fu support for the HUnit test framework. description: @@ -30,7 +30,7 @@ source-repository head source-repository this type: git location: https://github.com/barrucadu/dejafu.git - tag: hunit-dejafu-1.1.0.1 + tag: hunit-dejafu-1.1.0.2 library exposed-modules: Test.HUnit.DejaFu