shapely 1.5.0__tar.gz → 1.5.2__tar.gz

{Shapely-1.5.0 → Shapely-1.5.2}/CHANGES.txt

@@ -1,6 +1,15 @@
 Changes
 =======
 
+1.5.2 (2015-01-04)
+------------------
+- Fail installation if GEOS dependency is not met, preventing update breakage
+  (#218, #219).
+
+1.5.1 (2014-12-04)
+------------------
+- Restore geometry hashing (#209).
+
 1.5.0 (2014-12-02)
 ------------------
 - Affine transformation speedups (#197).

{Shapely-1.5.0/Shapely.egg-info → Shapely-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.5.0
+Version: 1.5.2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -33,24 +33,44 @@ Description: =======
         Requirements
         ============
         
-        Shapely 1.5 requires
+        Shapely 1.5.x requires
         
         * Python >=2.6 (including Python 3.x)
-        * GEOS >=3.3 (Shapely 1.2 requires only GEOS 3.1 but YMMV)
+        * GEOS >=3.3 (Shapely 1.2.x requires only GEOS 3.1 but YMMV)
         
-        Installing Shapely 1.5.0
-        ========================
+        Installing Shapely
+        ==================
         
         Windows users should download an executable installer from
         http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely or PyPI (if available).
         
         On other systems, acquire the GEOS by any means (`brew install geos` on OS X or
         `apt-get install libgeos-dev` on Debian/Ubuntu), make sure that it is on the
-        system library path, and install Shapely 1.5.0 from the Python package index.
+        system library path, and install Shapely from the Python package index.
         
         .. code-block:: console
         
-            $ pip install -U shapely
+            $ pip install shapely
+        
+        If you've installed GEOS to a non-standard location, you can use the
+        geos-config program to find compiler and linker options.
+        
+        .. code-block:: console
+        
+            $ CFLAGS=`geos-config --cflags` LDFLAGS=`geos-config --clibs` pip install shapely
+        
+        If your system's GEOS version is < 3.3.0 you cannot use Shapely 1.3+ and must
+        stick to 1.2.x as shown below.
+        
+        .. code-block:: console
+        
+            $ pip install shapely<1.3
+        
+        Or, if you're using pip 6+
+        
+        .. code-block:: console
+        
+            $ pip install shapely~=1.2
         
         Shapely is also provided by popular Python distributions like Canopy (Enthought)
         and Anaconda (Continuum Analytics).
@@ -195,6 +215,15 @@ Description: =======
         Changes
         =======
         
+        1.5.2 (2015-01-04)
+        ------------------
+        - Fail installation if GEOS dependency is not met, preventing update breakage
+          (#218, #219).
+        
+        1.5.1 (2014-12-04)
+        ------------------
+        - Restore geometry hashing (#209).
+        
         1.5.0 (2014-12-02)
         ------------------
         - Affine transformation speedups (#197).

{Shapely-1.5.0 → Shapely-1.5.2}/README.rst

@@ -25,24 +25,44 @@ but can be readily integrated with packages that are. For more details, see:
 Requirements
 ============
 
-Shapely 1.5 requires
+Shapely 1.5.x requires
 
 * Python >=2.6 (including Python 3.x)
-* GEOS >=3.3 (Shapely 1.2 requires only GEOS 3.1 but YMMV)
+* GEOS >=3.3 (Shapely 1.2.x requires only GEOS 3.1 but YMMV)
 
-Installing Shapely 1.5.0
-========================
+Installing Shapely
+==================
 
 Windows users should download an executable installer from
 http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely or PyPI (if available).
 
 On other systems, acquire the GEOS by any means (`brew install geos` on OS X or
 `apt-get install libgeos-dev` on Debian/Ubuntu), make sure that it is on the
-system library path, and install Shapely 1.5.0 from the Python package index.
+system library path, and install Shapely from the Python package index.
 
 .. code-block:: console
 
-    $ pip install -U shapely
+    $ pip install shapely
+
+If you've installed GEOS to a non-standard location, you can use the
+geos-config program to find compiler and linker options.
+
+.. code-block:: console
+
+    $ CFLAGS=`geos-config --cflags` LDFLAGS=`geos-config --clibs` pip install shapely
+
+If your system's GEOS version is < 3.3.0 you cannot use Shapely 1.3+ and must
+stick to 1.2.x as shown below.
+
+.. code-block:: console
+
+    $ pip install shapely<1.3
+
+Or, if you're using pip 6+
+
+.. code-block:: console
+
+    $ pip install shapely~=1.2
 
 Shapely is also provided by popular Python distributions like Canopy (Enthought)
 and Anaconda (Continuum Analytics).

{Shapely-1.5.0 → Shapely-1.5.2/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.5.0
+Version: 1.5.2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -33,24 +33,44 @@ Description: =======
         Requirements
         ============
         
-        Shapely 1.5 requires
+        Shapely 1.5.x requires
         
         * Python >=2.6 (including Python 3.x)
-        * GEOS >=3.3 (Shapely 1.2 requires only GEOS 3.1 but YMMV)
+        * GEOS >=3.3 (Shapely 1.2.x requires only GEOS 3.1 but YMMV)
         
-        Installing Shapely 1.5.0
-        ========================
+        Installing Shapely
+        ==================
         
         Windows users should download an executable installer from
         http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely or PyPI (if available).
         
         On other systems, acquire the GEOS by any means (`brew install geos` on OS X or
         `apt-get install libgeos-dev` on Debian/Ubuntu), make sure that it is on the
-        system library path, and install Shapely 1.5.0 from the Python package index.
+        system library path, and install Shapely from the Python package index.
         
         .. code-block:: console
         
-            $ pip install -U shapely
+            $ pip install shapely
+        
+        If you've installed GEOS to a non-standard location, you can use the
+        geos-config program to find compiler and linker options.
+        
+        .. code-block:: console
+        
+            $ CFLAGS=`geos-config --cflags` LDFLAGS=`geos-config --clibs` pip install shapely
+        
+        If your system's GEOS version is < 3.3.0 you cannot use Shapely 1.3+ and must
+        stick to 1.2.x as shown below.
+        
+        .. code-block:: console
+        
+            $ pip install shapely<1.3
+        
+        Or, if you're using pip 6+
+        
+        .. code-block:: console
+        
+            $ pip install shapely~=1.2
         
         Shapely is also provided by popular Python distributions like Canopy (Enthought)
         and Anaconda (Continuum Analytics).
@@ -195,6 +215,15 @@ Description: =======
         Changes
         =======
         
+        1.5.2 (2015-01-04)
+        ------------------
+        - Fail installation if GEOS dependency is not met, preventing update breakage
+          (#218, #219).
+        
+        1.5.1 (2014-12-04)
+        ------------------
+        - Restore geometry hashing (#209).
+        
         1.5.0 (2014-12-02)
         ------------------
         - Affine transformation speedups (#197).

{Shapely-1.5.0 → Shapely-1.5.2}/Shapely.egg-info/SOURCES.txt

@@ -68,6 +68,7 @@ tests/test_equality.py
 tests/test_geointerface.py
 tests/test_geomseq.py
 tests/test_getitem.py
+tests/test_hash.py
 tests/test_invalid_geometries.py
 tests/test_iterops.py
 tests/test_linear_referencing.py

Shapely-1.5.2/VERSION.txt

@@ -0,0 +1 @@
+1.5.2

{Shapely-1.5.0 → Shapely-1.5.2}/setup.py

@@ -2,15 +2,19 @@
 
 from __future__ import print_function
 
+import ctypes
+import ctypes.util
 try:
     # If possible, use setuptools
     from setuptools import setup
     from setuptools.extension import Extension
     from setuptools.command.build_ext import build_ext as distutils_build_ext
+    from setuptools.command.install import install
 except ImportError:
     from distutils.core import setup
     from distutils.extension import Extension
     from distutils.command.build_ext import build_ext as distutils_build_ext
+    from distutils.command.install import install
 from distutils.cmd import Command
 from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
@@ -19,6 +23,7 @@ import errno
 import glob
 import os
 import platform
+import re
 import shutil
 import subprocess
 import sys
@@ -53,6 +58,74 @@ with open('CHANGES.txt', 'r', **open_kwds) as fp:
 
 long_description = readme + '\n\n' + credits + '\n\n' + changes
 
+# Fail installation if we can't find a GEOS shared library with the right
+# version. We ship it with Shapely for Windows, so no need to check on that
+# platform. Code below copied from shapely/geos.py.
+class InstallCommand(install):
+
+    def run(self):
+        def load_dll(libname, fallbacks=None):
+            lib = ctypes.util.find_library(libname)
+            if lib is not None:
+                try:
+                    return ctypes.CDLL(lib)
+                except OSError:
+                    pass
+            if fallbacks is not None:
+                for name in fallbacks:
+                    try:
+                        return ctypes.CDLL(name)
+                    except OSError:
+                        # move on to the next fallback
+                        pass
+            # No shared library was loaded. Raise OSError.
+            raise OSError(
+                "Could not find library %s or load any of its variants %s" % (
+                    libname, fallbacks or []))
+
+        if sys.platform.startswith('linux'):
+            _lgeos = load_dll(
+                'geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
+        elif sys.platform == 'darwin':
+            if hasattr(sys, 'frozen'):
+                # .app file from py2app
+                alt_paths = [os.path.join(os.environ['RESOURCEPATH'],
+                             '..', 'Frameworks', 'libgeos_c.dylib')]
+            else:
+                alt_paths = [
+                    # The Framework build from Kyng Chaos:
+                    "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
+                    # macports
+                    '/opt/local/lib/libgeos_c.dylib',
+                ]
+            _lgeos = load_dll('geos_c', fallbacks=alt_paths)
+        elif sys.platform == 'sunos5':
+            _lgeos = load_dll(
+                'geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
+        else:  # other *nix systems
+            _lgeos = load_dll(
+                'geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
+
+        GEOSversion = _lgeos.GEOSversion
+        GEOSversion.restype = ctypes.c_char_p
+        GEOSversion.argtypes = []
+        geos_version_string = GEOSversion()
+        if sys.version_info[0] >= 3:
+            geos_version_string = geos_version_string.decode('ascii')
+        res = re.findall(r'(\d+)\.(\d+)\.(\d+)', geos_version_string)
+        assert len(res) == 2, res
+        geos_version = tuple(int(x) for x in res[0])
+        shapely_version = tuple(int(x) for x in version.split('.'))
+
+        if shapely_version >= (1, 3):
+            if geos_version >= (3, 3):
+                install.run(self)
+            else:
+                print(
+                    "Shapely >= 1.3 requires GEOS >= 3.3. "
+                    "Install GEOS 3.3+ and reinstall Shapely.")
+                sys.exit(1)
+
 setup_args = dict(
     name                = 'Shapely',
     version             = version,
@@ -74,7 +147,7 @@ setup_args = dict(
         'shapely.speedups',
         'shapely.vectorized',
     ],
-    cmdclass = {},
+    cmdclass = {'install': InstallCommand},
     classifiers         = [
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -89,7 +162,7 @@ setup_args = dict(
     data_files         = [('shapely', ['shapely/_geos.pxi'])]
 )
 
-# Add DLLs for Windows
+# Add DLLs to Windows packages.
 if sys.platform == 'win32':
     try:
         os.mkdir('shapely/DLLs')

Shapely-1.5.2/shapely/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.5.2"

{Shapely-1.5.0 → Shapely-1.5.2}/shapely/geometry/base.py

@@ -261,6 +261,8 @@ class BaseGeometry(object):
     def __ne__(self, other):
         return not self.__eq__(other)
 
+    __hash__ = object.__hash__
+
     # Array and ctypes interfaces
     # ---------------------------
 
@@ -740,6 +742,8 @@ class BaseMultipartGeometry(BaseGeometry):
     def __ne__(self, other):
         return not self.__eq__(other)
 
+    __hash__ = object.__hash__
+
     def svg(self, scale_factor=1.):
         """
         SVG representation of the geometry. Scale factor is multiplied by

{Shapely-1.5.0 → Shapely-1.5.2}/shapely/geometry/polygon.py

@@ -264,6 +264,8 @@ class Polygon(BaseGeometry):
     def __ne__(self, other):
         return not self.__eq__(other)
 
+    __hash__ = object.__hash__
+
     @property
     def ctypes(self):
         if not self._ctypes_data:

Shapely-1.5.2/tests/test_hash.py

@@ -0,0 +1,21 @@
+from shapely.geometry import Point, MultiPoint, Polygon, GeometryCollection
+
+
+def test_point():
+    g = Point(0, 0)
+    assert hash(g)
+
+
+def test_multipoint():
+    g = MultiPoint([(0, 0)])
+    assert hash(g)
+
+
+def test_polygon():
+    g = Point(0, 0).buffer(1.0)
+    assert hash(g)
+
+
+def test_collection():
+    g = GeometryCollection([Point(0, 0)])
+    assert hash(g)

Shapely-1.5.0/VERSION.txt

@@ -1 +0,0 @@
-1.5.0

Shapely-1.5.0/shapely/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.5.0"