git.iko.soy/streamly
on master help sign in
Remove doctests

Should use cabal-docspec instead.

commit624158d67885f5b3e9a574f70d295e86b06a0671 authorHarendra Kumar <harendra@composewell.com> dateMon 21 Jun 2021, 03:01 (5 years ago) parentb9b94b3
9 files changed+9−116
compare with master
unifiedsplit
.github/workflows/haskell.yml−9 .packcheck.ignore+1 Setup.hs+2−2 cabal.project.doctest+2 docs/Setup.hs+2−2 docs/doctests.hs−28 docs/streamly-docs.cabal+1−19 doctests.hs−28 streamly.cabal+1−28
.github/workflows/haskell.yml−9
@@ -59,7 +59,6 @@ jobs:
5959 - 8.6.5+fusion-plugin
6060 - 8.6.5+streamk
6161 - 8.4.4+debug
62− - doctests
6362 cabal_version: ["3.4"]
6463 include:
6564 - name: 9.0.1
@@ -116,14 +115,6 @@ jobs:
116115 cabal_project: cabal.project
117116 cabal_build_options: "--flag debug --flag -opt"
118117 runner: ubuntu-latest
119− - name: doctests
120− ghc_version: 8.8.3
121− build: cabal-v2
122− cabal_build_options: "--flag doctests"
123− cabal_build_targets: doctests
124− disable_sdist_build: "y"
125− disable_dist_checks: "y"
126− runner: ubuntu-latest
127118
128119 steps:
129120 - uses: actions/checkout@v2
.packcheck.ignore+1
@@ -2,6 +2,7 @@
22cabal.project
33cabal.project.ci
44cabal.project.coverage
5+cabal.project.doctest
56cabal.project.hpc-coveralls
67hie.yaml
78stack.yaml
Setup.hs+2−2
@@ -1,6 +1,6 @@
11module Main (main) where
22
3−import Distribution.Extra.Doctest (defaultMainAutoconfWithDoctests)
3+import Distribution.Simple
44
55main :: IO ()
6−main = defaultMainAutoconfWithDoctests "doctests"
6+main = defaultMainWithHooks autoconfUserHooks
cabal.project.doctestnew file+2
@@ -0,0 +1,2 @@
1+packages: streamly.cabal
2+ , docs/streamly-docs.cabal
docs/Setup.hs+2−2
@@ -1,6 +1,6 @@
11module Main (main) where
22
3−import Distribution.Extra.Doctest (defaultMainWithDoctests)
3+import Distribution.Simple
44
55main :: IO ()
6−main = defaultMainWithDoctests "streamly-docs-doctests"
6+main = defaultMain
docs/doctests.hsdeleted−28
@@ -1,28 +0,0 @@
1−module Main where
2−
3−import Build_doctests (flags, pkgs, module_sources)
4−import Data.Foldable (traverse_)
5−import System.Environment.Compat (getArgs, unsetEnv)
6−import Test.DocTest (doctest)
7−
8−import qualified Data.List as List
9−
10−main :: IO ()
11−main = do
12− cliArgs <- getArgs
13− let (cliArgs1, mods) =
14− if (List.null (filter (== "--modules") cliArgs))
15− then (cliArgs, module_sources)
16− else (List.delete "--modules" cliArgs, [])
17− let args =
18− [ "-outputdir=./_doctests/"
19− , "-fobject-code"
20− , "--fast"
21− ]
22− ++ cliArgs1
23− ++ flags
24− ++ pkgs
25− ++ mods
26− traverse_ putStrLn args
27− unsetEnv "GHC_ENVIRONMENT"
28− doctest args
docs/streamly-docs.cabal+1−19
@@ -9,12 +9,7 @@ name: streamly-docs
99version: 0.0.0
1010synopsis: Documentation for Streamly
1111description: Documentation for Streamly
12−build-type: Custom
13−custom-setup
14− setup-depends:
15− base >= 4 && <5,
16− cabal-doctest >= 1 && <1.1,
17− Cabal >= 2.2 && < 4
12+build-type: Simple
1813
1914-------------------------------------------------------------------------------
2015-- Library
@@ -33,16 +28,3 @@ library
3328 base >= 4.9 && < 5
3429 , transformers >= 0.4 && < 0.6
3530 , streamly
36−
37−test-suite streamly-docs-doctests
38− type: exitcode-stdio-1.0
39− default-language: Haskell2010
40− ghc-options: -Wall
41− hs-source-dirs: .
42− main-is: doctests.hs
43− autogen-modules: Build_doctests
44− build-depends:
45− base
46− , base-compat >= 0.10.5 && < 0.12
47− , doctest >= 0.15 && < 0.19
48− , streamly-docs
doctests.hsdeleted−28
@@ -1,28 +0,0 @@
1−module Main where
2−
3−import Build_doctests (flags, pkgs, module_sources)
4−import Data.Foldable (traverse_)
5−import System.Environment.Compat (getArgs, unsetEnv)
6−import Test.DocTest (doctest)
7−
8−import qualified Data.List as List
9−
10−main :: IO ()
11−main = do
12− cliArgs <- getArgs
13− let (cliArgs1, mods) =
14− if (List.null (filter (== "--modules") cliArgs))
15− then (cliArgs, module_sources)
16− else (List.delete "--modules" cliArgs, [])
17− let args =
18− [ "-outputdir=./_doctests/"
19− , "-fobject-code"
20− , "--fast"
21− ]
22− ++ cliArgs1
23− ++ flags
24− ++ pkgs
25− ++ mods
26− traverse_ putStrLn args
27− unsetEnv "GHC_ENVIRONMENT"
28− doctest args
streamly.cabal+1−28
@@ -45,7 +45,7 @@ category:
4545 Logic, Non-determinism, Parsing, Array, Time, Unicode, Filesystem,
4646 Network
4747stability: Stable
48−build-type: Custom
48+build-type: Configure
4949
5050extra-source-files:
5151 .circleci/config.yml
@@ -190,17 +190,6 @@ flag opt
190190 manual: True
191191 default: True
192192
193−flag doctests
194− description: Build doctests test suite
195− manual: True
196− default: False
197−
198−custom-setup
199− setup-depends:
200− base >= 4 && <5,
201− cabal-doctest >= 1 && <1.1,
202− Cabal >= 2.2 && < 4
203−
204193-------------------------------------------------------------------------------
205194-- Common stanzas
206195-------------------------------------------------------------------------------
@@ -540,19 +529,3 @@ library
540529 -- tests fail
541530 if flag(dev) && flag(inspection)
542531 build-depends: inspection-and-dev-flags-cannot-be-used-together
543−
544−test-suite doctests
545− type: exitcode-stdio-1.0
546− main-is: doctests.hs
547− if flag(doctests)
548− build-depends:
549− base
550− , base-compat >= 0.10.5 && < 0.12
551− , doctest >= 0.15 && < 0.19
552− , streamly
553− else
554− buildable: False
555−
556− ghc-options: -Wall -threaded
557− hs-source-dirs: .
558− default-language: Haskell2010