summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-09-07 16:48:41 +0200
committerJonas Smedegaard <dr@jones.dk>2011-09-07 16:48:41 +0200
commit6ac52ff209b172129452cd464d840b3c73c85c01 (patch)
tree87a16e7e98aed3beca43aca5f125a990b9a3f4fa
parenta242ebaf29539d6a9a4eec97e510b5f8e4b59b30 (diff)
Imported Upstream version 1.8.2.1
-rw-r--r--changelog10
-rw-r--r--pandoc.cabal8
-rw-r--r--src/Tests/Arbitrary.hs4
3 files changed, 16 insertions, 6 deletions
diff --git a/changelog b/changelog
index 0b66b8608..4d8e22861 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+pandoc (1.8.2.1)
+
+ * Relaxed cabal consntraints for test-framework (S. Trofimovich).
+
+ * Relaxed cabal constraints for pandoc-types.
+
+ * Adjusted Arbitrary instance to help avoid timeouts in tests.
+
+ * Added `Tests.Writers.Markdown` to cabal file.
+
pandoc (1.8.2)
* Added script to produce OS X package.
diff --git a/pandoc.cabal b/pandoc.cabal
index 99f0916ec..757254c36 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
Name: pandoc
-Version: 1.8.2
+Version: 1.8.2.1
Cabal-Version: >= 1.6
Build-Type: Custom
License: GPL
@@ -207,7 +207,7 @@ Library
random >= 1 && < 1.1,
extensible-exceptions >= 0.1 && < 0.2,
citeproc-hs >= 0.3.1 && < 0.4,
- pandoc-types == 1.8.0.2,
+ pandoc-types == 1.8.*,
json >= 0.4 && < 0.5,
dlist >= 0.4 && < 0.6,
tagsoup >= 0.12 && < 0.13,
@@ -293,7 +293,7 @@ Executable pandoc
random >= 1 && < 1.1,
extensible-exceptions >= 0.1 && < 0.2,
citeproc-hs >= 0.3.1 && < 0.4,
- pandoc-types == 1.8.0.2,
+ pandoc-types == 1.8.*,
json >= 0.4 && < 0.5,
dlist >= 0.4 && < 0.6,
tagsoup >= 0.12 && < 0.13,
@@ -351,7 +351,7 @@ Executable test-pandoc
else
Ghc-Options: -Wall
Extensions: CPP
- Build-Depends: base >= 4 && < 5, Diff, test-framework >= 0.3 && < 0.4,
+ Build-Depends: base >= 4 && < 5, Diff, test-framework >= 0.3 && < 0.5,
test-framework-hunit >= 0.2 && < 0.3,
test-framework-quickcheck2 >= 0.2.9 && < 0.3,
QuickCheck >= 2.4 && < 2.6,
diff --git a/src/Tests/Arbitrary.hs b/src/Tests/Arbitrary.hs
index 39491431d..f5a44ceab 100644
--- a/src/Tests/Arbitrary.hs
+++ b/src/Tests/Arbitrary.hs
@@ -28,7 +28,7 @@ instance Arbitrary Blocks where
arbitrary = liftM fromList arbitrary
instance Arbitrary Inline where
- arbitrary = resize 3 $ arbInline 3
+ arbitrary = resize 3 $ arbInline 2
arbInlines :: Int -> Gen [Inline]
arbInlines n = listOf1 (arbInline n) `suchThat` (not . startsWithSpace)
@@ -72,7 +72,7 @@ arbInline n = frequency $ [ (60, liftM Str realString)
]
instance Arbitrary Block where
- arbitrary = resize 3 $ arbBlock 3
+ arbitrary = resize 3 $ arbBlock 2
arbBlock :: Int -> Gen Block
arbBlock n = frequency $ [ (10, liftM Plain $ arbInlines (n-1))