shapely 1.6b1__tar.gz → 1.6b3__tar.gz

{Shapely-1.6b1 → Shapely-1.6b3}/CHANGES.txt

@@ -1,6 +1,22 @@
 Changes
 =======
 
+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)
+------------------
+
+New features:
+
+- Add support for GeometryCollection to shape and asShape functions (#422).
+
 1.6b1 (2016-12-12)
 ------------------
 

{Shapely-1.6b1/Shapely.egg-info → Shapely-1.6b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6b1
+Version: 1.6b3
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -13,6 +13,7 @@ Description: =======
         .. image:: https://travis-ci.org/Toblerity/Shapely.png?branch=master
            :target: https://travis-ci.org/Toblerity/Shapely
         
+        .. image:: https://coveralls.io/repos/github/Toblerity/Shapely/badge.svg?branch=master
            :target: https://coveralls.io/github/Toblerity/Shapely?branch=master
         
         Manipulation and analysis of geometric objects in the Cartesian plane.
@@ -40,7 +41,7 @@ Description: =======
         * Python >=2.6 (including Python 3.x)
         * GEOS >=3.3 
         
-        Installing Shapely (1.6b1)
+        Installing Shapely (1.6b2)
         ==========================
         
         Windows users have two good installation options: the wheels at
@@ -53,13 +54,13 @@ Description: =======
         
         .. code-block:: console
         
-            $ pip install shapely==1.6b1
+            $ pip install shapely==1.6b2
         
         A few extra speedups that require Numpy can be had by running
         
         .. code-block:: console
         
-            $ pip install shapely[vectorized]==1.6b1
+            $ pip install shapely[vectorized]==1.6b2
         
         If you want to build Shapely from source for compatibility with
         other modules that depend on GEOS (such as cartopy or osgeo.ogr)
@@ -70,8 +71,8 @@ Description: =======
             $ pip install shapely --no-binary shapely
         
         Binary wheels are also available for Linux. To get them, use `pip shapely
-        shapely==1.6b1`. To avoid them, use `pip install shapely --no-binary
-        shapely==1.6b1`.
+        shapely==1.6b2`. To avoid them, use `pip install shapely --no-binary
+        shapely==1.6b2`.
         
         In other situations, install `geos_c` libs and headers by any means 
         (for example, `brew install geos` on OS X or
@@ -90,8 +91,9 @@ Description: =======
         .. code-block:: console
         
             $ GEOS_CONFIG=/path/to/geos-config pip install shapely
-        Shapely is also provided by popular Python distributions like Canopy (Enthought)
-        and Anaconda (Continuum Analytics).
+        
+        Shapely is also provided by popular Python distributions like Canopy
+        (Enthought) and Anaconda (Continuum Analytics).
         
         Usage
         =====
@@ -237,6 +239,22 @@ Description: =======
         Changes
         =======
         
+        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)
+        ------------------
+        
+        New features:
+        
+        - Add support for GeometryCollection to shape and asShape functions (#422).
+        
         1.6b1 (2016-12-12)
         ------------------
         

{Shapely-1.6b1 → Shapely-1.6b3}/README.rst

@@ -5,6 +5,7 @@ Shapely
 .. image:: https://travis-ci.org/Toblerity/Shapely.png?branch=master
    :target: https://travis-ci.org/Toblerity/Shapely
 
+.. image:: https://coveralls.io/repos/github/Toblerity/Shapely/badge.svg?branch=master
    :target: https://coveralls.io/github/Toblerity/Shapely?branch=master
 
 Manipulation and analysis of geometric objects in the Cartesian plane.
@@ -32,7 +33,7 @@ Shapely 1.6.x requires
 * Python >=2.6 (including Python 3.x)
 * GEOS >=3.3 
 
-Installing Shapely (1.6b1)
+Installing Shapely (1.6b2)
 ==========================
 
 Windows users have two good installation options: the wheels at
@@ -45,13 +46,13 @@ Python Package Index with a recent version of pip (8+):
 
 .. code-block:: console
 
-    $ pip install shapely==1.6b1
+    $ pip install shapely==1.6b2
 
 A few extra speedups that require Numpy can be had by running
 
 .. code-block:: console
 
-    $ pip install shapely[vectorized]==1.6b1
+    $ pip install shapely[vectorized]==1.6b2
 
 If you want to build Shapely from source for compatibility with
 other modules that depend on GEOS (such as cartopy or osgeo.ogr)
@@ -62,8 +63,8 @@ you may ignore the binary wheels.
     $ pip install shapely --no-binary shapely
 
 Binary wheels are also available for Linux. To get them, use `pip shapely
-shapely==1.6b1`. To avoid them, use `pip install shapely --no-binary
-shapely==1.6b1`.
+shapely==1.6b2`. To avoid them, use `pip install shapely --no-binary
+shapely==1.6b2`.
 
 In other situations, install `geos_c` libs and headers by any means 
 (for example, `brew install geos` on OS X or
@@ -82,8 +83,9 @@ variable, e.g.:
 .. code-block:: console
 
     $ GEOS_CONFIG=/path/to/geos-config pip install shapely
-Shapely is also provided by popular Python distributions like Canopy (Enthought)
-and Anaconda (Continuum Analytics).
+
+Shapely is also provided by popular Python distributions like Canopy
+(Enthought) and Anaconda (Continuum Analytics).
 
 Usage
 =====

{Shapely-1.6b1 → Shapely-1.6b3/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6b1
+Version: 1.6b3
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -13,6 +13,7 @@ Description: =======
         .. image:: https://travis-ci.org/Toblerity/Shapely.png?branch=master
            :target: https://travis-ci.org/Toblerity/Shapely
         
+        .. image:: https://coveralls.io/repos/github/Toblerity/Shapely/badge.svg?branch=master
            :target: https://coveralls.io/github/Toblerity/Shapely?branch=master
         
         Manipulation and analysis of geometric objects in the Cartesian plane.
@@ -40,7 +41,7 @@ Description: =======
         * Python >=2.6 (including Python 3.x)
         * GEOS >=3.3 
         
-        Installing Shapely (1.6b1)
+        Installing Shapely (1.6b2)
         ==========================
         
         Windows users have two good installation options: the wheels at
@@ -53,13 +54,13 @@ Description: =======
         
         .. code-block:: console
         
-            $ pip install shapely==1.6b1
+            $ pip install shapely==1.6b2
         
         A few extra speedups that require Numpy can be had by running
         
         .. code-block:: console
         
-            $ pip install shapely[vectorized]==1.6b1
+            $ pip install shapely[vectorized]==1.6b2
         
         If you want to build Shapely from source for compatibility with
         other modules that depend on GEOS (such as cartopy or osgeo.ogr)
@@ -70,8 +71,8 @@ Description: =======
             $ pip install shapely --no-binary shapely
         
         Binary wheels are also available for Linux. To get them, use `pip shapely
-        shapely==1.6b1`. To avoid them, use `pip install shapely --no-binary
-        shapely==1.6b1`.
+        shapely==1.6b2`. To avoid them, use `pip install shapely --no-binary
+        shapely==1.6b2`.
         
         In other situations, install `geos_c` libs and headers by any means 
         (for example, `brew install geos` on OS X or
@@ -90,8 +91,9 @@ Description: =======
         .. code-block:: console
         
             $ GEOS_CONFIG=/path/to/geos-config pip install shapely
-        Shapely is also provided by popular Python distributions like Canopy (Enthought)
-        and Anaconda (Continuum Analytics).
+        
+        Shapely is also provided by popular Python distributions like Canopy
+        (Enthought) and Anaconda (Continuum Analytics).
         
         Usage
         =====
@@ -237,6 +239,22 @@ Description: =======
         Changes
         =======
         
+        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)
+        ------------------
+        
+        New features:
+        
+        - Add support for GeometryCollection to shape and asShape functions (#422).
+        
         1.6b1 (2016-12-12)
         ------------------
         

Shapely-1.6b3/VERSION.txt

@@ -0,0 +1 @@
+1.6b3

{Shapely-1.6b1 → Shapely-1.6b3}/setup.cfg

@@ -1,8 +1,8 @@
-[pytest]
+[tool:pytest]
 testpaths = tests
 
 [egg_info]
 tag_build = 
-tag_svn_revision = 0
 tag_date = 0
+tag_svn_revision = 0
 

Shapely-1.6b3/shapely/__init__.py

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

{Shapely-1.6b1 → Shapely-1.6b3}/shapely/geometry/geo.py

@@ -8,6 +8,7 @@ from .polygon import Polygon, asPolygon
 from .multipoint import MultiPoint, asMultiPoint
 from .multilinestring import MultiLineString, asMultiLineString
 from .multipolygon import MultiPolygon, MultiPolygonAdapter
+from .collection import GeometryCollection
 
 
 def box(minx, miny, maxx, maxy, ccw=True):
@@ -38,6 +39,9 @@ def shape(context):
         return MultiLineString(ob["coordinates"])
     elif geom_type == "multipolygon":
         return MultiPolygon(ob["coordinates"], context_type='geojson')
+    elif geom_type == "geometrycollection":
+        geoms = [shape(g) for g in ob.get("geometries", [])]
+        return GeometryCollection(geoms)
     else:
         raise ValueError("Unknown geometry type: %s" % geom_type)
 
@@ -67,6 +71,9 @@ def asShape(context):
         return asMultiLineString(ob["coordinates"])
     elif geom_type == "multipolygon":
         return MultiPolygonAdapter(ob["coordinates"], context_type='geojson')
+    elif geom_type == "geometrycollection":
+        geoms = [asShape(g) for g in ob.get("geometries", [])]
+        return GeometryCollection(geoms)
     else:
         raise ValueError("Unknown geometry type: %s" % geom_type)
 

{Shapely-1.6b1 → Shapely-1.6b3}/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.6b1 → Shapely-1.6b3}/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
     """