shapely 1.2.14__tar.gz → 1.2.15__tar.gz

{Shapely-1.2.14 → Shapely-1.2.15}/CHANGES.txt

@@ -2,6 +2,15 @@
 Changes
 =======
 
+1.2.15 (2012-)
+--------------
+- Eliminate numerical sensitivity in a method chaining test (Debian bug
+  #663210).
+- Account for cascaded union of random buffered test points being a polygon
+  or multipolygon (Debian bug #666655).
+- Use Cython to build speedups if it is installed.
+- Avoid stumbling over SVN revision numbers in GEOS C API version strings.
+
 1.2.14 (2012-01-23)
 -------------------
 - A geometry's coords property is now sliceable, yielding a list of coordinate

{Shapely-1.2.14/Shapely.egg-info → Shapely-1.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.14
+Version: 1.2.15
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/sgillies/shapely
 Author: Sean Gillies
@@ -162,6 +162,15 @@ Description: ======
         Changes
         =======
         
+        1.2.15 (2012-)
+        --------------
+        - Eliminate numerical sensitivity in a method chaining test (Debian bug
+        #663210).
+        - Account for cascaded union of random buffered test points being a polygon
+        or multipolygon (Debian bug #666655).
+        - Use Cython to build speedups if it is installed.
+        - Avoid stumbling over SVN revision numbers in GEOS C API version strings.
+        
         1.2.14 (2012-01-23)
         -------------------
         - A geometry's coords property is now sliceable, yielding a list of coordinate

{Shapely-1.2.14 → Shapely-1.2.15/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.14
+Version: 1.2.15
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/sgillies/shapely
 Author: Sean Gillies
@@ -162,6 +162,15 @@ Description: ======
         Changes
         =======
         
+        1.2.15 (2012-)
+        --------------
+        - Eliminate numerical sensitivity in a method chaining test (Debian bug
+        #663210).
+        - Account for cascaded union of random buffered test points being a polygon
+        or multipolygon (Debian bug #666655).
+        - Use Cython to build speedups if it is installed.
+        - Avoid stumbling over SVN revision numbers in GEOS C API version strings.
+        
         1.2.14 (2012-01-23)
         -------------------
         - A geometry's coords property is now sliceable, yielding a list of coordinate

{Shapely-1.2.14 → Shapely-1.2.15}/Shapely.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ CHANGES.txt
 CREDITS.txt
 LICENSE.txt
 README.rst
+VERSION.txt
 setup.cfg
 setup.py
 Shapely.egg-info/PKG-INFO
@@ -44,7 +45,6 @@ shapely/geometry/polygon.py
 shapely/geometry/proxy.py
 shapely/speedups/__init__.py
 shapely/speedups/_speedups.c
-shapely/speedups/_speedups.pyx
 shapely/tests/Array.txt
 shapely/tests/GeoInterface.txt
 shapely/tests/IterOps.txt
@@ -77,6 +77,7 @@ shapely/tests/test_geomseq.py
 shapely/tests/test_getitem.py
 shapely/tests/test_linear_referencing.py
 shapely/tests/test_mapping.py
+shapely/tests/test_ndarrays.py
 shapely/tests/test_prepared.py
 shapely/tests/test_products_z.py
 shapely/tests/test_singularity.py

Shapely-1.2.15/VERSION.txt

@@ -0,0 +1 @@
+1.2.15

{Shapely-1.2.14 → Shapely-1.2.15}/setup.py

@@ -1,4 +1,3 @@
-import glob
 import warnings
 
 try:
@@ -11,11 +10,23 @@ except:
 
 from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
+import glob
+import os
+import platform
 from setuptools.extension import Extension
-from setuptools.command.build_ext import build_ext
 from setuptools import setup, find_packages
+import subprocess
 import sys
-import platform
+
+# Parse the version from the shapely module
+for line in open('shapely/__init__.py', 'rb'):
+    if line.find("__version__") >= 0:
+        version = line.split("=")[1].strip()
+        version = version.strip('"')
+        version = version.strip("'")
+        continue
+
+open('VERSION.txt', 'wb').write(version)
 
 readme_text = open('README.rst', 'rb').read()
 
@@ -27,7 +38,7 @@ changes_text = f.read()
 setup_args = dict(
     metadata_version    = '1.2',
     name                = 'Shapely',
-    version             = '1.2.14',
+    version             = version,
     requires_python     = '>=2.5,<3',
     requires_external   = 'libgeos_c (>=3.1)', 
     description         = 'Geometric objects, predicates, and operations',
@@ -81,41 +92,53 @@ else:
 class BuildFailed(Exception):
     pass
 
-class ve_build_ext(build_ext):
-    # This class allows C extension building to fail.
-
-    def run(self):
-        try:
-            build_ext.run(self)
-        except DistutilsPlatformError, x:
-            raise BuildFailed(x)
-
-    def build_extension(self, ext):
-        try:
-            build_ext.build_extension(self, ext)
-        except ext_errors, x:
-            raise BuildFailed(x)
-
-if sys.platform == 'win32':
-    # geos DLL is geos.dll instead of geos_c.dll on Windows
-    ext_modules = [
-        Extension("shapely.speedups._speedups",
-              ["shapely/speedups/_speedups.c"], libraries=['geos']),
-    ]
-elif (hasattr(platform, 'python_implementation') 
+try:
+    # try to use Cython if present
+    from Cython.Distutils import build_ext
+except ImportError:
+    # else try to build from existing .c file
+    from setuptools.command.build_ext import build_ext as distutils_build_ext
+
+    class build_ext(distutils_build_ext):
+        # This class allows C extension building to fail.
+
+        def run(self):
+            try:
+                distutils_build_ext.run(self)
+            except DistutilsPlatformError, x:
+                raise BuildFailed(x)
+
+        def build_extension(self, ext):
+            try:
+                distutils_build_ext.build_extension(self, ext)
+            except ext_errors, x:
+                raise BuildFailed(x)
+
+if (hasattr(platform, 'python_implementation') 
     and platform.python_implementation() == 'PyPy'):
-    # python_implementation >= 2.6
+    # python_implementation is only available since 2.6
     ext_modules = []
-else:
-    ext_modules = [
-        Extension("shapely.speedups._speedups", 
-              ["shapely/speedups/_speedups.c"], libraries=['geos_c']),
-    ]
 
+elif sys.platform == 'win32':
+    libraries = ['geos']
+else:
+    libraries = ['geos_c']
+
+if os.path.exists("MANIFEST.in"):
+    subprocess.check_call(["cython", "shapely/speedups/_speedups.pyx"])
+    if not os.path.exists("shapely/speedups/_speedups.c"):
+        raise RuntimeError("Failed to generate C extension from PYX")
+
+ext_modules = [
+    Extension(
+        "shapely.speedups._speedups",
+        ["shapely/speedups/_speedups.c"],
+        libraries=libraries )]
+    
 try:
     # try building with speedups
     setup(
-        cmdclass={'build_ext': ve_build_ext},
+        cmdclass={'build_ext': build_ext},
         ext_modules=ext_modules,
         **setup_args
     )

Shapely-1.2.15/shapely/__init__.py

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

{Shapely-1.2.14 → Shapely-1.2.15}/shapely/coords.py

@@ -8,6 +8,21 @@ import sys
 from shapely.geos import lgeos
 from shapely.topology import Validating
 
+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 has_numpy and hasattr(ob, '__array_interface__'):
+        return numpy.require(ob, numpy.float64, ["C", "OWNDATA"])
+    else:
+        return ob
+
 
 class CoordinateSequence(object):
     """

{Shapely-1.2.14 → Shapely-1.2.15}/shapely/geometry/linestring.py

@@ -4,6 +4,7 @@
 from ctypes import c_double, cast, POINTER
 from ctypes import ArgumentError
 
+from shapely.coords import required
 from shapely.geos import lgeos, TopologicalError
 from shapely.geometry.base import BaseGeometry, geom_factory
 from shapely.geometry.proxy import CachingGeometryProxy
@@ -151,6 +152,9 @@ def asLineString(context):
 
 
 def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
+    # If numpy is present, we use numpy.require to ensure that we have a
+    # C-continguous array that owns its data. View data will be copied.
+    ob = required(ob)
     try:
         # From array protocol
         array = ob.__array_interface__

{Shapely-1.2.14 → Shapely-1.2.15}/shapely/geometry/multipoint.py

@@ -4,6 +4,7 @@
 from ctypes import byref, c_double, c_void_p, cast, POINTER
 from ctypes import ArgumentError
 
+from shapely.coords import required
 from shapely.geos import lgeos
 from shapely.geometry.base import BaseMultipartGeometry, exceptNull
 from shapely.geometry.point import Point, geos_point_from_py
@@ -128,6 +129,9 @@ def asMultiPoint(context):
 
 
 def geos_multipoint_from_py(ob):
+    # If numpy is present, we use numpy.require to ensure that we have a
+    # C-continguous array that owns its data. View data will be copied.
+    ob = required(ob)
     try:
         # From array protocol
         array = ob.__array_interface__

{Shapely-1.2.14 → Shapely-1.2.15}/shapely/geometry/point.py

@@ -4,6 +4,7 @@
 from ctypes import c_double
 from ctypes import cast, POINTER
 
+from shapely.coords import required
 from shapely.geos import lgeos, DimensionError
 from shapely.geometry.base import BaseGeometry
 from shapely.geometry.proxy import CachingGeometryProxy
@@ -172,6 +173,9 @@ def geos_point_from_py(ob, update_geom=None, update_ndim=0):
 
     Returns the GEOS geometry and the number of its dimensions.
     """
+    # If numpy is present, we use numpy.require to ensure that we have a
+    # C-continguous array that owns its data. View data will be copied.
+    ob = required(ob)
     try:
         # From array protocol
         array = ob.__array_interface__
@@ -183,6 +187,9 @@ def geos_point_from_py(ob, update_geom=None, update_ndim=0):
         da = array['data']
         if type(da) == type((0,)):
             cdata = da[0]
+            # If we had numpy, we would do
+            # from numpy.ctypeslib import as_ctypes
+            # cp = as_ctypes(ob) - check that code?
             cp = cast(cdata, POINTER(c_double))
             dx = c_double(cp[0])
             dy = c_double(cp[1])

{Shapely-1.2.14 → Shapely-1.2.15}/shapely/geometry/polygon.py

@@ -6,6 +6,7 @@ from ctypes import ArgumentError
 import weakref
 
 from shapely.algorithms.cga import signed_area
+from shapely.coords import required
 from shapely.geos import lgeos
 from shapely.geometry.base import BaseGeometry
 from shapely.geometry.linestring import LineString, LineStringAdapter
@@ -309,6 +310,9 @@ def orient(polygon, sign=1.0):
     return Polygon(rings[0], rings[1:])
 
 def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
+    # If numpy is present, we use numpy.require to ensure that we have a
+    # C-continguous array that owns its data. View data will be copied.
+    ob = required(ob)
     try:
         # From array protocol
         array = ob.__array_interface__

{Shapely-1.2.14 → Shapely-1.2.15}/shapely/geos.py

@@ -95,6 +95,9 @@ def _geos_c_version():
     func.argtypes = []
     func.restype = c_char_p
     v = func().split('-')[2]
+    # Ditch any SVN revision numbering that may have crept in without (ftm)
+    # importing `re`.
+    v = v.split()[0]
     return tuple(int(n) for n in v.split('.'))
 
 geos_capi_version = geos_c_version = _geos_c_version()