stratux-types 0.0.9 → 0.0.10

raw patch · 4 files changed

+6/−108 lines, 4 filesdep −QuickCheckdep −directorydep −doctestdep ~aesondep ~basesetup-changedPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies removed: QuickCheck, directory, doctest, filepath, template-haskell

Dependency ranges changed: aeson, base

API changes (from Hackage documentation)

Files

• Setup.hs +2/−0
• Setup.lhs +0/−44
• stratux-types.cabal +4/−32
• test/doctests.hs +0/−32

@@ -0,0 +1,2 @@+import Distribution.Simple+main = defaultMain

@@ -1,44 +0,0 @@-#!/usr/bin/env runhaskell-\begin{code}-{-# OPTIONS_GHC -Wall #-}-module Main (main) where--import Data.List ( nub )-import Data.Version ( showVersion )-import Distribution.Package ( PackageName(PackageName), PackageId, InstalledPackageId, packageVersion, packageName )-import Distribution.PackageDescription ( PackageDescription(), TestSuite(..) )-import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks )-import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose )-import Distribution.Simple.BuildPaths ( autogenModulesDir )-import Distribution.Simple.Setup ( BuildFlags(buildVerbosity), fromFlag )-import Distribution.Simple.LocalBuildInfo ( withLibLBI, withTestLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps) )-import Distribution.Verbosity ( Verbosity )-import System.FilePath ( (</>) )--main :: IO ()-main = defaultMainWithHooks simpleUserHooks-  { buildHook = \pkg lbi hooks flags -> do-     generateBuildModule (fromFlag (buildVerbosity flags)) pkg lbi-     buildHook simpleUserHooks pkg lbi hooks flags-  }--generateBuildModule :: Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()-generateBuildModule verbosity pkg lbi = do-  let dir = autogenModulesDir lbi-  createDirectoryIfMissingVerbose verbosity True dir-  withLibLBI pkg lbi $ \_ libcfg -> do-    withTestLBI pkg lbi $ \suite suitecfg -> do-      rewriteFile (dir </> "Build_" ++ testName suite ++ ".hs") $ unlines-        [ "module Build_" ++ testName suite ++ " where"-        , "deps :: [String]"-        , "deps = " ++ (show $ formatdeps (testDeps libcfg suitecfg))-        ]-  where-    formatdeps = map (formatone . snd)-    formatone p = case packageName p of-      PackageName n -> n ++ "-" ++ showVersion (packageVersion p)--testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [(InstalledPackageId, PackageId)]-testDeps xs ys = nub $ componentPackageDeps xs ++ componentPackageDeps ys--\end{code}

@@ -1,5 +1,5 @@ name:               stratux-types-version:            0.0.9+version:            0.0.10 license:            BSD3 license-file:       LICENCE author:             Tony Morris <ʇǝu˙sıɹɹoɯʇ@ןןǝʞsɐɥ>@@ -11,24 +11,21 @@ homepage:           https://github.com/tonymorris/stratux-types bug-reports:        https://github.com/tonymorris/stratux-types/issues cabal-version:      >= 1.10-build-type:         Custom+build-type:         Simple extra-source-files: changelog.md  source-repository   head   type:             git   location:         git@github.com:tonymorris/stratux-types.git -flag                small_base-  description:      Choose the new, split-up base package.- library   default-language:                     Haskell2010    build-depends:-                      base < 5 && >= 4+                      base >= 4 && < 6                     , lens >= 4.0 && < 5.0       -                    , aeson >= 1.0 && < 1.1+                    , aeson >= 1.0                     , time >= 1.4 && < 2.0                     , bytestring >= 0.10 && < 1.0                          , scientific >= 0.3 && < 1.0@@ -56,28 +53,3 @@                     Data.Aviation.Stratux.Types.Traffic                     Data.Aviation.Stratux.Types.UTCTimes                     Data.Aviation.Stratux.Types.Word8s--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

@@ -1,32 +0,0 @@-module Main where--import Build_doctests (deps)-import Control.Applicative-import Control.Monad-import Data.List-import System.Directory-import System.FilePath-import Test.DocTest--main ::-  IO ()-main =-  getSources >>= \sources -> doctest $-      "-isrc"-    : "-idist/build/autogen"-    : "-optP-include"-    : "-optPdist/build/autogen/cabal_macros.h"-    : "-hide-all-packages"-    : map ("-package="++) deps ++ sources--getSources :: IO [FilePath]-getSources = filter (isSuffixOf ".hs") <$> go "src"-  where-    go dir = do-      (dirs, files) <- getFilesAndDirectories dir-      (files ++) . concat <$> mapM go dirs--getFilesAndDirectories :: FilePath -> IO ([FilePath], [FilePath])-getFilesAndDirectories dir = do-  c <- map (dir </>) . filter (`notElem` ["..", "."]) <$> getDirectoryContents dir-  (,) <$> filterM doesDirectoryExist c <*> filterM doesFileExist c