shapely 1.6b2__tar.gz → 1.6b4__tar.gz

{Shapely-1.6b2 → Shapely-1.6b4}/CHANGES.txt

@@ -1,6 +1,23 @@
 Changes
 =======
 
+1.6b4 (2017-02-15)
+------------------
+
+Bug fixes:
+
+- Isolate vendorized packaging in a _vendor directory, remove obsolete
+  dist-info, and remove packaging from project requirements (resolves #468).
+
+1.6b3 (2016-12-31)
+------------------
+
+Bug fixes:
+
+- Level for log messages originating from the GEOS notice handler reduced from
+  WARNING to INFO (#447).
+- Permit speedups to be imported again without Numpy (#444).
+
 1.6b2 (2016-12-12)
 ------------------
 

{Shapely-1.6b2/Shapely.egg-info → Shapely-1.6b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6b2
+Version: 1.6b4
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -239,6 +239,23 @@ Description: =======
         Changes
         =======
         
+        1.6b4 (2017-02-15)
+        ------------------
+        
+        Bug fixes:
+        
+        - Isolate vendorized packaging in a _vendor directory, remove obsolete
+          dist-info, and remove packaging from project requirements (resolves #468).
+        
+        1.6b3 (2016-12-31)
+        ------------------
+        
+        Bug fixes:
+        
+        - Level for log messages originating from the GEOS notice handler reduced from
+          WARNING to INFO (#447).
+        - Permit speedups to be imported again without Numpy (#444).
+        
         1.6b2 (2016-12-12)
         ------------------
         

{Shapely-1.6b2 → Shapely-1.6b4/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6b2
+Version: 1.6b4
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -239,6 +239,23 @@ Description: =======
         Changes
         =======
         
+        1.6b4 (2017-02-15)
+        ------------------
+        
+        Bug fixes:
+        
+        - Isolate vendorized packaging in a _vendor directory, remove obsolete
+          dist-info, and remove packaging from project requirements (resolves #468).
+        
+        1.6b3 (2016-12-31)
+        ------------------
+        
+        Bug fixes:
+        
+        - Level for log messages originating from the GEOS notice handler reduced from
+          WARNING to INFO (#447).
+        - Permit speedups to be imported again without Numpy (#444).
+        
         1.6b2 (2016-12-12)
         ------------------
         

{Shapely-1.6b2 → Shapely-1.6b4}/Shapely.egg-info/SOURCES.txt

@@ -10,26 +10,20 @@ Shapely.egg-info/SOURCES.txt
 Shapely.egg-info/dependency_links.txt
 Shapely.egg-info/requires.txt
 Shapely.egg-info/top_level.txt
+_vendor/__init__.py
+_vendor/packaging/__about__.py
+_vendor/packaging/__init__.py
+_vendor/packaging/_compat.py
+_vendor/packaging/_structures.py
+_vendor/packaging/markers.py
+_vendor/packaging/requirements.py
+_vendor/packaging/specifiers.py
+_vendor/packaging/utils.py
+_vendor/packaging/version.py
 docs/design.rst
 docs/index.rst
 docs/manual.rst
 docs/project.rst
-packaging/__about__.py
-packaging/__init__.py
-packaging/_compat.py
-packaging/_structures.py
-packaging/markers.py
-packaging/requirements.py
-packaging/specifiers.py
-packaging/utils.py
-packaging/version.py
-packaging-15.3.dist-info/DESCRIPTION.rst
-packaging-15.3.dist-info/METADATA
-packaging-15.3.dist-info/RECORD
-packaging-15.3.dist-info/WHEEL
-packaging-15.3.dist-info/metadata.json
-packaging-15.3.dist-info/pbr.json
-packaging-15.3.dist-info/top_level.txt
 shapely/__init__.py
 shapely/_buildcfg.py
 shapely/_geos.pxi

{Shapely-1.6b2 → Shapely-1.6b4}/Shapely.egg-info/requires.txt

@@ -2,13 +2,11 @@
 [all]
 pytest
 pytest-cov
-packaging
 numpy
 
 [test]
 pytest
 pytest-cov
-packaging
 
 [vectorized]
 numpy

Shapely-1.6b4/VERSION.txt

@@ -0,0 +1 @@
+1.6b4

Shapely-1.6b4/setup.cfg

@@ -0,0 +1,11 @@
+[tool:pytest]
+testpaths = tests
+addopts = --ignore _vendor
+
+[bdist_wheel]
+universal = 1
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

{Shapely-1.6b2 → Shapely-1.6b4}/setup.py

@@ -73,7 +73,7 @@ except ImportError:
 from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
 
-from packaging.version import Version
+from _vendor.packaging.version import Version
 
 # Get geos_version from GEOS dynamic library, which depends on
 # GEOS_LIBRARY_PATH and/or GEOS_CONFIG environment variables
@@ -178,7 +178,7 @@ with open('CHANGES.txt', 'r', **open_kwds) as fp:
 long_description = readme + '\n\n' + credits + '\n\n' + changes
 
 extra_reqs = {
-    'test': ['pytest', 'pytest-cov', 'packaging'],
+    'test': ['pytest', 'pytest-cov'],
     'vectorized': ['numpy']}
 
 extra_reqs['all'] = list(it.chain.from_iterable(extra_reqs.values()))

Shapely-1.6b4/shapely/__init__.py

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

{Shapely-1.6b2 → Shapely-1.6b4}/shapely/geos.py

@@ -203,35 +203,25 @@ if geos_version >= (3, 1, 0):
     _lgeos.finishGEOS_r.argtypes = [c_void_p]
 
 
-def handler(level):
-    """Error handler
-
-    While this function can take any number of positional arguments when
-    called from Python and GEOS expects its error handler to accept any
-    number of arguments (like printf), I'm unable to get ctypes to make
-    a callback object from this function that will accept any number of
-    arguments.
-
-    At the moment, functions in the GEOS C API only pass 0 or
-    1 arguments to the error handler. We can deal with this, but when if
-    that changes, Shapely may break.
+def make_logging_callback(func):
+    """Error or notice handler callback producr
+
+    Wraps a logger method, func, as a GEOS callback.
     """
-    def callback(fmt, *args):
+    def callback(fmt, *fmt_args):
         fmt = fmt.decode('ascii')
         conversions = re.findall(r'%.', fmt)
-        log_vals = []
-        for spec, arg in zip(conversions, args):
-            if spec == '%s' and arg is not None:
-                log_vals.append(string_at(arg).decode('ascii'))
-            else:
-                LOG.error("An error occurred, but the format string "
-                          "'%s' could not be converted.", fmt)
-                return
-        getattr(LOG, level)(fmt, *log_vals)
+        args = [
+            string_at(arg).decode('ascii')
+            for spec, arg in zip(conversions, fmt_args)
+            if spec == '%s' and arg is not None]
+
+        func(fmt, *args)
+
     return callback
 
-error_handler = handler('error')
-notice_handler = handler('warning')
+error_handler = make_logging_callback(LOG.error)
+notice_handler = make_logging_callback(LOG.info)
 
 error_h = EXCEPTION_HANDLER_FUNCTYPE(error_handler)
 notice_h = EXCEPTION_HANDLER_FUNCTYPE(notice_handler)

{Shapely-1.6b2 → Shapely-1.6b4}/shapely/ops.py

@@ -406,11 +406,11 @@ class SplitOp(object):
 
         assert(isinstance(line, LineString))
         assert(isinstance(splitter, MultiPoint))
-        
+
         chunks = [line]
         for pt in splitter.geoms:
             new_chunks = []
-            for chunk in chunks:
+            for chunk in filter(lambda x: not x.is_empty, chunks):
                 # add the newly split 2 lines or the same line if not split
                 new_chunks.extend(SplitOp._split_line_with_point(chunk, pt))
             chunks = new_chunks

{Shapely-1.6b2 → Shapely-1.6b4}/shapely/speedups/__init__.py

@@ -4,6 +4,9 @@ from shapely.geometry import linestring, polygon
 from shapely import coords
 import shapely.affinity
 
+from ..ftools import wraps
+
+
 try:
     from shapely.speedups import _speedups
     available = True
@@ -14,7 +17,7 @@ except ImportError:
     # TODO: This does not appear to do anything useful
     import_error_msg = sys.exc_info()[1]
 
-from ..ftools import wraps
+
 def method_wrapper(f):
     def wrapper(*args, **kwargs):
         return f(*args, **kwargs)
@@ -26,6 +29,7 @@ _orig = {}
 # keep track of whether speedups are enabled
 enabled = False
 
+
 def enable():
     """Enable Cython speedups
 
@@ -46,23 +50,25 @@ def enable():
     if not available:
         warnings.warn("shapely.speedups not available", RuntimeWarning)
         return
-    
+
     if _orig:
         return
-    
+
     _orig['CoordinateSequence.ctypes'] = coords.CoordinateSequence.ctypes
     coords.CoordinateSequence.ctypes = property(_speedups.coordseq_ctypes)
-    
+
     _orig['CoordinateSequence.__iter__'] = coords.CoordinateSequence.__iter__
-    coords.CoordinateSequence.__iter__ = method_wrapper(_speedups.coordseq_iter)
+    coords.CoordinateSequence.__iter__ = method_wrapper(
+        _speedups.coordseq_iter)
 
     _orig['geos_linestring_from_py'] = linestring.geos_linestring_from_py
     linestring.geos_linestring_from_py = _speedups.geos_linestring_from_py
 
-    _orig['geos_linearring_from_py']  = polygon.geos_linearring_from_py
+    _orig['geos_linearring_from_py'] = polygon.geos_linearring_from_py
     polygon.geos_linearring_from_py = _speedups.geos_linearring_from_py
-    
+
     _orig['affine_transform'] = shapely.affinity.affine_transform
+
     # copy docstring from original function
     def affine_transform(geom, matrix):
         return _speedups.affine_transform(geom, matrix)
@@ -72,6 +78,7 @@ def enable():
     global enabled
     enabled = True
 
+
 def disable():
     """Disable Cython speedups
     """