Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/test-framework-th/
Date: Sun, 01 Nov 2020 11:06:41
Message-Id: 1604228787.bdf3b3987e34aa44084a4c35cf48d8e02c190919.slyfox@gentoo
1 commit: bdf3b3987e34aa44084a4c35cf48d8e02c190919
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 1 10:57:19 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 1 11:06:27 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf3b398
7
8 dev-haskell/test-framework-th: update to EAPI=7
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.2
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 dev-haskell/test-framework-th/metadata.xml | 49 ----------------------
14 .../test-framework-th-0.2.4.ebuild | 20 +++++----
15 2 files changed, 11 insertions(+), 58 deletions(-)
16
17 diff --git a/dev-haskell/test-framework-th/metadata.xml b/dev-haskell/test-framework-th/metadata.xml
18 index a8fce2d224a..b7878815d80 100644
19 --- a/dev-haskell/test-framework-th/metadata.xml
20 +++ b/dev-haskell/test-framework-th/metadata.xml
21 @@ -5,53 +5,4 @@
22 <email>haskell@g.o</email>
23 <name>Gentoo Haskell</name>
24 </maintainer>
25 - <longdescription>
26 - @test-framework-th@ contains two interesting functions: @defaultMainGenerator@ and @testGroupGenerator@.
27 -
28 - @defaultMainGenerator@ will extract all functions beginning with case_ or prop_ in the module and put them in a testGroup.
29 -
30 - &gt; -- file SomeModule.hs
31 - &gt; ( -# LANGUAGE TemplateHaskell #- )
32 - &gt; module SomeModule where
33 - &gt; import Test.Framework.TH
34 - &gt; import Test.Framework
35 - &gt; import Test.HUnit
36 - &gt; import Test.Framework.Providers.HUnit
37 - &gt; import Test.Framework.Providers.QuickCheck2
38 - &gt;
39 - &gt; -- observe this line!
40 - &gt; main = $(defaultMainGenerator)
41 - &gt; case_1 = do 1 @=? 1
42 - &gt; case_2 = do 2 @=? 2
43 - &gt; prop_reverse xs = reverse (reverse xs) == xs
44 - &gt; where types = xs::[Int]
45 -
46 - is the same as
47 -
48 - &gt; -- file SomeModule.hs
49 - &gt; ( -# LANGUAGE TemplateHaskell #- )
50 - &gt; module SomeModule where
51 - &gt; import Test.Framework.TH
52 - &gt; import Test.Framework
53 - &gt; import Test.HUnit
54 - &gt; import Test.Framework.Providers.HUnit
55 - &gt; import Test.Framework.Providers.QuickCheck2
56 - &gt;
57 - &gt; -- observe this line!
58 - &gt; main =
59 - &gt; defaultMain [
60 - &gt; testGroup "SomeModule" [ testCase "1" case_1, testCase "2" case_2, testProperty "reverse" prop_reverse]
61 - &gt; ]
62 - &gt;
63 - &gt; case_1 = do 1 @=? 1
64 - &gt; case_2 = do 2 @=? 2
65 - &gt; prop_reverse xs = reverse (reverse xs) == xs
66 - &gt; where types = xs::[Int]
67 -
68 - @testGroupGenerator@ is like @defaultMainGenerator@ but without @defaultMain@. It is useful if you need a function for the testgroup
69 - (e.g. if you want to be able to call the testgroup from another module).
70 - </longdescription>
71 - <upstream>
72 - <remote-id type="github">finnsson/test-generator</remote-id>
73 - </upstream>
74 </pkgmetadata>
75
76 diff --git a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
77 index 812e3653792..cc8dadb87ad 100644
78 --- a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
79 +++ b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
80 @@ -1,14 +1,14 @@
81 -# Copyright 1999-2019 Gentoo Authors
82 +# Copyright 1999-2020 Gentoo Authors
83 # Distributed under the terms of the GNU General Public License v2
84
85 -EAPI=5
86 +EAPI=7
87
88 -# ebuild generated by hackport 0.3.1.9999
89 +# ebuild generated by hackport 0.6.6.9999
90
91 CABAL_FEATURES="lib profile haddock hoogle hscolour"
92 inherit haskell-cabal
93
94 -DESCRIPTION="Automagically generate the HUnit and Quickcheck code using Template Haskell"
95 +DESCRIPTION="Automagically generate the HUnit and Quickcheck using Template Haskell"
96 HOMEPAGE="https://github.com/finnsson/test-generator"
97 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
98
99 @@ -18,9 +18,11 @@ KEYWORDS="~amd64 ~x86"
100 IUSE=""
101
102 RDEPEND="dev-haskell/haskell-src-exts:=[profile?]
103 - >=dev-haskell/language-haskell-extract-0.2:=[profile?]
104 - dev-haskell/regex-posix:=[profile?]
105 - dev-haskell/test-framework:=[profile?]
106 - >=dev-lang/ghc-6.10.4:="
107 + >=dev-haskell/language-haskell-extract-0.2:=[profile?]
108 + dev-haskell/regex-posix:=[profile?]
109 + dev-haskell/test-framework:=[profile?]
110 + >=dev-lang/ghc-7.4.1:=
111 +"
112 DEPEND="${RDEPEND}
113 - >=dev-haskell/cabal-1.6"
114 + >=dev-haskell/cabal-1.6
115 +"