Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

exceptions-0.10 #245

Merged
merged 4 commits into from
Mar 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 12 additions & 0 deletions concurrency/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ standard Haskell versioning scheme.
.. _PVP: https://pvp.haskell.org/


1.4.0.2 (2018-03-11)
--------------------

* Git: :tag:`concurrency-1.4.0.2`
* Hackage: :hackage:`concurrency-1.4.0.2`

Miscellaneous
~~~~~~~~~~~~~

* (:pull:`245`) The upper bound on :hackage:`exceptions` is <0.11.


1.4.0.1 (2018-02-26)
--------------------

Expand Down
6 changes: 3 additions & 3 deletions concurrency/concurrency.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
13 changes: 13 additions & 0 deletions dejafu/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ standard Haskell versioning scheme.

.. _PVP: https://pvp.haskell.org/


1.3.0.3 (2018-03-11)
--------------------

* Git: :tag:`dejafu-1.3.0.3`
* Hackage: :hackage:`dejafu-1.3.0.3`

Miscellaneous
~~~~~~~~~~~~~

* (:pull:`245`) The upper bound on :hackage:`exceptions` is <0.11.


1.3.0.2 (2018-03-11)
--------------------

Expand Down
8 changes: 7 additions & 1 deletion dejafu/Test/DejaFu/Conc.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions dejafu/dejafu.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions doc/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down
12 changes: 12 additions & 0 deletions hunit-dejafu/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ standard Haskell versioning scheme.
.. _PVP: https://pvp.haskell.org/


1.1.0.2 (2018-03-11)
--------------------

* Git: :tag:`hunit-dejafu-1.1.0.2`
* Hackage: :hackage:`hunit-dejafu-1.1.0.2`

Miscellaneous
~~~~~~~~~~~~~

* (:pull:`245`) The upper bound on :hackage:`exceptions` is <0.11.


1.1.0.1 (2018-03-06)
--------------------

Expand Down
6 changes: 3 additions & 3 deletions hunit-dejafu/hunit-dejafu.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -30,14 +30,14 @@ 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
-- 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:
Expand Down