pandoc-pyplot 1.0.2.0 → 1.0.3.0

raw patch · 4 files changed

+57/−56 lines, 4 filesdep ~basePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• package.yaml +49/−49
• pandoc-pyplot.cabal +4/−4
• src/Text/Pandoc/Filter/Pyplot.hs +2/−1
• src/Text/Pandoc/Filter/Scripting.hs +2/−2

@@ -1,50 +1,50 @@-name: pandoc-pyplot-version: '1.0.2.0'-github: "LaurentRDC/pandoc-pyplot"-license: MIT-author: "Laurent P. René de Cotret"-maintainer: "Laurent P. René de Cotret"-synopsis: A Pandoc filter for including figures generated from Matplotlib-description: -  A pandoc filter for including figures generated from Matplotlib.-  Keep the document and Python code in the same location. Output from Matplotlib-  is captured and included as a figure.-category: Documentation--license-file: LICENSE.md--extra-source-files:-- CHANGELOG.md-- LICENSE.md-- package.yaml-- README.md-- stack.yaml--ghc-options: -Wall -Wcompat--library:-  dependencies:-  - base            > 4.8 && < 5-  - directory-  - filepath-  - pandoc-types    > 1.12 && < 2-  - temporary-  - typed-process-  - containers-  source-dirs: src-  exposed-modules:-  - Text.Pandoc.Filter.Pyplot-  - Text.Pandoc.Filter.Scripting--executables:-  pandoc-pyplot:-    source-dirs: executable-    main: Main.hs-    dependencies:-    - base                > 4.8  && < 5-    - pandoc-pyplot-    - pandoc-types        > 1.12 && < 2-    ghc-options:-    - -rtsopts-    - -threaded+name: pandoc-pyplot
+version: '1.0.3.0'
+github: "LaurentRDC/pandoc-pyplot"
+license: MIT
+author: "Laurent P. René de Cotret"
+maintainer: "Laurent P. René de Cotret"
+synopsis: A Pandoc filter for including figures generated from Matplotlib
+description: 
+  A pandoc filter for including figures generated from Matplotlib.
+  Keep the document and Python code in the same location. Output from Matplotlib
+  is captured and included as a figure.
+category: Documentation
+
+license-file: LICENSE.md
+
+extra-source-files:
+- CHANGELOG.md
+- LICENSE.md
+- package.yaml
+- README.md
+- stack.yaml
+
+ghc-options: -Wall -Wcompat
+
+library:
+  dependencies:
+  - base            > 4 && < 5
+  - directory
+  - filepath
+  - pandoc-types    > 1.12 && < 2
+  - temporary
+  - typed-process
+  - containers
+  source-dirs: src
+  exposed-modules:
+  - Text.Pandoc.Filter.Pyplot
+  - Text.Pandoc.Filter.Scripting
+
+executables:
+  pandoc-pyplot:
+    source-dirs: executable
+    main: Main.hs
+    dependencies:
+    - base                > 4 && < 5
+    - pandoc-pyplot
+    - pandoc-types        > 1.12 && < 2
+    ghc-options:
+    - -rtsopts
+    - -threaded
     - -with-rtsopts=-N

@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: 563259592becbb4f2496b0f914f546163be046510966e163f71175faa94504ad+-- hash: 25fd8ea89e42939262b70218fe5deda1f7e6afceb3614082738bee06ed427a51  name:           pandoc-pyplot-version:        1.0.2.0+version:        1.0.3.0 synopsis:       A Pandoc filter for including figures generated from Matplotlib description:    A pandoc filter for including figures generated from Matplotlib. Keep the document and Python code in the same location. Output from Matplotlib is captured and included as a figure. category:       Documentation@@ -39,7 +39,7 @@       src   ghc-options: -Wall -Wcompat   build-depends:-      base >4.8 && <5+      base >4 && <5     , containers     , directory     , filepath@@ -56,7 +56,7 @@       executable   ghc-options: -Wall -Wcompat -rtsopts -threaded -with-rtsopts=-N   build-depends:-      base >4.8 && <5+      base >4 && <5     , pandoc-pyplot     , pandoc-types >1.12 && <2   default-language: Haskell2010

@@ -23,6 +23,7 @@ 
 import           Control.Monad                  ((>=>))
 import qualified Data.Map.Strict                as M
+import           Data.Monoid                    ((<>))
 import           System.Directory               (doesDirectoryExist)
 import           System.FilePath                (isValid, replaceExtension, takeDirectory)
 
@@ -147,4 +148,4 @@ -- | Walk over an entire Pandoc document, changing appropriate code blocks
 -- into figures.
 plotTransform :: Pandoc -> IO Pandoc
-plotTransform = walkM makePlot+plotTransform = walkM makePlot

@@ -24,7 +24,7 @@ import System.IO.Temp       (getCanonicalTemporaryDirectory)
 import System.Process.Typed (runProcess, shell)
 
-import Data.Monoid          (Any(..))
+import Data.Monoid          (Any(..), (<>))
 
 -- | String representation of a Python script
 type PythonScript = String
@@ -65,4 +65,4 @@         ]
     where
         scriptLines = lines script
-        anyOf xs = getAny $ mconcat $ Any <$> xs+        anyOf xs = getAny $ mconcat $ Any <$> xs