summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiroSakai <>2018-02-13 15:09:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2018-02-13 15:09:00 (GMT)
commit22a165aeb7daf70ace88d4cf1169cfcb0787ca86 (patch)
treefe11e37e76b20f800d88a610433fd743c5f1b8cd
parent814cee3b01721f7e3cb84f71c59f5f7baadd178b (diff)
version 0.2.3.0HEAD0.2.3.0master
-rw-r--r--.travis.yml19
-rw-r--r--extended-reals.cabal13
-rw-r--r--test/TestExtendedReal.hs9
3 files changed, 25 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index b3c176b..cb7bead 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
language: c
sudo: false
+dist: trusty
cache:
directories:
@@ -12,18 +13,18 @@ before_cache:
matrix:
include:
- - env: CABALVER=1.18 GHCVER=7.6.3
- compiler: ": #GHC 7.6.3"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
- - env: CABALVER=1.18 GHCVER=7.8.3 COVERAGE=1
- compiler: ": #GHC 7.8.3"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.3,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
+ - env: CABALVER=1.18 GHCVER=7.8.4 COVERAGE=1
+ compiler: ": #GHC 7.8.4"
+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
- env: CABALVER=1.22 GHCVER=7.10.3
compiler: ": #GHC 7.10.3"
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
- - env: CABALVER=1.24 GHCVER=8.0.1
- compiler: ": #GHC 8.0.1"
- addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=8.0.2
+ compiler: ": #GHC 8.0.2"
+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}}
+ - env: CABALVER=2.0 GHCVER=8.2.1
+ compiler: ": #GHC 8.2.1"
+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1,alex-3.1.7,happy-1.19.5], sources: [hvr-ghc]}}
before_install:
- unset CC
diff --git a/extended-reals.cabal b/extended-reals.cabal
index 3ec98f4..3c2ad20 100644
--- a/extended-reals.cabal
+++ b/extended-reals.cabal
@@ -1,5 +1,5 @@
name: extended-reals
-version: 0.2.2.0
+version: 0.2.3.0
synopsis: Extension of real numbers with positive/negative infinities
description:
Extension of real numbers with positive/negative infinities (±∞).
@@ -30,7 +30,16 @@ Test-suite TestExtendedReal
Type: exitcode-stdio-1.0
HS-Source-Dirs: test
Main-is: TestExtendedReal.hs
- Build-depends: base, deepseq, HUnit >=1.2 && <1.4, QuickCheck >=2.6 && <2.9, test-framework >=0.8 && <0.9, test-framework-th >=0.2 && <0.3, test-framework-hunit >=0.3 && <0.4, test-framework-quickcheck2 >=0.3 && <0.4, extended-reals
+ Build-depends:
+ base,
+ deepseq,
+ HUnit >=1.2 && <1.7,
+ QuickCheck >=2.6 && <2.11,
+ tasty >=0.10.1,
+ tasty-hunit >=0.9 && <0.11,
+ tasty-quickcheck >=0.8 && <0.10,
+ tasty-th,
+ extended-reals
Default-Language: Haskell2010
Other-Extensions:
TemplateHaskell
diff --git a/test/TestExtendedReal.hs b/test/TestExtendedReal.hs
index 887db2f..d9e3f24 100644
--- a/test/TestExtendedReal.hs
+++ b/test/TestExtendedReal.hs
@@ -7,12 +7,11 @@ import Control.Exception (SomeException, evaluate, try)
import Control.Monad
import Data.Maybe
import System.IO.Unsafe (unsafePerformIO)
-import Test.HUnit hiding (Test)
-import Test.QuickCheck
+
import Test.QuickCheck.Function
-import Test.Framework.TH
-import Test.Framework.Providers.HUnit
-import Test.Framework.Providers.QuickCheck2
+import Test.Tasty.QuickCheck
+import Test.Tasty.HUnit
+import Test.Tasty.TH
import Data.ExtendedReal