Skip to content

Commit 17a7030

Browse files
author
Arnaud Bailly
authored
Relax some dependencies bounds (#55)
* Replace reexported type with original one * Remove dependency on outdated test reporter tasty-test-reporter introduces some undesirable side-effects in dependencies bounds while bringing very low value because we don't really have many tests to report about. * Remove publication of test results in XML There are only 2 tests anyway... :rolling_eyes: * Bump versions and add changelog entry * Check formatting in CI * Fix formatting issue * Update PR template to remove reference to formatting script
1 parent f69ca85 commit 17a7030

File tree

6 files changed

+16
-34
lines changed

6 files changed

+16
-34
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
*Short description of your PR*
22

33
Checklist:
4-
- [ ] run `fmt.sh` in the repo root directory
4+
- [ ] Check source-code formatting is consistent

.github/workflows/ci.yaml

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -41,42 +41,21 @@ jobs:
4141
cabal-${{ runner.os }}-${{ hashFiles('cabal.project', 'default.nix', 'shell.nix') }}
4242
4343
- name: Prepare nix shell
44-
run:
45-
nix develop --accept-flake-config --build
44+
run:
45+
nix develop --accept-flake-config --build
4646

4747
- name: Build
4848
run: |
4949
nix develop --accept-flake-config --command cabal update
5050
nix develop --accept-flake-config --command cabal build all --ghc-options=-Werror
5151
5252
- name: Test
53-
run:
54-
nix develop --accept-flake-config --command cabal test all --test-options "--xml=test-results.xml"
53+
run:
54+
nix develop --accept-flake-config --command cabal test all
5555

5656
- name: Formatting
57-
run:
58-
nix develop --accept-flake-config --command pre-commit run fourmolu
59-
60-
- name: Upload build & test artifacts
61-
uses: actions/upload-artifact@v2
62-
with:
63-
path: ./**/test-results.xml
64-
65-
publish-test-results:
66-
name: Publish test results
67-
needs: [build-test]
68-
runs-on: ubuntu-latest
69-
steps:
70-
- uses: actions/checkout@v2.3.1
71-
with:
72-
repository: input-output-hk/quickcheck-dynamic
73-
74-
- uses: actions/download-artifact@v3
75-
76-
- name: Publish Unit Test Results
77-
uses: EnricoMi/publish-unit-test-result-action@v1
78-
with:
79-
files: ./**/test-results.xml
57+
run:
58+
nix develop --accept-flake-config --command fourmolu --mode check .
8059

8160
haddock:
8261
name: "Haddock & benchmarks"

quickcheck-dynamic/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ changes.
1111

1212
* Added some lightweight negative-shrinking based on a simple dependency analysis.
1313

14+
## 3.3.1
15+
16+
* Adapt code to _not_ constrain [mtl](https://hackage.haskell.org/package/mtl) version too much
17+
1418
## 3.3.0
1519

1620
* Added suppport for GHC 9.6.2 compiler

quickcheck-dynamic/quickcheck-dynamic.cabal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: quickcheck-dynamic
3-
version: 3.3.0
3+
version: 3.3.1
44
license: Apache-2.0
55
license-files:
66
LICENSE
@@ -102,4 +102,3 @@ test-suite quickcheck-dynamic-test
102102
, stm
103103
, tasty
104104
, tasty-quickcheck
105-
, tasty-test-reporter

quickcheck-dynamic/src/Test/QuickCheck/StateModel.hs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ import Control.Monad
4343
import Control.Monad.Identity
4444
import Control.Monad.Reader
4545
import Control.Monad.State
46-
import Control.Monad.Writer (Endo (..), WriterT, runWriterT, tell)
46+
import Control.Monad.Writer (WriterT, runWriterT, tell)
4747
import Data.Data
4848
import Data.Kind
4949
import Data.List
50+
import Data.Monoid (Endo (..))
5051
import Data.Set qualified as Set
5152
import GHC.Generics
5253
import GHC.Stack
@@ -163,7 +164,7 @@ type instance Realized (WriterT w m) a = Realized m a
163164
type instance Realized Identity a = a
164165

165166
newtype PostconditionM m a = PostconditionM {runPost :: WriterT (Endo Property, Endo Property) m a}
166-
deriving (Functor, Applicative, Monad, MonadTrans)
167+
deriving (Functor, Applicative, Monad)
167168

168169
-- | Apply the property transformation to the property after evaluating
169170
-- the postcondition. Useful for collecting statistics while avoiding

quickcheck-dynamic/test/Spec.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ module Main (main) where
44

55
import Spec.DynamicLogic.RegistryModel qualified
66
import Test.Tasty
7-
import Test.Tasty.Runners.Reporter qualified as Reporter
87

98
main :: IO ()
10-
main = defaultMainWithIngredients [Reporter.ingredient] tests
9+
main = defaultMain tests
1110

1211
tests :: TestTree
1312
tests =

0 commit comments

Comments
 (0)