shapely 1.6a2__tar.gz → 1.6b2__tar.gz

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

@@ -1,6 +1,31 @@
 Changes
 =======
 
+1.6b2 (2016-12-12)
+------------------
+
+New features:
+
+- Add support for GeometryCollection to shape and asShape functions (#422).
+
+1.6b1 (2016-12-12)
+------------------
+
+Bug fixes:
+
+- Implemented __array_interface__ for empty Points and LineStrings (#403).
+
+1.6a3 (2016-12-01)
+------------------
+
+Bug fixes:
+
+- Remove accidental hard requirement of Numpy (#431).
+
+Packaging:
+
+- Put Numpy in an optional requirement set named "vectorized" (#431).
+
 1.6a2 (2016-11-09)
 ------------------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6a2
+Version: 1.6b2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -10,17 +10,17 @@ Description: =======
         Shapely
         =======
         
-        Manipulation and analysis of geometric objects in the Cartesian plane.
-        
         .. 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
         
-        .. image:: http://farm3.staticflickr.com/2738/4511827859_b5822043b7_o_d.png
+        Manipulation and analysis of geometric objects in the Cartesian plane.
+        
+        .. image:: https://c2.staticflickr.com/6/5560/31301790086_b3472ea4e9_c.jpg
            :width: 800
-           :height: 400
+           :height: 378
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
         planar geometric objects. It is based on the widely deployed `GEOS
@@ -36,48 +36,64 @@ Description: =======
         Requirements
         ============
         
-        Shapely 1.5.x requires
+        Shapely 1.6.x requires
         
         * Python >=2.6 (including Python 3.x)
-        * GEOS >=3.3 (Shapely 1.2.x requires only GEOS 3.1 but YMMV)
+        * GEOS >=3.3 
         
-        Installing Shapely
-        ==================
+        Installing Shapely (1.6b2)
+        ==========================
         
-        Windows users should download an executable installer from
-        http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely or PyPI (if available).
+        Windows users have two good installation options: the wheels at
+        http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely and the 
+        Anaconda platform's [conda-forge](https://conda-forge.github.io/)
+        channel.
         
-        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 from the Python package index.
+        OS X users can get Shapely wheels with GEOS included from the 
+        Python Package Index with a recent version of pip (8+):
         
         .. code-block:: console
         
-            $ pip install shapely
+            $ pip install shapely==1.6b2
         
-        If you've installed GEOS to a non-standard location, the geos-config program
-        will be used to get compiler and linker options. If it is not on the PATH,
-        it can be specified with a GEOS_CONFIG environment variable, e.g.:
+        A few extra speedups that require Numpy can be had by running
         
         .. code-block:: console
         
-            $ GEOS_CONFIG=/path/to/geos-config pip install shapely
+            $ 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)
+        you may ignore the binary wheels.
+        
+        .. code-block:: console
         
-        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.
+            $ pip install shapely --no-binary shapely
+        
+        Binary wheels are also available for Linux. To get them, use `pip shapely
+        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
+        `apt-get install libgeos-dev` on Debian/Ubuntu) and install Shapely
+        from the Python package index.
         
         .. code-block:: console
         
-            $ pip install shapely<1.3
+            $ pip install shapely
         
-        Or, if you're using pip 6+
+        If you've installed GEOS to a standard location, the geos-config program
+        will be used to get compiler and linker options. If geos-config is not on
+        your executable, it can be specified with a GEOS_CONFIG environment
+        variable, e.g.:
         
         .. code-block:: console
         
-            $ pip install shapely~=1.2
+            $ 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
         =====
@@ -141,22 +157,14 @@ Description: =======
         
         .. code-block:: console
         
-            (env)$ py.test tests
-        
-        Roadmap and Maintenance
-        =======================
-        
-        Shapely 1.2.x is a maintenance-only branch which supports Python 2.4-2.6, but
-        not Python 3+. There will be no new features in Shapely 1.2.x and only fixes
-        for major bugs.
-        
-        Shapely 1.4.x is a maintenance-only branch supporting Pythons 2.7 and 3.3+.
+            (env)$ python -m pytest
         
         Support
         =======
         
-        Please discuss Shapely with us at
-        http://lists.gispython.org/mailman/listinfo/community.
+        Questions about using Shapely may be asked on the `GIS StackExchange 
+        <http://gis.stackexchange.com/questions/tagged/shapely>`__ using the "shapely"
+        tag.
         
         Bugs may be reported at https://github.com/Toblerity/Shapely/issues.
         
@@ -231,6 +239,31 @@ Description: =======
         Changes
         =======
         
+        1.6b2 (2016-12-12)
+        ------------------
+        
+        New features:
+        
+        - Add support for GeometryCollection to shape and asShape functions (#422).
+        
+        1.6b1 (2016-12-12)
+        ------------------
+        
+        Bug fixes:
+        
+        - Implemented __array_interface__ for empty Points and LineStrings (#403).
+        
+        1.6a3 (2016-12-01)
+        ------------------
+        
+        Bug fixes:
+        
+        - Remove accidental hard requirement of Numpy (#431).
+        
+        Packaging:
+        
+        - Put Numpy in an optional requirement set named "vectorized" (#431).
+        
         1.6a2 (2016-11-09)
         ------------------
         

{Shapely-1.6a2 → Shapely-1.6b2}/README.rst

@@ -2,17 +2,17 @@
 Shapely
 =======
 
-Manipulation and analysis of geometric objects in the Cartesian plane.
-
 .. 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
 
-.. image:: http://farm3.staticflickr.com/2738/4511827859_b5822043b7_o_d.png
+Manipulation and analysis of geometric objects in the Cartesian plane.
+
+.. image:: https://c2.staticflickr.com/6/5560/31301790086_b3472ea4e9_c.jpg
    :width: 800
-   :height: 400
+   :height: 378
 
 Shapely is a BSD-licensed Python package for manipulation and analysis of
 planar geometric objects. It is based on the widely deployed `GEOS
@@ -28,48 +28,64 @@ but can be readily integrated with packages that are. For more details, see:
 Requirements
 ============
 
-Shapely 1.5.x requires
+Shapely 1.6.x requires
 
 * Python >=2.6 (including Python 3.x)
-* GEOS >=3.3 (Shapely 1.2.x requires only GEOS 3.1 but YMMV)
+* GEOS >=3.3 
 
-Installing Shapely
-==================
+Installing Shapely (1.6b2)
+==========================
 
-Windows users should download an executable installer from
-http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely or PyPI (if available).
+Windows users have two good installation options: the wheels at
+http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely and the 
+Anaconda platform's [conda-forge](https://conda-forge.github.io/)
+channel.
 
-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 from the Python package index.
+OS X users can get Shapely wheels with GEOS included from the 
+Python Package Index with a recent version of pip (8+):
 
 .. code-block:: console
 
-    $ pip install shapely
+    $ pip install shapely==1.6b2
 
-If you've installed GEOS to a non-standard location, the geos-config program
-will be used to get compiler and linker options. If it is not on the PATH,
-it can be specified with a GEOS_CONFIG environment variable, e.g.:
+A few extra speedups that require Numpy can be had by running
 
 .. code-block:: console
 
-    $ GEOS_CONFIG=/path/to/geos-config pip install shapely
+    $ pip install shapely[vectorized]==1.6b2
 
-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.
+If you want to build Shapely from source for compatibility with
+other modules that depend on GEOS (such as cartopy or osgeo.ogr)
+you may ignore the binary wheels.
 
 .. code-block:: console
 
-    $ pip install shapely<1.3
+    $ pip install shapely --no-binary shapely
+
+Binary wheels are also available for Linux. To get them, use `pip shapely
+shapely==1.6b2`. To avoid them, use `pip install shapely --no-binary
+shapely==1.6b2`.
 
-Or, if you're using pip 6+
+In other situations, install `geos_c` libs and headers by any means 
+(for example, `brew install geos` on OS X or
+`apt-get install libgeos-dev` on Debian/Ubuntu) and install Shapely
+from the Python package index.
 
 .. code-block:: console
 
-    $ pip install shapely~=1.2
+    $ pip install shapely
 
-Shapely is also provided by popular Python distributions like Canopy (Enthought)
-and Anaconda (Continuum Analytics).
+If you've installed GEOS to a standard location, the geos-config program
+will be used to get compiler and linker options. If geos-config is not on
+your executable, it can be specified with a GEOS_CONFIG environment
+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).
 
 Usage
 =====
@@ -133,21 +149,13 @@ We use py.test to run Shapely's suite of unittests and doctests.
 
 .. code-block:: console
 
-    (env)$ py.test tests
-
-Roadmap and Maintenance
-=======================
-
-Shapely 1.2.x is a maintenance-only branch which supports Python 2.4-2.6, but
-not Python 3+. There will be no new features in Shapely 1.2.x and only fixes
-for major bugs.
-
-Shapely 1.4.x is a maintenance-only branch supporting Pythons 2.7 and 3.3+.
+    (env)$ python -m pytest
 
 Support
 =======
 
-Please discuss Shapely with us at
-http://lists.gispython.org/mailman/listinfo/community.
+Questions about using Shapely may be asked on the `GIS StackExchange 
+<http://gis.stackexchange.com/questions/tagged/shapely>`__ using the "shapely"
+tag.
 
 Bugs may be reported at https://github.com/Toblerity/Shapely/issues.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.6a2
+Version: 1.6b2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -10,17 +10,17 @@ Description: =======
         Shapely
         =======
         
-        Manipulation and analysis of geometric objects in the Cartesian plane.
-        
         .. 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
         
-        .. image:: http://farm3.staticflickr.com/2738/4511827859_b5822043b7_o_d.png
+        Manipulation and analysis of geometric objects in the Cartesian plane.
+        
+        .. image:: https://c2.staticflickr.com/6/5560/31301790086_b3472ea4e9_c.jpg
            :width: 800
-           :height: 400
+           :height: 378
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
         planar geometric objects. It is based on the widely deployed `GEOS
@@ -36,48 +36,64 @@ Description: =======
         Requirements
         ============
         
-        Shapely 1.5.x requires
+        Shapely 1.6.x requires
         
         * Python >=2.6 (including Python 3.x)
-        * GEOS >=3.3 (Shapely 1.2.x requires only GEOS 3.1 but YMMV)
+        * GEOS >=3.3 
         
-        Installing Shapely
-        ==================
+        Installing Shapely (1.6b2)
+        ==========================
         
-        Windows users should download an executable installer from
-        http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely or PyPI (if available).
+        Windows users have two good installation options: the wheels at
+        http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely and the 
+        Anaconda platform's [conda-forge](https://conda-forge.github.io/)
+        channel.
         
-        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 from the Python package index.
+        OS X users can get Shapely wheels with GEOS included from the 
+        Python Package Index with a recent version of pip (8+):
         
         .. code-block:: console
         
-            $ pip install shapely
+            $ pip install shapely==1.6b2
         
-        If you've installed GEOS to a non-standard location, the geos-config program
-        will be used to get compiler and linker options. If it is not on the PATH,
-        it can be specified with a GEOS_CONFIG environment variable, e.g.:
+        A few extra speedups that require Numpy can be had by running
         
         .. code-block:: console
         
-            $ GEOS_CONFIG=/path/to/geos-config pip install shapely
+            $ 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)
+        you may ignore the binary wheels.
+        
+        .. code-block:: console
         
-        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.
+            $ pip install shapely --no-binary shapely
+        
+        Binary wheels are also available for Linux. To get them, use `pip shapely
+        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
+        `apt-get install libgeos-dev` on Debian/Ubuntu) and install Shapely
+        from the Python package index.
         
         .. code-block:: console
         
-            $ pip install shapely<1.3
+            $ pip install shapely
         
-        Or, if you're using pip 6+
+        If you've installed GEOS to a standard location, the geos-config program
+        will be used to get compiler and linker options. If geos-config is not on
+        your executable, it can be specified with a GEOS_CONFIG environment
+        variable, e.g.:
         
         .. code-block:: console
         
-            $ pip install shapely~=1.2
+            $ 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
         =====
@@ -141,22 +157,14 @@ Description: =======
         
         .. code-block:: console
         
-            (env)$ py.test tests
-        
-        Roadmap and Maintenance
-        =======================
-        
-        Shapely 1.2.x is a maintenance-only branch which supports Python 2.4-2.6, but
-        not Python 3+. There will be no new features in Shapely 1.2.x and only fixes
-        for major bugs.
-        
-        Shapely 1.4.x is a maintenance-only branch supporting Pythons 2.7 and 3.3+.
+            (env)$ python -m pytest
         
         Support
         =======
         
-        Please discuss Shapely with us at
-        http://lists.gispython.org/mailman/listinfo/community.
+        Questions about using Shapely may be asked on the `GIS StackExchange 
+        <http://gis.stackexchange.com/questions/tagged/shapely>`__ using the "shapely"
+        tag.
         
         Bugs may be reported at https://github.com/Toblerity/Shapely/issues.
         
@@ -231,6 +239,31 @@ Description: =======
         Changes
         =======
         
+        1.6b2 (2016-12-12)
+        ------------------
+        
+        New features:
+        
+        - Add support for GeometryCollection to shape and asShape functions (#422).
+        
+        1.6b1 (2016-12-12)
+        ------------------
+        
+        Bug fixes:
+        
+        - Implemented __array_interface__ for empty Points and LineStrings (#403).
+        
+        1.6a3 (2016-12-01)
+        ------------------
+        
+        Bug fixes:
+        
+        - Remove accidental hard requirement of Numpy (#431).
+        
+        Packaging:
+        
+        - Put Numpy in an optional requirement set named "vectorized" (#431).
+        
         1.6a2 (2016-11-09)
         ------------------
         

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

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

Shapely-1.6b2/VERSION.txt

@@ -0,0 +1 @@
+1.6b2

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

@@ -178,8 +178,9 @@ 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']
-}
+    'test': ['pytest', 'pytest-cov', 'packaging'],
+    'vectorized': ['numpy']}
+
 extra_reqs['all'] = list(it.chain.from_iterable(extra_reqs.values()))
 
 # Make a dict of setup arguments. Some items will be updated as
@@ -302,8 +303,8 @@ def construct_build_ext(build_ext):
                 build_ext.build_extension(self, ext)
             except ext_errors as x:
                 raise BuildFailed(x)
-    return WrappedBuildExt
 
+    return WrappedBuildExt
 
 if (hasattr(platform, 'python_implementation')
         and platform.python_implementation() == 'PyPy'):
@@ -311,7 +312,6 @@ if (hasattr(platform, 'python_implementation')
     ext_modules = []
     libraries = []
 
-
 if os.path.exists("MANIFEST.in"):
     pyx_file = "shapely/speedups/_speedups.pyx"
     c_file = "shapely/speedups/_speedups.c"
@@ -333,15 +333,9 @@ if os.path.exists("MANIFEST.in"):
         log.warn("speedup extension not found")
 
 ext_modules = [
-    Extension(
-        "shapely.speedups._speedups",
-        ["shapely/speedups/_speedups.c"],
-        include_dirs=include_dirs,
-        library_dirs=library_dirs,
-        libraries=libraries,
-        extra_link_args=extra_link_args,
-    ),
-]
+    Extension("shapely.speedups._speedups", ["shapely/speedups/_speedups.c"],
+        include_dirs=include_dirs, library_dirs=library_dirs,
+        libraries=libraries, extra_link_args=extra_link_args)]
 
 cmd_classes = setup_args.setdefault('cmdclass', {})
 
@@ -370,7 +364,6 @@ except ImportError:
     log.info("Numpy or Cython not available, shapely.vectorized submodule "
              "not being built.")
 
-
 try:
     # try building with speedups
     existing_build_ext = setup_args['cmdclass'].\

Shapely-1.6b2/shapely/__init__.py

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

{Shapely-1.6a2 → Shapely-1.6b2}/shapely/coords.py

@@ -11,27 +11,6 @@ from shapely.topology import Validating
 if sys.version_info[0] < 3:
     range = xrange
 
-try:
-    import numpy
-    has_numpy = True
-except ImportError:
-    has_numpy = False
-
-def required(ob):
-    """Return an object that meets Shapely requirements for self-owned
-    C-continguous data, copying if necessary, or just return the original
-    object."""
-    if hasattr(ob, '__array_interface__'):
-        if ob.__array_interface__.get('strides') and not has_numpy:
-            # raise an error if strided. See issue #52.
-            raise ValueError("C-contiguous data is required")
-        else:
-            # numpy.require will just return (ob) if it is already
-            # float64 and well-behaved.
-            return numpy.require(ob, numpy.float64, ["C", "OWNDATA"])
-    else:
-        return ob
-
 
 class CoordinateSequence(object):
     """

{Shapely-1.6a2 → Shapely-1.6b2}/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)