Merge pull request #18 from qfpl/no-more-doctests

No more doctests
system-f · Oct 11, 2017 · 9752ec3 · 9752ec3
2 parents e268ed8 + a64e335
commit 9752ec3
Show file tree

Hide file tree

Showing 102 changed files with 155 additions and 2,056 deletions.
diff --git a/papa-base-export/Setup.hs b/papa-base-export/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/papa-base-export/Setup.lhs b/papa-base-export/Setup.lhs
diff --git a/papa-base-export/default.nix b/papa-base-export/default.nix
@@ -1,14 +1,9 @@
-{ mkDerivation, base, directory, doctest, filepath, QuickCheck
-, semigroups, stdenv, template-haskell
-}:
+{ mkDerivation, base, semigroups, stdenv }:
 mkDerivation {
   pname = "papa-base-export";
-  version = "0.3.0";
+  version = "0.3.1";
   src = ./.;
   libraryHaskellDepends = [ base semigroups ];
-  testHaskellDepends = [
-    base directory doctest filepath QuickCheck template-haskell
-  ];
   homepage = "https://github.com/qfpl/papa";
   description = "Prelude with only useful functions";
   license = stdenv.lib.licenses.bsd3;

diff --git a/papa-base-export/papa-base-export.cabal b/papa-base-export/papa-base-export.cabal
@@ -1,5 +1,5 @@
 name:               papa-base-export
-version:            0.3.0
+version:            0.3.1
 license:            BSD3
 license-file:       LICENCE
 author:             Queensland Functional Programming Lab <oᴉ˙ldɟb@llǝʞsɐɥ>
@@ -14,7 +14,7 @@ description:
 homepage:           https://github.com/qfpl/papa
 bug-reports:        https://github.com/qfpl/papa/issues
 cabal-version:      >= 1.10
-build-type:         Custom
+build-type:         Simple
 extra-source-files: changelog.md
 
 source-repository   head
@@ -65,28 +65,3 @@ library
                     Papa.Base.Export.Data.Traversable
                     Papa.Base.Export.Data.Void
                     Papa.Base.Export.Prelude
-
-test-suite doctests
-  type:
-                    exitcode-stdio-1.0
-
-  main-is:
-                    doctests.hs
-
-  default-language:
-                    Haskell2010
-
-  build-depends:
-                    base < 5 && >= 3
-                    , doctest >= 0.9.7
-                    , filepath >= 1.3
-                    , directory >= 1.1
-                    , QuickCheck >= 2.0
-                    , template-haskell >= 2.8
-
-  ghc-options:
-                    -Wall
-                    -threaded
-
-  hs-source-dirs:
-                    test
diff --git a/papa-base-export/test/.gitignore b/papa-base-export/test/.gitignore
diff --git a/papa-base-export/test/doctests.hs b/papa-base-export/test/doctests.hs
diff --git a/papa-base-implement/Setup.hs b/papa-base-implement/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/papa-base-implement/Setup.lhs b/papa-base-implement/Setup.lhs
diff --git a/papa-base-implement/default.nix b/papa-base-implement/default.nix
@@ -1,15 +1,9 @@
-{ mkDerivation, base, directory, doctest, filepath
-, papa-base-export, QuickCheck, semigroups, stdenv
-, template-haskell
-}:
+{ mkDerivation, base, papa-base-export, semigroups, stdenv }:
 mkDerivation {
   pname = "papa-base-implement";
-  version = "0.3.0";
+  version = "0.3.1";
   src = ./.;
   libraryHaskellDepends = [ base papa-base-export semigroups ];
-  testHaskellDepends = [
-    base directory doctest filepath QuickCheck template-haskell
-  ];
   homepage = "https://github.com/qfpl/papa";
   description = "Useful base functions reimplemented";
   license = stdenv.lib.licenses.bsd3;

diff --git a/papa-base-implement/papa-base-implement.cabal b/papa-base-implement/papa-base-implement.cabal
@@ -1,5 +1,5 @@
 name:               papa-base-implement
-version:            0.3.0
+version:            0.3.1
 license:            BSD3
 license-file:       LICENCE
 author:             Queensland Functional Programming Lab <oᴉ˙ldɟb@llǝʞsɐɥ>
@@ -14,7 +14,7 @@ description:
 homepage:           https://github.com/qfpl/papa
 bug-reports:        https://github.com/qfpl/papa/issues
 cabal-version:      >= 1.10
-build-type:         Custom
+build-type:         Simple
 extra-source-files: changelog.md
 
 source-repository   head
@@ -31,7 +31,7 @@ library
   build-depends:
                     base >= 4.8 && < 5
                   , semigroups >= 0.18
-                  , papa-base-export >= 0.3.0 && < 1
+                  , papa-base-export >= 0.3.1 && < 1
 
   ghc-options:
                     -Wall
@@ -52,28 +52,3 @@ library
                     Papa.Base.Implement.Data.List
                     Papa.Base.Implement.Data.Monoid
                     Papa.Base.Implement.Data.Traversable
-
-test-suite doctests
-  type:
-                    exitcode-stdio-1.0
-
-  main-is:
-                    doctests.hs
-
-  default-language:
-                    Haskell2010
-
-  build-depends:
-                    base < 5 && >= 3
-                    , doctest >= 0.9.7
-                    , filepath >= 1.3
-                    , directory >= 1.1
-                    , QuickCheck >= 2.0
-                    , template-haskell >= 2.8
-
-  ghc-options:
-                    -Wall
-                    -threaded
-
-  hs-source-dirs:
-                    test
diff --git a/papa-base-implement/test/.gitignore b/papa-base-implement/test/.gitignore
diff --git a/papa-base-implement/test/doctests.hs b/papa-base-implement/test/doctests.hs
diff --git a/papa-base/Setup.hs b/papa-base/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/papa-base/Setup.lhs b/papa-base/Setup.lhs
diff --git a/papa-base/default.nix b/papa-base/default.nix
@@ -1,17 +1,12 @@
-{ mkDerivation, base, directory, doctest, filepath
-, papa-base-export, papa-base-implement, QuickCheck, stdenv
-, template-haskell
+{ mkDerivation, base, papa-base-export, papa-base-implement, stdenv
 }:
 mkDerivation {
   pname = "papa-base";
-  version = "0.3.0";
+  version = "0.3.1";
   src = ./.;
   libraryHaskellDepends = [
     base papa-base-export papa-base-implement
   ];
-  testHaskellDepends = [
-    base directory doctest filepath QuickCheck template-haskell
-  ];
   homepage = "https://github.com/qfpl/papa";
   description = "Prelude with only useful functions";
   license = stdenv.lib.licenses.bsd3;