summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnMacFarlane <>2017-06-04 18:38:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-06-04 18:38:00 (GMT)
commit9fd303eeb17e88068e01ece38900c242205409a7 (patch)
treec7850d7bbb7763b0b911022d87629534a816723b
parentd22a578bff562073d992f999c8aed608e15fdeae (diff)
version 0.10.5.10.10.5.1
-rw-r--r--changelog5
-rw-r--r--pandoc-citeproc.cabal5
-rw-r--r--stack.yaml2
-rw-r--r--tests/biblio2yaml/knuth-ct-e.biblatex2
-rw-r--r--tests/test-citeproc.hs1
-rw-r--r--tests/test-pandoc-citeproc.hs5
6 files changed, 11 insertions, 9 deletions
diff --git a/changelog b/changelog
index 6bab293..ff4f102 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,8 @@
+pandoc-citeproc (0.10.5.1)
+
+ * Minor tweaks for clean CI builds.
+ * Require recent yaml for uniform test output.
+
pandoc-citeproc (0.10.5)
* Use file-embed instead of hsb2hs for embed_data_files flag (#285).
diff --git a/pandoc-citeproc.cabal b/pandoc-citeproc.cabal
index 979d151..a877cc9 100644
--- a/pandoc-citeproc.cabal
+++ b/pandoc-citeproc.cabal
@@ -1,5 +1,5 @@
name: pandoc-citeproc
-version: 0.10.5
+version: 0.10.5.1
cabal-version: >= 1.12
synopsis: Supports using pandoc with citeproc
@@ -128,9 +128,6 @@ library
build-depends: file-embed >= 0.0 && < 0.1
cpp-options: -DEMBED_DATA_FILES
other-modules: Text.CSL.Data.Embedded
- if os(darwin)
- Build-Tools: cpphs >= 1.19
- ghc-options: -pgmP cpphs -optP --cpp
if flag(unicode_collation)
build-depends: text, text-icu
diff --git a/stack.yaml b/stack.yaml
index 580f985..1c1db2d 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -14,4 +14,4 @@ packages:
extra-deps:
- xml-conduit-1.5.0
- skylighting-0.3.3
-resolver: lts-8.12
+resolver: lts-8.16
diff --git a/tests/biblio2yaml/knuth-ct-e.biblatex b/tests/biblio2yaml/knuth-ct-e.biblatex
index 2da492f..7721e32 100644
--- a/tests/biblio2yaml/knuth-ct-e.biblatex
+++ b/tests/biblio2yaml/knuth-ct-e.biblatex
@@ -53,7 +53,7 @@ references:
volume-title: Computer modern typefaces
publisher: Addison-Wesley
publisher-place: Reading, Mass.
- volume: 'E'
+ volume: E
annote: The fifth volume of a five-volume book. Note the sorttitle and sortyear
fields
language: en-US
diff --git a/tests/test-citeproc.hs b/tests/test-citeproc.hs
index b6dda4d..a6c6433 100644
--- a/tests/test-citeproc.hs
+++ b/tests/test-citeproc.hs
@@ -11,7 +11,6 @@ import Data.Char (isSpace, toLower)
import System.Environment (getArgs)
import System.Process
import System.IO.Temp (withSystemTempDirectory)
-import Text.Pandoc.Definition (Inline(Span, Str))
import qualified Text.Pandoc.UTF8 as UTF8
import Data.Aeson
import System.FilePath
diff --git a/tests/test-pandoc-citeproc.hs b/tests/test-pandoc-citeproc.hs
index 6349152..565967d 100644
--- a/tests/test-pandoc-citeproc.hs
+++ b/tests/test-pandoc-citeproc.hs
@@ -4,10 +4,8 @@ module Main where
import System.Exit
import System.Directory
import System.FilePath
-import qualified Control.Exception as E
import Data.Maybe (fromMaybe)
import System.IO
-import Data.Monoid (mempty)
import System.IO.Temp (withSystemTempDirectory)
import System.Process (rawSystem)
import qualified Data.Aeson as Aeson
@@ -17,6 +15,9 @@ import Text.CSL.Compat.Pandoc (writeNative, pipeProcess)
import Data.List (isSuffixOf)
import System.Environment
import Control.Monad (when)
+#if MIN_VERSION_pandoc(2,0,0)
+import qualified Control.Exception as E
+#endif
main :: IO ()
main = do