Merge branch 'release/0.3.0'

Kotaimen · Jan 25, 2016 · 10f5c33 · 10f5c33
2 parents 97649d9 + 045c299
commit 10f5c33
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -53,3 +53,10 @@ Release date: 2015-12-31
 - Refactored tilestorage package, now tile storage and raster feature storage
   shares a common implement.
 - Use mapnik3's PNG quantalizer instead of pillow for better image quality.
+
+v0.3.0
+------
+
+Release date: 2015-01-25
+
+- Fixes unittest error under python3.5 caused by httpretty.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,6 +1,7 @@
 nose>=1.3.0
 coverage>=3.7.0
 moto>=0.4.0
+httpretty!=0.8.11,!=0.8.12
 tox>=1.9
 Cython>=0.19
 Pygments>=1.6

diff --git a/setup.py b/setup.py
@@ -71,6 +71,7 @@ def find_version(*file_paths):
     'nose>=1.3.0',
     'coverage>=3.7.0',
     'moto>=0.4.18',
+    'httpretty!=0.8.11,!=0.8.12'
 ]
 
 py_modules = []

diff --git a/stonemason/__init__.py b/stonemason/__init__.py
@@ -11,7 +11,7 @@
 
 
 # Version used in the setup.py
-__version__ = '0.3.0rc1'
+__version__ = '0.3.0'
 
 # Prevent nosetests peek into this package
 __test__ = False