From 77fd94dd32c3ddf35b865cde2f630b977729d742 Mon Sep 17 00:00:00 2001 From: David Himmelstrup Date: Fri, 1 Nov 2019 12:58:38 +0800 Subject: [PATCH] Test against stack-nightly. (#27) * Relax base dependency. * Disable diagrams. * Remove unused dependencies. * Use new version of chiphunk. * Fix imports. * Workaround for warnings in newer versions of ghc. * Don't be pedantic during the nightly test. Former-commit-id: 76e3f3c4568e8a340014622260a6c5e84224d67b --- .azure/azure-linux-template.yml | 9 +++++++-- examples/sunflower.hs | 6 ++++++ examples/tangent_and_normal.hs | 6 ++++++ examples/vector_field.hs | 5 +++++ reanimate.cabal | 11 +++++------ src/Reanimate/Driver/CLI.hs | 3 ++- src/Reanimate/Driver/Server.hs | 4 +--- src/Reanimate/Raster.hs | 2 +- stack-lts-11.yaml | 11 +---------- stack-lts-12.yaml | 11 +---------- stack.yaml | 11 +---------- 11 files changed, 36 insertions(+), 43 deletions(-) diff --git a/.azure/azure-linux-template.yml b/.azure/azure-linux-template.yml index 4238ba6..0a693af 100644 --- a/.azure/azure-linux-template.yml +++ b/.azure/azure-linux-template.yml @@ -9,13 +9,18 @@ jobs: stack: BUILD: stack STACK_YAML: stack.yaml - ARGS: --resolver lts-13.14 + ARGS: --pedantic stack-lts-12: BUILD: stack STACK_YAML: stack-lts-12.yaml + ARGS: --pedantic stack-lts-11: BUILD: stack STACK_YAML: stack-lts-11.yaml + ARGS: --pedantic + stack-nightly: + BUILD: stack + ARGS: --resolver nightly maxParallel: 6 steps: - task: CacheBeta@0 @@ -104,7 +109,7 @@ jobs: ;; *) stack ./examples/counter.hs check - stack $ARGS test --pedantic + stack test $ARGS ;; esac set +ex diff --git a/examples/sunflower.hs b/examples/sunflower.hs index af34c6e..70f6b33 100755 --- a/examples/sunflower.hs +++ b/examples/sunflower.hs @@ -3,6 +3,10 @@ {-# LANGUAGE OverloadedStrings #-} module Main (main) where +main :: IO () +main = return () + +{- import qualified Data.Colour.Palette.BrewerSet as D import Diagrams.Prelude hiding (Animation, boundingBox, center, circle, duration, @@ -40,3 +44,5 @@ main = reanimate $ mkAnimation 10 $ \t -> sunflower n = frame 4 $ position $ take n $ zip mkCoords florets where florets = [ floret (sqrt (fromIntegral i)) | i <- [1::Int ..]] +-} + diff --git a/examples/tangent_and_normal.hs b/examples/tangent_and_normal.hs index 6c5d5cc..92a3a8c 100755 --- a/examples/tangent_and_normal.hs +++ b/examples/tangent_and_normal.hs @@ -3,6 +3,10 @@ {-# LANGUAGE OverloadedStrings #-} module Main (main) where +main :: IO () +main = return () + +{- import Diagrams.Prelude hiding (Animation, boundingBox, center, circle, duration, fontSize, rotate, scale, @@ -55,3 +59,5 @@ main = reanimate $ playThenReverseA $ mkAnimation 5 $ \t -> rightAngleSquare :: SvgDiagram rightAngleSquare = square 0.1 # alignBL # D.rotate (signedAngleBetween tangentVector unitX) +-} + diff --git a/examples/vector_field.hs b/examples/vector_field.hs index 5d826a5..6f263bf 100755 --- a/examples/vector_field.hs +++ b/examples/vector_field.hs @@ -4,6 +4,9 @@ {-# LANGUAGE FlexibleContexts #-} module Main (main) where +main :: IO () +main = return () +{- import Diagrams.Prelude hiding (Animation, boundingBox, center, circle, duration, fontSize, rotate, scale, @@ -55,3 +58,5 @@ example n = field arrows = map arrowAtPoint locs field = position $ zip points arrows +-} + diff --git a/reanimate.cabal b/reanimate.cabal index 01ae828..d853078 100644 --- a/reanimate.cabal +++ b/reanimate.cabal @@ -51,7 +51,7 @@ library Reanimate.Svg.Constructors Reanimate.Svg.BoundingBox Reanimate.Svg.LineCommand - Reanimate.Diagrams + -- Reanimate.Diagrams Reanimate.Transform Reanimate.Driver Reanimate.Misc @@ -74,15 +74,14 @@ library Reanimate.Driver.Server Reanimate.Driver.Compile Paths_reanimate - build-depends: base >=4.10 && <4.13, + build-depends: base >=4.10 && <5, time, text, filepath, process, directory, containers, reanimate-svg >= 0.9.3.1, xml, bytestring, lens, linear, mtl, matrix, - JuicyPixels, attoparsec, parallel, diagrams, diagrams-svg, - diagrams-core, diagrams-lib, diagrams-contrib, - svg-builder, cubicbezier, palette, websockets, + JuicyPixels, attoparsec, parallel, + cubicbezier, websockets, hashable, fsnotify, open-browser, random-shuffle, base64-bytestring, vector, colour, cassava, ansi-wl-pprint, here, temporary, - optparse-applicative, chiphunk >= 0.1.2.0 + optparse-applicative, chiphunk >= 0.1.2.1 ghc-options: -Wall test-suite spec diff --git a/src/Reanimate/Driver/CLI.hs b/src/Reanimate/Driver/CLI.hs index a28c55e..0919936 100644 --- a/src/Reanimate/Driver/CLI.hs +++ b/src/Reanimate/Driver/CLI.hs @@ -9,9 +9,10 @@ module Reanimate.Driver.CLI ) where import Data.Char -import Data.Monoid ((<>)) +import Data.Monoid import Options.Applicative import Reanimate.Render (Format (..), Width, Height, FPS) +import Prelude data Options = Options { optsCommand :: Command diff --git a/src/Reanimate/Driver/Server.hs b/src/Reanimate/Driver/Server.hs index db4179d..c126777 100644 --- a/src/Reanimate/Driver/Server.hs +++ b/src/Reanimate/Driver/Server.hs @@ -4,9 +4,7 @@ module Reanimate.Driver.Server , findOwnSource ) where -import Control.Concurrent (forkIO, killThread, modifyMVar_, - newEmptyMVar, putMVar, takeMVar, - threadDelay) +import Control.Concurrent (forkIO, killThread, threadDelay) import Control.Concurrent.MVar import Control.Exception (SomeException, catch, finally) import Control.Monad diff --git a/src/Reanimate/Raster.hs b/src/Reanimate/Raster.hs index 466a18d..073c575 100644 --- a/src/Reanimate/Raster.hs +++ b/src/Reanimate/Raster.hs @@ -6,8 +6,8 @@ module Reanimate.Raster , svgAsPngFile ) where +import Codec.Picture.Types import Codec.Picture -import Codec.Picture.Types (dynamicMap) import Control.Lens ((.~),(&)) import qualified Data.ByteString as B import qualified Data.ByteString.Base64.Lazy as Base64 diff --git a/stack-lts-11.yaml b/stack-lts-11.yaml index b6e919e..960f095 100644 --- a/stack-lts-11.yaml +++ b/stack-lts-11.yaml @@ -7,16 +7,7 @@ packages: extra-deps: - reanimate-svg-0.9.3.1 -- palette-0.3.0.2 -- chiphunk-0.1.2.0 -- diagrams-1.4@sha256:3e36369e84115b900fd9dcb570672a188339a470eb19ca62170775cd835cf8ca -- diagrams-contrib-1.4.3@sha256:bcfa6c85f8c33b8c48c3a61b7216afdebd51cd793c50da3a2dd358827d25fc76 -- diagrams-core-1.4.1.1@sha256:6ef6b17785d77997c481eb085570e21b6a00cc91d086fbf49490504130ebc7d1 -- diagrams-lib-1.4.2.3@sha256:47af9bd9249f16e164a0ba014dcc0aaf47a787b5d3ff78a1bf38ed80f5a5c13e -- diagrams-svg-1.4.2@sha256:1b0b473c9825f6abda5b1551376dc5c4adcc995cc1705324231c32a57a415697 +- chiphunk-0.1.2.1 - cubicbezier-0.6.0.6@sha256:2191ff47144d9a13a2784651a33d340cd31be1926a6c188925143103eb3c8db3 -- diagrams-solve-0.1.1@sha256:ad04ac1c1b1071f906a9879de00997bd543cc0a46c83c3a38199a87702674afa -- dual-tree-0.2.2@sha256:b04a53694ad1e8c34f9e2f2b96cd6c3ae59d782caba14b6d523d6205436e1165 -- mfsolve-0.3.2.0@sha256:19ce2822b8d3cf906e983a237341698349dcef49d873b1b03d141276b4b0e8dc - fast-math-1.0.2@sha256:91181eb836e54413cc5a841e797c42b2264954e893ea530b6fc4da0dccf6a8b7 - matrices-0.5.0@sha256:b2761813f6a61c84224559619cc60a16a858ac671c8436bbac8ec89e85473058 diff --git a/stack-lts-12.yaml b/stack-lts-12.yaml index bf743b3..b01b709 100644 --- a/stack-lts-12.yaml +++ b/stack-lts-12.yaml @@ -7,16 +7,7 @@ packages: extra-deps: - reanimate-svg-0.9.3.1 -- palette-0.3.0.2 -- chiphunk-0.1.2.0 -- diagrams-1.4@sha256:3e36369e84115b900fd9dcb570672a188339a470eb19ca62170775cd835cf8ca -- diagrams-contrib-1.4.3@sha256:bcfa6c85f8c33b8c48c3a61b7216afdebd51cd793c50da3a2dd358827d25fc76 -- diagrams-core-1.4.1.1@sha256:6ef6b17785d77997c481eb085570e21b6a00cc91d086fbf49490504130ebc7d1 -- diagrams-lib-1.4.2.3@sha256:47af9bd9249f16e164a0ba014dcc0aaf47a787b5d3ff78a1bf38ed80f5a5c13e -- diagrams-svg-1.4.2@sha256:1b0b473c9825f6abda5b1551376dc5c4adcc995cc1705324231c32a57a415697 +- chiphunk-0.1.2.1 - cubicbezier-0.6.0.6@sha256:2191ff47144d9a13a2784651a33d340cd31be1926a6c188925143103eb3c8db3 -- diagrams-solve-0.1.1@sha256:ad04ac1c1b1071f906a9879de00997bd543cc0a46c83c3a38199a87702674afa -- dual-tree-0.2.2@sha256:b04a53694ad1e8c34f9e2f2b96cd6c3ae59d782caba14b6d523d6205436e1165 -- mfsolve-0.3.2.0@sha256:19ce2822b8d3cf906e983a237341698349dcef49d873b1b03d141276b4b0e8dc - fast-math-1.0.2@sha256:91181eb836e54413cc5a841e797c42b2264954e893ea530b6fc4da0dccf6a8b7 - matrices-0.5.0@sha256:b2761813f6a61c84224559619cc60a16a858ac671c8436bbac8ec89e85473058 diff --git a/stack.yaml b/stack.yaml index 58c80e8..1280047 100644 --- a/stack.yaml +++ b/stack.yaml @@ -7,16 +7,7 @@ packages: extra-deps: - reanimate-svg-0.9.3.1 -- palette-0.3.0.2 -- chiphunk-0.1.2.0 -- diagrams-1.4@sha256:3e36369e84115b900fd9dcb570672a188339a470eb19ca62170775cd835cf8ca -- diagrams-contrib-1.4.3@sha256:bcfa6c85f8c33b8c48c3a61b7216afdebd51cd793c50da3a2dd358827d25fc76 -- diagrams-core-1.4.1.1@sha256:6ef6b17785d77997c481eb085570e21b6a00cc91d086fbf49490504130ebc7d1 -- diagrams-lib-1.4.2.3@sha256:47af9bd9249f16e164a0ba014dcc0aaf47a787b5d3ff78a1bf38ed80f5a5c13e -- diagrams-svg-1.4.2@sha256:1b0b473c9825f6abda5b1551376dc5c4adcc995cc1705324231c32a57a415697 +- chiphunk-0.1.2.1 - cubicbezier-0.6.0.6@sha256:2191ff47144d9a13a2784651a33d340cd31be1926a6c188925143103eb3c8db3 -- diagrams-solve-0.1.1@sha256:ad04ac1c1b1071f906a9879de00997bd543cc0a46c83c3a38199a87702674afa -- dual-tree-0.2.2@sha256:b04a53694ad1e8c34f9e2f2b96cd6c3ae59d782caba14b6d523d6205436e1165 -- mfsolve-0.3.2.0@sha256:19ce2822b8d3cf906e983a237341698349dcef49d873b1b03d141276b4b0e8dc - fast-math-1.0.2@sha256:91181eb836e54413cc5a841e797c42b2264954e893ea530b6fc4da0dccf6a8b7 - matrices-0.5.0@sha256:b2761813f6a61c84224559619cc60a16a858ac671c8436bbac8ec89e85473058