[python-shapely] 02/14: Imported Upstream version 1.5.11

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository python-shapely.

commit 1833b2a49bef79ce551d070b7536f5ebe43b3036
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 28 14:51:43 2015 +0200

    Imported Upstream version 1.5.11
---
 CHANGES.txt         | 5 +++++
 setup.py            | 2 +-
 shapely/__init__.py | 2 +-
 tests/__init__.py   | 2 --
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b66b6ac..606bdd1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
 Changes
 =======
 
+1.5.11 (2015-08-23)
+-------------------
+- Remove packaging module requirement added in 1.5.10 (#305). Distutils can't 
+  parse versions using 'rc', but if we stick to 'a' and 'b' we will be fine.
+
 1.5.10 (2015-08-22)
 -------------------
 - Monkey patch affinity module by absolute reference (#299).
diff --git a/setup.py b/setup.py
index b2b7bd5..34d7969 100755
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@ except ImportError:
 from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
 
-from packaging.version import Version
+from distutils.version import StrictVersion as Version
 
 # Get geos_version from GEOS dynamic library, which depends on
 # GEOS_LIBRARY_PATH and/or GEOS_CONFIG environment variables
diff --git a/shapely/__init__.py b/shapely/__init__.py
index 63d18fb..9e78465 100644
--- a/shapely/__init__.py
+++ b/shapely/__init__.py
@@ -1 +1 @@
-__version__ = "1.5.10"
+__version__ = "1.5.11"
diff --git a/tests/__init__.py b/tests/__init__.py
index 057380d..cf0c6b2 100755
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -3,8 +3,6 @@ from shapely.libgeos import geos_version_string
 from shapely.geos import lgeos, WKTWriter
 from shapely import speedups
 
-from packaging.version import Version
-
 
 test_int_types = [int]
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git