shapely 1.6a1__tar.gz → 1.6a2__tar.gz

{Shapely-1.6a1 → Shapely-1.6a2}/CHANGES.txt

@@ -1,6 +1,25 @@
 Changes
 =======
 
+1.6a2 (2016-11-09)
+------------------
+
+Bug fixes:
+
+- Shapely no longer configures logging in ``geos.py`` (#415).
+
+Refactoring:
+
+- Consolidation of exceptions in ``shapely.errors``.
+- ``UnsupportedGEOSVersionError`` is raised when GEOS < 3.3.0 (#407).
+
+Packaging:
+
+- Added new library search paths to assist Anaconda (#413).
+- geos-config will now be bypassed when NO_GEOS_CONFIG env var is set. This
+  allows configuration of Shapely builds on Linux systems that for whatever
+  reasons do not include the geos-config program (#322).
+
 1.6a1 (2016-09-14)
 ------------------
 
@@ -27,7 +46,7 @@ Refactoring:
 
 - Switch from ``SingleSidedBuffer()`` to ``OffsetCurve()`` for GEOS >= 3.3
   (#270).
-- Cython speedups are now enabled by defualt (#252).
+- Cython speedups are now enabled by default (#252).
 
 Packaging:
 

{Shapely-1.6a1/Shapely.egg-info → Shapely-1.6a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6a1
+Version: 1.6a2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -231,6 +231,25 @@ Description: =======
         Changes
         =======
         
+        1.6a2 (2016-11-09)
+        ------------------
+        
+        Bug fixes:
+        
+        - Shapely no longer configures logging in ``geos.py`` (#415).
+        
+        Refactoring:
+        
+        - Consolidation of exceptions in ``shapely.errors``.
+        - ``UnsupportedGEOSVersionError`` is raised when GEOS < 3.3.0 (#407).
+        
+        Packaging:
+        
+        - Added new library search paths to assist Anaconda (#413).
+        - geos-config will now be bypassed when NO_GEOS_CONFIG env var is set. This
+          allows configuration of Shapely builds on Linux systems that for whatever
+          reasons do not include the geos-config program (#322).
+        
         1.6a1 (2016-09-14)
         ------------------
         
@@ -257,7 +276,7 @@ Description: =======
         
         - Switch from ``SingleSidedBuffer()`` to ``OffsetCurve()`` for GEOS >= 3.3
           (#270).
-        - Cython speedups are now enabled by defualt (#252).
+        - Cython speedups are now enabled by default (#252).
         
         Packaging:
         

{Shapely-1.6a1 → Shapely-1.6a2/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6a1
+Version: 1.6a2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -231,6 +231,25 @@ Description: =======
         Changes
         =======
         
+        1.6a2 (2016-11-09)
+        ------------------
+        
+        Bug fixes:
+        
+        - Shapely no longer configures logging in ``geos.py`` (#415).
+        
+        Refactoring:
+        
+        - Consolidation of exceptions in ``shapely.errors``.
+        - ``UnsupportedGEOSVersionError`` is raised when GEOS < 3.3.0 (#407).
+        
+        Packaging:
+        
+        - Added new library search paths to assist Anaconda (#413).
+        - geos-config will now be bypassed when NO_GEOS_CONFIG env var is set. This
+          allows configuration of Shapely builds on Linux systems that for whatever
+          reasons do not include the geos-config program (#322).
+        
         1.6a1 (2016-09-14)
         ------------------
         
@@ -257,7 +276,7 @@ Description: =======
         
         - Switch from ``SingleSidedBuffer()`` to ``OffsetCurve()`` for GEOS >= 3.3
           (#270).
-        - Cython speedups are now enabled by defualt (#252).
+        - Cython speedups are now enabled by default (#252).
         
         Packaging:
         

{Shapely-1.6a1 → Shapely-1.6a2}/Shapely.egg-info/SOURCES.txt

@@ -36,6 +36,7 @@ shapely/_geos.pxi
 shapely/affinity.py
 shapely/coords.py
 shapely/ctypes_declarations.py
+shapely/errors.py
 shapely/ftools.py
 shapely/geos.py
 shapely/impl.py

Shapely-1.6a2/VERSION.txt

@@ -0,0 +1 @@
+1.6a2

{Shapely-1.6a1 → Shapely-1.6a2}/setup.py

@@ -116,8 +116,7 @@ class GEOSConfig(object):
         match = re.match(r'(\d+)\.(\d+)\.(\d+)', self.get('--version').strip())
         return tuple(map(int, match.groups()))
 
-
-# Get the version from the shapely module
+# Get the version from the shapely module.
 shapely_version = None
 with open('shapely/__init__.py', 'r') as fp:
     for line in fp:
@@ -129,14 +128,18 @@ with open('shapely/__init__.py', 'r') as fp:
 if not shapely_version:
     raise ValueError("Could not determine Shapely's version")
 
+# Allow GEOS_CONFIG to be bypassed in favor of CFLAGS and LDFLAGS
+# vars set by build environment.
+if os.environ.get('NO_GEOS_CONFIG'):
+    geos_config = None
+else:
+    geos_config = GEOSConfig(os.environ.get('GEOS_CONFIG', 'geos-config'))
+
 # Fail installation if the GEOS shared library does not meet the minimum
 # version. We ship it with Shapely for Windows, so no need to check on
 # that platform.
-
 geos_version = None
-geos_config = GEOSConfig(os.environ.get('GEOS_CONFIG', 'geos-config'))
-
-if not os.environ.get('NO_GEOS_CHECK') or sys.platform == 'win32':
+if geos_config and not os.environ.get('NO_GEOS_CHECK') or sys.platform == 'win32':
     try:
         log.info(
             "Shapely >= 1.3 requires GEOS >= 3.3. "
@@ -174,13 +177,13 @@ with open('CHANGES.txt', 'r', **open_kwds) as fp:
 
 long_description = readme + '\n\n' + credits + '\n\n' + changes
 
-
 extra_reqs = {
     'test': ['pytest', 'pytest-cov', 'numpy>=1.4.1', 'packaging']
 }
 extra_reqs['all'] = list(it.chain.from_iterable(extra_reqs.values()))
 
-
+# Make a dict of setup arguments. Some items will be updated as
+# the script progresses.
 setup_args = dict(
     name                = 'Shapely',
     version             = str(shapely_version),
@@ -244,6 +247,16 @@ library_dirs = []
 libraries = []
 extra_link_args = []
 
+# If NO_GEOS_CONFIG is set in the environment, geos-config will not
+# be called and CFLAGS and LDFLAGS environment variables must be set
+# instead like
+#
+# CFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib -lgeos_c"
+#
+# Or, equivalently:
+#
+# CFLAGS="$(geos-config --cflags)" LDFLAGS="$(geos-config --clibs)"
+
 if geos_version and geos_config:
     # Collect other options from GEOS configuration.
     for item in geos_config.get('--cflags').split():

Shapely-1.6a2/shapely/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.6a2"

{Shapely-1.6a1 → Shapely-1.6a2}/shapely/ctypes_declarations.py

@@ -6,6 +6,8 @@ See header file: geos-x.y.z/capi/geos_c.h
 from ctypes import CFUNCTYPE, POINTER, c_void_p, c_char_p, \
     c_size_t, c_byte, c_uint, c_int, c_double, py_object
 
+from .errors import UnsupportedGEOSVersionError
+
 
 EXCEPTION_HANDLER_FUNCTYPE = CFUNCTYPE(None, c_char_p, c_void_p)
 
@@ -25,7 +27,8 @@ def prototype(lgeos, geos_version):
     """
 
     if not geos_version >= (3, 3, 0):
-        raise RuntimeError("Shapely requires GEOS version 3.3.0 or newer.")
+        raise UnsupportedGEOSVersionError(
+            "Shapely requires GEOS version 3.3.0 or newer.")
 
     # Initialization, cleanup, version.
 

Shapely-1.6a2/shapely/errors.py

@@ -0,0 +1,33 @@
+"""Shapely errors."""
+
+
+class ShapelyError(Exception):
+    """Base error class."""
+
+
+class UnsupportedGEOSVersionError(ShapelyError):
+    """Raised when the system's GEOS library version is unsupported."""
+
+
+class ReadingError(ShapelyError):
+    """A WKT or WKB reading error."""
+
+
+class WKBReadingError(ReadingError):
+    """A WKB reading error."""
+
+
+class WKTReadingError(ReadingError):
+    """A WKT reading error."""
+
+
+class DimensionError(ShapelyError):
+    """An error in the number of coordinate dimensions."""
+
+
+class TopologicalError(ShapelyError):
+    """A geometry is invalid or topologically incorrect."""
+
+
+class PredicateError(ShapelyError):
+    """A geometric predicate has failed to return True/False."""

{Shapely-1.6a1 → Shapely-1.6a2}/shapely/geometry/base.py

@@ -15,9 +15,10 @@ from warnings import warn
 
 from shapely.affinity import affine_transform
 from shapely.coords import CoordinateSequence
+from shapely.errors import WKBReadingError, WKTReadingError
 from shapely.ftools import wraps
 from shapely.geos import WKBWriter, WKTWriter
-from shapely.geos import lgeos, ReadingError
+from shapely.geos import lgeos
 from shapely.impl import DefaultImplementation, delegated
 
 
@@ -100,7 +101,7 @@ def geom_from_wkt(data):
         data = data.encode('ascii')
     geom = lgeos.GEOSGeomFromWKT(c_char_p(data))
     if not geom:
-        raise ReadingError(
+        raise WKTReadingError(
             "Could not create geometry because of errors while reading input.")
     return geom_factory(geom)
 
@@ -116,7 +117,7 @@ def geom_to_wkt(ob):
 def deserialize_wkb(data):
     geom = lgeos.GEOSGeomFromWKB_buf(c_char_p(data), c_size_t(len(data)))
     if not geom:
-        raise ReadingError(
+        raise WKBReadingError(
             "Could not create geometry because of errors while reading input.")
     return geom
 

{Shapely-1.6a1 → Shapely-1.6a2}/shapely/geometry/point.py

@@ -5,7 +5,8 @@ from ctypes import c_double
 from ctypes import cast, POINTER
 
 from shapely.coords import required
-from shapely.geos import lgeos, DimensionError
+from shapely.errors import DimensionError
+from shapely.geos import lgeos
 from shapely.geometry.base import BaseGeometry, geos_geom_from_py
 from shapely.geometry.proxy import CachingGeometryProxy
 

{Shapely-1.6a1 → Shapely-1.6a2}/shapely/geos.py

@@ -14,18 +14,12 @@ import sys
 import threading
 
 from .ctypes_declarations import prototype, EXCEPTION_HANDLER_FUNCTYPE
+from .errors import WKBReadingError, WKTReadingError, TopologicalError, PredicateError
 from . import ftools
 
 
 # Add message handler to this module's logger
 LOG = logging.getLogger(__name__)
-ch = logging.StreamHandler()
-LOG.addHandler(ch)
-
-if 'all' in sys.warnoptions:
-    # show GEOS messages in console with: python -W all
-    LOG.setLevel(logging.DEBUG)
-
 
 # Find and load the GEOS and C libraries
 # If this ever gets any longer, we'll break it into separate modules
@@ -72,8 +66,13 @@ if sys.platform.startswith('linux'):
         _lgeos = CDLL(geos_whl_so[0])
         LOG.debug("Found GEOS DLL: %r, using it.", _lgeos)
     else:
-        _lgeos = load_dll(
-            'geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
+        alt_paths = [
+            'libgeos_c.so.1',
+            'libgeos_c.so',
+            # anaconda
+            os.path.join(sys.prefix, "lib", "libgeos_c.so"),
+        ]
+        _lgeos = load_dll('geos_c', fallbacks=alt_paths)
     free = load_dll('c').free
     free.argtypes = [c_void_p]
     free.restype = None
@@ -102,6 +101,8 @@ elif sys.platform == 'darwin':
                         os.path.join(sys._MEIPASS, 'libgeos_c.1.dylib'))
         else:
             alt_paths = [
+                # anaconda
+                os.path.join(sys.prefix, "lib", "libgeos_c.dylib"),
                 # The Framework build from Kyng Chaos
                 "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
                 # macports
@@ -119,13 +120,15 @@ elif sys.platform == 'win32':
             os.path.join(os.path.dirname(__file__), 'DLLs'))
         if hasattr(sys, "frozen"):
             wininst_dlls = os.path.normpath(
-                os.path.abspath(sys.executable+'../../DLLS'))
+                os.path.abspath(sys.executable + '../../DLLS'))
         else:
             wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs")
         original_path = os.environ['PATH']
         os.environ['PATH'] = "%s;%s;%s" % \
             (egg_dlls, wininst_dlls, original_path)
-        _lgeos = CDLL("geos_c.dll")
+        _lgeos = load_dll("geos_c.dll", fallbacks=[
+            os.path.join(sys.prefix, "Library", "lib", "geos_c.dll"),
+        ])
     except (ImportError, WindowsError, OSError):
         raise
 
@@ -199,24 +202,6 @@ if geos_version >= (3, 1, 0):
         [EXCEPTION_HANDLER_FUNCTYPE, EXCEPTION_HANDLER_FUNCTYPE]
     _lgeos.finishGEOS_r.argtypes = [c_void_p]
 
-# Exceptions
-
-
-class ReadingError(Exception):
-    pass
-
-
-class DimensionError(Exception):
-    pass
-
-
-class TopologicalError(Exception):
-    pass
-
-
-class PredicateError(Exception):
-    pass
-
 
 def handler(level):
     """Error handler
@@ -275,8 +260,9 @@ class WKTReader(object):
             text = text.encode('ascii')
         geom = self._lgeos.GEOSWKTReader_read(self._reader, c_char_p(text))
         if not geom:
-            raise ReadingError("Could not create geometry because of errors "
-                               "while reading input.")
+            raise WKTReadingError(
+                "Could not create geometry because of errors "
+                "while reading input.")
         # avoid circular import dependency
         from shapely.geometry.base import geom_factory
         return geom_factory(geom)
@@ -415,8 +401,9 @@ class WKBReader(object):
         geom = self._lgeos.GEOSWKBReader_read(
             self._reader, c_char_p(data), c_size_t(len(data)))
         if not geom:
-            raise ReadingError("Could not create geometry because of errors "
-                               "while reading input.")
+            raise WKBReadingError(
+                "Could not create geometry because of errors "
+                "while reading input.")
         # avoid circular import dependency
         from shapely import geometry
         return geometry.base.geom_factory(geom)
@@ -428,8 +415,9 @@ class WKBReader(object):
         geom = self._lgeos.GEOSWKBReader_readHEX(
             self._reader, c_char_p(data), c_size_t(len(data)))
         if not geom:
-            raise ReadingError("Could not create geometry because of errors "
-                               "while reading input.")
+            raise WKBReadingError(
+                "Could not create geometry because of errors "
+                "while reading input.")
         # avoid circular import dependency
         from shapely import geometry
         return geometry.base.geom_factory(geom)