Skip to content

Commit e48eb91

Browse files
committed
miscellaneous updates and cleanup
1 parent 5fbc050 commit e48eb91

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

38 files changed

+1349
-1265
lines changed

.envrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
use flake
2+
3+
watch_file **/*.cabal cabal.project.freeze **/*.nix flake.lock

.github/workflows/test.yml

-37
This file was deleted.

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
dist
22
dist-*
33
.ghc.*
4+
result
5+
result-*

chell-hunit/Setup.hs

-2
This file was deleted.

chell-hunit/Test/Chell/HUnit.hs

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
module Test.Chell.HUnit
2-
( hunit
3-
) where
1+
module Test.Chell.HUnit (hunit) where
42

53
import qualified Test.Chell as Chell
6-
import Test.HUnit.Lang (Assertion, Result (..), performTestCase)
4+
import Test.HUnit.Lang (Assertion, Result (..), performTestCase)
75

86
-- | Convert a sequence of HUnit assertions (embedded in IO) to a Chell
97
-- 'Chell.Test'.
108
--
119
-- @
12-
--import Test.Chell
13-
--import Test.Chell.HUnit
14-
--import Test.HUnit
10+
-- import Test.Chell
11+
-- import Test.Chell.HUnit
12+
-- import Test.HUnit
1513
--
16-
--test_Addition :: Test
17-
--test_addition = hunit \"addition\" $ do
14+
-- test_Addition :: Test
15+
-- test_addition = hunit \"addition\" $ do
1816
-- 1 + 2 \@?= 3
1917
-- 2 + 3 \@?= 5
2018
-- @
@@ -25,8 +23,10 @@ hunit name io = Chell.test name chell_io
2523
do
2624
result <- performTestCase io
2725
return $
28-
case result of
29-
Success -> Chell.TestPassed []
30-
Failure _ msg -> Chell.TestFailed []
31-
[Chell.failure { Chell.failureMessage = msg }]
32-
Error _ msg -> Chell.TestAborted [] msg
26+
case result of
27+
Success -> Chell.TestPassed []
28+
Failure _ msg ->
29+
Chell.TestFailed
30+
[]
31+
[Chell.failure {Chell.failureMessage = msg}]
32+
Error _ msg -> Chell.TestAborted [] msg

chell-hunit/changelog.md

+28-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,33 @@
1-
# Release history for `chell-hunit`
1+
## 0.3.0.2
22

3-
0.3.0.1 - 2021 Jan 14
3+
Miscellaneous updates and cleanup
44

5-
* Support up to GHC 9.2
6-
* Tighten various version bounds
5+
Published by: Chris Martin
76

8-
0.3 - 2019 Feb 16
7+
Date: 2023-07-11
98

10-
* Add support for `HUnit` 1.3 through 1.6
11-
* Drop support for `HUnit` 1.1 through 1.2
9+
## 0.3.0.1
1210

13-
0.2.1 - 2014 May 18
11+
Support up to GHC 9.2
12+
13+
Tighten various version bounds
14+
15+
Published by: Chris Martin
16+
17+
Date: 2021-01-14
18+
19+
## 0.3
20+
21+
Add support for `HUnit` 1.3 through 1.6
22+
23+
Drop support for `HUnit` 1.1 through 1.2
24+
25+
Published by: Chris Martin
26+
27+
Date: 2019-02-16
28+
29+
## 0.2.1
30+
31+
Published by: John Millikin
32+
33+
Date: 2014-05-18

chell-hunit/chell-hunit.cabal

+13-20
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
11
cabal-version: 3.0
22

33
name: chell-hunit
4-
version: 0.3.0.1
4+
version: 0.3.0.2
55

6-
synopsis: HUnit support for the Chell testing library
6+
synopsis: HUnit support for Chell
77
category: Testing
88

99
license: MIT
1010
license-file: license.txt
1111
author: John Millikin <[email protected]>
1212
maintainer: Chris Martin, Julie Moronuki
13-
build-type: Simple
1413

15-
homepage: https://github.com/typeclasses/chell
16-
bug-reports: https://github.com/typeclasses/chell/issues
14+
homepage: https://github.com/typeclasses/chell
1715

1816
description:
19-
HUnit support for the <https://hackage.haskell.org/package/chell Chell> testing library.
17+
HUnit support for the Chell testing library.
2018

21-
extra-source-files:
22-
changelog.md
23-
24-
source-repository head
25-
type: git
26-
location: https://github.com/typeclasses/chell.git
19+
extra-source-files: *.md
2720

2821
library
29-
default-language: Haskell2010
30-
ghc-options: -Wall
22+
default-language: GHC2021
23+
ghc-options: -Wall
3124

32-
build-depends:
33-
base >= 4.10 && < 4.17
34-
, chell >= 0.3 && < 0.6
35-
, HUnit >= 1.3 && < 1.7
25+
build-depends:
26+
, base ^>= 4.16 || ^>= 4.17 || ^>= 4.18
27+
, chell ^>= 0.5
28+
, HUnit ^>= 1.6.2
3629

37-
exposed-modules:
38-
Test.Chell.HUnit
30+
exposed-modules:
31+
Test.Chell.HUnit

chell-hunit/license.txt

-1
This file was deleted.

chell-hunit/license.txt

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Copyright (c) 2011 John Millikin
2+
3+
Permission is hereby granted, free of charge, to any person
4+
obtaining a copy of this software and associated documentation
5+
files (the "Software"), to deal in the Software without
6+
restriction, including without limitation the rights to use,
7+
copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the
9+
Software is furnished to do so, subject to the following
10+
conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
17+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
19+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
20+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
21+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22+
OTHER DEALINGS IN THE SOFTWARE.

chell-hunit/readme.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
HUnit support for the [Chell] testing library.
2+
3+
[Chell]: https://hackage.haskell.org/package/chell

chell-quickcheck/Setup.hs

-2
This file was deleted.

0 commit comments

Comments
 (0)