diff --git a/.gitignore b/.gitignore deleted file mode 100644 --- a/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -dist -cabal-dev -*.o -*.hi -*.chi -*.chs.h -*.dyn_o -*.dyn_hi -.hpc -.hsenv -.cabal-sandbox/ -cabal.sandbox.config -*.prof -*.aux -*.hp -.stack-work/ -result -.hdevtools diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,9 @@ ## WIP +## [0.12.4.1] - 2020-11-01 + - Use newer version of `checkers` + ## [0.12.4] - 2020-06-07 - Big speedup (orbits testsuite about 9 times faster) diff --git a/default.nix b/default.nix --- a/default.nix +++ b/default.nix @@ -1,4 +1,5 @@ -{ pkgs ? import { }, compiler ? null, hoogle ? true }: +{ pkgs ? import { }, compiler ? null, hoogle ? true +, forShell ? pkgs.lib.inNixShell }: let src = pkgs.nix-gitignore.gitignoreSource [ ] ./.; @@ -13,9 +14,7 @@ haskellPackages = with pkgs.haskell.lib; pkgs.haskell.packages.${compiler'}.override { overrides = self: super: - { - checkers = self.callHackage "checkers" "0.5.1" { }; - } // pkgs.lib.optionalAttrs hoogle { + { } // pkgs.lib.optionalAttrs hoogle { ghc = super.ghc // { withPackages = super.ghc.withHoogle; }; ghcWithPackages = self.ghc.withPackages; }; @@ -32,4 +31,4 @@ }); }; -in if pkgs.lib.inNixShell then drv.env else drv +in if forShell then drv.env else drv diff --git a/exact-real.cabal b/exact-real.cabal --- a/exact-real.cabal +++ b/exact-real.cabal @@ -1,13 +1,11 @@ cabal-version: 1.24 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.2. -- -- see: https://github.com/sol/hpack --- --- hash: 3b8926fece094589ffa737495e0936d123b8c2d9a4e8341be340b08916967c77 name: exact-real -version: 0.12.4 +version: 0.12.4.1 synopsis: Exact real arithmetic description: A type to represent exact real numbers using fast binary Cauchy sequences. category: Math @@ -20,11 +18,11 @@ license-file: LICENSE build-type: Custom extra-source-files: - .gitignore readme.md stack.yaml default.nix changelog.md + package.yaml source-repository head type: git @@ -70,8 +68,6 @@ other-modules: BoundedFunctions Data.CReal.Extra - Data.Monoid.Extra - Data.Ratio.Extra Floating Fractional Num @@ -91,7 +87,7 @@ build-depends: QuickCheck >=2.9 , base >=4 - , checkers >=0.4 && <0.5.5 + , checkers >=0.5.6 , exact-real , groups >=0.3 , random >=1.0 diff --git a/package.yaml b/package.yaml new file mode 100644 --- /dev/null +++ b/package.yaml @@ -0,0 +1,93 @@ +name: exact-real +version: "0.12.4.1" +synopsis: Exact real arithmetic +description: A type to represent exact real numbers using fast binary Cauchy sequences. +category: Math +author: Joe Hermaszewski +maintainer: Joe Hermaszewski +copyright: 2020 Joe Hermaszewski +github: expipiplus1/exact-real +extra-source-files: +- readme.md +- stack.yaml +- default.nix +- changelog.md +- package.yaml + +library: + source-dirs: src + ghc-options: -Wall + exposed-modules: + - Data.CReal + - Data.CReal.Converge + - Data.CReal.Internal + dependencies: + - base >=4.8 && < 5 + - integer-gmp + - random >=1.0 + +tests: + test: + main: Test.hs + other-modules: + - BoundedFunctions + - Data.CReal.Extra + - Floating + - Fractional + - Num + - Ord + - Random + - Read + - Real + - RealFloat + - RealFrac + - Test.QuickCheck.Classes.Extra + - Test.QuickCheck.Extra + - Test.Tasty.Extra + - Paths_exact_real + source-dirs: test + ghc-options: + - -Wall + - -threaded + dependencies: + - base >=4 + - groups >=0.3 + - tasty >=0.10 + - tasty-th >=0.1 + - tasty-quickcheck >=0.8 + - tasty-hunit >=0.9 + - QuickCheck >=2.9 + - random >=1.0 + - checkers >=0.5.6 + - exact-real + when: + condition: impl(ghc < 8.0.0) + buildable: false + + doctests: + main: Doctests.hs + other-modules: "" + source-dirs: + - test + dependencies: + - base + - doctest + +benchmarks: + bench: + main: Bench.hs + source-dirs: bench + ghc-options: + - -Wall + - -threaded + - -O2 + dependencies: + - base >=4 + - criterion >=1.1 + - exact-real + +custom-setup: + dependencies: + - base + - Cabal + - cabal-doctest >= 1 && <1.1 diff --git a/readme.md b/readme.md --- a/readme.md +++ b/readme.md @@ -1,14 +1,7 @@ exact-real ========== -[![Hackage](https://budueba.com/hackage/exact-real)](https://hackage.haskell.org/package/exact-real) -[![Stackage Nightly](http://stackage.org/package/exact-real/badge/nightly)](http://stackage.org/nightly/package/exact-real) -[![Build Status](https://travis-ci.org/expipiplus1/exact-real.svg)](https://travis-ci.org/expipiplus1/exact-real) -[![Build status](https://ci.appveyor.com/api/projects/status/sviohnqtyo9y7goa?svg=true)](https://ci.appveyor.com/project/expipiplus1/exact-real) -[![Coverage Status](https://coveralls.io/repos/expipiplus1/exact-real/badge.svg?branch=codecov&service=github)](https://coveralls.io/github/expipiplus1/exact-real?branch=codecov) - Exact real arithmetic implemented by fast binary Cauchy sequences. - Motivating Example ------------------- diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -1,5 +1,3 @@ -resolver: lts-11.22 +resolver: lts-16.20 packages: - '.' -extra-deps: -- memoize-0.8.1@sha256:2146197c639c126796d850cb4457b24cfeb6966d6d878825f855aafce31f8874,1601 diff --git a/test/Data/Monoid/Extra.hs b/test/Data/Monoid/Extra.hs deleted file mode 100644 --- a/test/Data/Monoid/Extra.hs +++ /dev/null @@ -1,16 +0,0 @@ -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE StandaloneDeriving #-} - -{-# OPTIONS_GHC -fno-warn-orphans #-} - --- | Add instances for Arbitrary and EqProp for Sum and Product -module Data.Monoid.Extra - ( module Data.Monoid - ) where - -import Data.Monoid (Product (..), Sum (..)) -import Test.QuickCheck.Checkers (EqProp) - -deriving instance EqProp a => EqProp (Sum a) - -deriving instance EqProp a => EqProp (Product a) diff --git a/test/Data/Ratio/Extra.hs b/test/Data/Ratio/Extra.hs deleted file mode 100644 --- a/test/Data/Ratio/Extra.hs +++ /dev/null @@ -1,10 +0,0 @@ -{-# OPTIONS_GHC -fno-warn-orphans #-} -module Data.Ratio.Extra - ( module Data.Ratio - ) where - -import Data.Ratio -import Test.QuickCheck.Checkers (EqProp(..), eq) - -instance Eq a => EqProp (Ratio a) where - (=-=) = eq diff --git a/test/Real.hs b/test/Real.hs --- a/test/Real.hs +++ b/test/Real.hs @@ -4,7 +4,6 @@ ( real ) where -import Data.Ratio.Extra () import Test.QuickCheck.Checkers (EqProp, inverseL) import Test.Tasty (testGroup, TestTree) import Test.Tasty.QuickCheck (testProperty, Arbitrary) diff --git a/test/RealFloat.hs b/test/RealFloat.hs --- a/test/RealFloat.hs +++ b/test/RealFloat.hs @@ -4,7 +4,6 @@ ( realFloat ) where -import Data.Ratio.Extra () import Test.QuickCheck.Checkers (EqProp, (=-=), inverseL) import Test.Tasty (testGroup, TestTree) import Test.Tasty.QuickCheck (testProperty, Arbitrary, (==>)) diff --git a/test/RealFrac.hs b/test/RealFrac.hs --- a/test/RealFrac.hs +++ b/test/RealFrac.hs @@ -5,7 +5,6 @@ ) where import Data.Function (on) -import Data.Ratio.Extra () import Test.QuickCheck.Checkers (EqProp, (=-=)) import Test.Tasty (testGroup, TestTree) import Test.Tasty.QuickCheck (testProperty, Arbitrary) diff --git a/test/Test/QuickCheck/Classes/Extra.hs b/test/Test/QuickCheck/Classes/Extra.hs --- a/test/Test/QuickCheck/Classes/Extra.hs +++ b/test/Test/QuickCheck/Classes/Extra.hs @@ -17,7 +17,6 @@ import Data.Group (invert, Group, Abelian) import Data.Monoid ((<>), Sum(..), Product) -import Data.Monoid.Extra () import Test.QuickCheck.Extra (Arbitrary, (<=>)) import Test.QuickCheck.Modifiers (NonZero) import Test.QuickCheck.Checkers (commutes, EqProp, (=-=), BinRel)