summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryanglscott <>2017-07-28 23:10:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-07-28 23:10:00 (GMT)
commit1badf44f0b4d6b9fcdd559b64639c6a46b025f63 (patch)
tree515aab2befd8280e3efb7237deacb3453dd73bf1
parent3319ad75e0a99689bfbf20b8ac555eb86e3557df (diff)
version 1.20.7HEAD1.20.7master
-rw-r--r--.travis.yml22
-rw-r--r--CHANGELOG.markdown4
-rw-r--r--Setup.lhs176
-rw-r--r--Warning.hs5
-rw-r--r--linear.cabal8
-rw-r--r--src/Linear/Instances.hs34
6 files changed, 39 insertions, 210 deletions
diff --git a/.travis.yml b/.travis.yml
index 3254ced..2494a34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,30 +13,30 @@ before_cache:
matrix:
include:
- - env: CABALVER=1.18 GHCVER=7.4.2
+ - env: CABALVER=1.24 GHCVER=7.4.2
compiler: ": #GHC 7.4.2"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}
- - env: CABALVER=1.18 GHCVER=7.6.3
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.4.2], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.6.3
compiler: ": #GHC 7.6.3"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}
- - env: CABALVER=1.18 GHCVER=7.8.4
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.6.3], sources: [hvr-ghc]}}
+ - env: CABALVER=1.24 GHCVER=7.8.4
compiler: ": #GHC 7.8.4"
- addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
+ addons: {apt: {packages: [cabal-install-1.24,ghc-7.8.4], sources: [hvr-ghc]}}
- env: CABALVER=1.24 GHCVER=7.10.3
compiler: ": #GHC 7.10.3"
addons: {apt: {packages: [cabal-install-1.24,ghc-7.10.3], 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], sources: [hvr-ghc]}}
- - env: CABALVER=1.24 GHCVER=8.2.1
+ - env: CABALVER=2.0 GHCVER=8.2.1
compiler: ": #GHC 8.2.1"
- addons: {apt: {packages: [cabal-install-1.24,ghc-8.2.1], sources: [hvr-ghc]}}
- - env: CABALVER=1.24 GHCVER=head
+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.1], sources: [hvr-ghc]}}
+ - env: CABALVER=head GHCVER=head
compiler: ": #GHC head"
- addons: {apt: {packages: [cabal-install-1.24,ghc-head], sources: [hvr-ghc]}}
+ addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
allow_failures:
- - env: CABALVER=1.24 GHCVER=head
+ - env: CABALVER=head GHCVER=head
before_install:
- unset CC
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 36567fa..5034918 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,3 +1,7 @@
+1.20.7
+------
+* Support `semigroupoids-5.2.1` and `doctest-0.12`
+
1.20.6
------
* Revamp `Setup.hs` to use `cabal-doctest`. This makes it build
diff --git a/Setup.lhs b/Setup.lhs
index 5555bb3..faedcd3 100644
--- a/Setup.lhs
+++ b/Setup.lhs
@@ -1,182 +1,34 @@
\begin{code}
{-# LANGUAGE CPP #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# OPTIONS_GHC -Wall #-}
module Main (main) where
#ifndef MIN_VERSION_cabal_doctest
#define MIN_VERSION_cabal_doctest(x,y,z) 0
#endif
-
#if MIN_VERSION_cabal_doctest(1,0,0)
-import Distribution.Extra.Doctest ( defaultMainWithDoctests )
-#else
-
--- Otherwise we provide a shim
-
-#ifndef MIN_VERSION_Cabal
-#define MIN_VERSION_Cabal(x,y,z) 0
-#endif
-#ifndef MIN_VERSION_directory
-#define MIN_VERSION_directory(x,y,z) 0
-#endif
-#if MIN_VERSION_Cabal(1,24,0)
-#define InstalledPackageId UnitId
-#endif
-
-import Control.Monad ( when )
-import Data.List ( nub )
-import Data.String ( fromString )
-import Distribution.Package ( InstalledPackageId )
-import Distribution.Package ( PackageId, Package (..), packageVersion )
-import Distribution.PackageDescription ( PackageDescription(), TestSuite(..) , Library (..), BuildInfo (..))
-import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
-import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose )
-import Distribution.Simple.BuildPaths ( autogenModulesDir )
-import Distribution.Simple.Setup ( BuildFlags(buildDistPref, buildVerbosity), fromFlag)
-import Distribution.Simple.LocalBuildInfo ( withPackageDB, withLibLBI, withTestLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps), compiler )
-import Distribution.Simple.Compiler ( showCompilerId , PackageDB (..))
-import Distribution.Text ( display , simpleParse )
-import System.FilePath ( (</>) )
-
-#if MIN_VERSION_Cabal(1,25,0)
-import Distribution.Simple.BuildPaths ( autogenComponentModulesDir )
-#endif
-
-#if MIN_VERSION_directory(1,2,2)
-import System.Directory (makeAbsolute)
-#else
-import System.Directory (getCurrentDirectory)
-import System.FilePath (isAbsolute)
-
-makeAbsolute :: FilePath -> IO FilePath
-makeAbsolute p | isAbsolute p = return p
- | otherwise = do
- cwd <- getCurrentDirectory
- return $ cwd </> p
-#endif
-
-generateBuildModule :: String -> BuildFlags -> PackageDescription -> LocalBuildInfo -> IO ()
-generateBuildModule testsuiteName flags pkg lbi = do
- let verbosity = fromFlag (buildVerbosity flags)
- let distPref = fromFlag (buildDistPref flags)
-
- -- Package DBs
- let dbStack = withPackageDB lbi ++ [ SpecificPackageDB $ distPref </> "package.conf.inplace" ]
- let dbFlags = "-hide-all-packages" : packageDbArgs dbStack
-
- withLibLBI pkg lbi $ \lib libcfg -> do
- let libBI = libBuildInfo lib
- -- modules
- let modules = exposedModules lib ++ otherModules libBI
- -- it seems that doctest is happy to take in module names, not actual files!
- let module_sources = modules
+import Distribution.Extra.Doctest ( defaultMainWithDoctests )
+main :: IO ()
+main = defaultMainWithDoctests "doctests"
- -- We need the directory with library's cabal_macros.h!
-#if MIN_VERSION_Cabal(1,25,0)
- let libAutogenDir = autogenComponentModulesDir lbi libcfg
#else
- let libAutogenDir = autogenModulesDir lbi
-#endif
-
- -- Lib sources and includes
- iArgs <- mapM (fmap ("-i"++) . makeAbsolute) $ libAutogenDir : hsSourceDirs libBI
- includeArgs <- mapM (fmap ("-I"++) . makeAbsolute) $ includeDirs libBI
- -- CPP includes, i.e. include cabal_macros.h
- let cppFlags = map ("-optP"++) $
- [ "-include", libAutogenDir ++ "/cabal_macros.h" ]
- ++ cppOptions libBI
-
- withTestLBI pkg lbi $ \suite suitecfg -> when (testName suite == fromString testsuiteName) $ do
-
- -- get and create autogen dir
-#if MIN_VERSION_Cabal(1,25,0)
- let testAutogenDir = autogenComponentModulesDir lbi suitecfg
-#else
- let testAutogenDir = autogenModulesDir lbi
+#ifdef MIN_VERSION_Cabal
+-- If the macro is defined, we have new cabal-install,
+-- but for some reason we don't have cabal-doctest in package-db
+--
+-- Probably we are running cabal sdist, when otherwise using new-build
+-- workflow
+import Warning ()
#endif
- createDirectoryIfMissingVerbose verbosity True testAutogenDir
-
- -- write autogen'd file
- rewriteFile (testAutogenDir </> "Build_doctests.hs") $ unlines
- [ "module Build_doctests where"
- , ""
- -- -package-id etc. flags
- , "pkgs :: [String]"
- , "pkgs = " ++ (show $ formatDeps $ testDeps libcfg suitecfg)
- , ""
- , "flags :: [String]"
- , "flags = " ++ show (iArgs ++ includeArgs ++ dbFlags ++ cppFlags)
- , ""
- , "module_sources :: [String]"
- , "module_sources = " ++ show (map display module_sources)
- ]
- where
- -- we do this check in Setup, as then doctests don't need to depend on Cabal
- isOldCompiler = maybe False id $ do
- a <- simpleParse $ showCompilerId $ compiler lbi
- b <- simpleParse "7.5"
- return $ packageVersion (a :: PackageId) < b
- formatDeps = map formatOne
- formatOne (installedPkgId, pkgId)
- -- The problem is how different cabal executables handle package databases
- -- when doctests depend on the library
- | packageId pkg == pkgId = "-package=" ++ display pkgId
- | otherwise = "-package-id=" ++ display installedPkgId
+import Distribution.Simple
- -- From Distribution.Simple.Program.GHC
- packageDbArgs :: [PackageDB] -> [String]
- packageDbArgs | isOldCompiler = packageDbArgsConf
- | otherwise = packageDbArgsDb
-
- -- GHC <7.6 uses '-package-conf' instead of '-package-db'.
- packageDbArgsConf :: [PackageDB] -> [String]
- packageDbArgsConf dbstack = case dbstack of
- (GlobalPackageDB:UserPackageDB:dbs) -> concatMap specific dbs
- (GlobalPackageDB:dbs) -> ("-no-user-package-conf")
- : concatMap specific dbs
- _ -> ierror
- where
- specific (SpecificPackageDB db) = [ "-package-conf=" ++ db ]
- specific _ = ierror
- ierror = error $ "internal error: unexpected package db stack: "
- ++ show dbstack
-
- -- GHC >= 7.6 uses the '-package-db' flag. See
- -- https://ghc.haskell.org/trac/ghc/ticket/5977.
- packageDbArgsDb :: [PackageDB] -> [String]
- -- special cases to make arguments prettier in common scenarios
- packageDbArgsDb dbstack = case dbstack of
- (GlobalPackageDB:UserPackageDB:dbs)
- | all isSpecific dbs -> concatMap single dbs
- (GlobalPackageDB:dbs)
- | all isSpecific dbs -> "-no-user-package-db"
- : concatMap single dbs
- dbs -> "-clear-package-db"
- : concatMap single dbs
- where
- single (SpecificPackageDB db) = [ "-package-db=" ++ db ]
- single GlobalPackageDB = [ "-global-package-db" ]
- single UserPackageDB = [ "-user-package-db" ]
- isSpecific (SpecificPackageDB _) = True
- isSpecific _ = False
-
-testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [(InstalledPackageId, PackageId)]
-testDeps xs ys = nub $ componentPackageDeps xs ++ componentPackageDeps ys
-
-defaultMainWithDoctests :: String -> IO ()
-defaultMainWithDoctests testSuiteName = defaultMainWithHooks simpleUserHooks
- { buildHook = \pkg lbi hooks flags -> do
- generateBuildModule testSuiteName flags pkg lbi
- buildHook simpleUserHooks pkg lbi hooks flags
- }
+main :: IO ()
+main = defaultMain
#endif
-main :: IO ()
-main = defaultMainWithDoctests "doctests"
-
\end{code}
diff --git a/Warning.hs b/Warning.hs
new file mode 100644
index 0000000..a5a14a9
--- /dev/null
+++ b/Warning.hs
@@ -0,0 +1,5 @@
+module Warning
+ {-# WARNING ["You are configuring this package without cabal-doctest installed.",
+ "The doctests test-suite will not work as a result.",
+ "To fix this, install cabal-doctest before configuring."] #-}
+ () where
diff --git a/linear.cabal b/linear.cabal
index 6d11791..421dd89 100644
--- a/linear.cabal
+++ b/linear.cabal
@@ -1,6 +1,6 @@
name: linear
category: Math, Algebra
-version: 1.20.6
+version: 1.20.7
license: BSD3
cabal-version: >= 1.8
license-file: LICENSE
@@ -22,6 +22,7 @@ extra-source-files:
travis/config
CHANGELOG.markdown
README.markdown
+ Warning.hs
flag template-haskell
description:
@@ -62,7 +63,7 @@ library
lens >= 4 && < 5,
reflection >= 1.3.2 && < 3,
semigroups >= 0.9 && < 1,
- semigroupoids >= 3 && < 6,
+ semigroupoids >= 5.2.1 && < 5.3,
tagged >= 0.4.4 && < 1,
transformers >= 0.2 && < 0.6,
transformers-compat >= 0.4 && < 1,
@@ -117,8 +118,9 @@ test-suite doctests
hs-source-dirs: tests
build-depends:
base,
- doctest >= 0.11.1 && < 0.12,
+ doctest >= 0.11.1 && < 0.13,
lens,
+ linear,
simple-reflect >= 0.3.1
test-suite UnitTests
diff --git a/src/Linear/Instances.hs b/src/Linear/Instances.hs
index 734612d..04e5149 100644
--- a/src/Linear/Instances.hs
+++ b/src/Linear/Instances.hs
@@ -19,44 +19,10 @@ import Control.Applicative
import Control.Monad.Fix
import Control.Monad.Zip
import Data.Complex
-import Data.Functor.Bind
-import Data.HashMap.Lazy as HashMap
-import Data.Hashable
import Data.Orphans ()
-import Data.Semigroup
-import Data.Semigroup.Foldable
-import Data.Semigroup.Traversable
-
-instance (Hashable k, Eq k) => Apply (HashMap k) where
- (<.>) = HashMap.intersectionWith id
-
-instance (Hashable k, Eq k) => Bind (HashMap k) where
- -- this is needlessly painful
- m >>- f = HashMap.fromList $ do
- (k, a) <- HashMap.toList m
- case HashMap.lookup k (f a) of
- Just b -> [(k,b)]
- Nothing -> []
-
-instance Apply Complex where
- (a :+ b) <.> (c :+ d) = a c :+ b d
-
-instance Bind Complex where
- (a :+ b) >>- f = a' :+ b' where
- a' :+ _ = f a
- _ :+ b' = f b
- {-# INLINE (>>-) #-}
instance MonadZip Complex where
mzipWith = liftA2
instance MonadFix Complex where
mfix f = (let a :+ _ = f a in a) :+ (let _ :+ a = f a in a)
-
-instance Foldable1 Complex where
- foldMap1 f (a :+ b) = f a <> f b
- {-# INLINE foldMap1 #-}
-
-instance Traversable1 Complex where
- traverse1 f (a :+ b) = (:+) <$> f a <.> f b
- {-# INLINE traverse1 #-}