Merge branch 'refs/heads/3.1.12'

Conflicts: .gitignore README.rst setup.py
bikalims · Dec 15, 2016 · e6ff427 · e6ff427
2 parents 3289943 + c056712
commit e6ff427
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,4 @@ Thumbs.db
 var
 tags
 buildout-cache
+atlassian-*.xml
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -50,6 +50,10 @@ LIMS-2181: An analysis is not stopped from using an invalid instrument
 3.1.12 (unreleased)
 -----------------------------
 HEALTH-569 Bar code printing not working on sample registration
+3.1.12 (2016-12-15)
+-----------------------------
+HEALTH-569 Bar code printing not working on sample registration
+- Pinned CairoSVG to 1.0.20 (support for Python 2 removed in later versions)
 
 3.1.11 (2016-04-22)
 -----------------------------

diff --git a/setup.py b/setup.py
@@ -72,6 +72,7 @@ def read(*rnames):
           'five.pt',
           'z3c.jbot',
           'plone.resource',
+          'CairoSVG==1.0.20',
       ],
       extras_require={
           'test': [