Imported Upstream version 1.4.1

Author: toobaz

.gitignore

@@ -1,10 +1,12 @@
 *.pyc
+*.c
+*.so
+
 VERSION.txt
 Shapely.egg-info/
 build/
 dist/
 docs/_build/
-shapely/speedups/_speedups.*
 docs/shapely.*.txt
 docs/shapely.txt
 docs/modules.txt

.travis.yml

@@ -3,20 +3,24 @@ language: python
 python:
   - "2.6"
   - "2.7"
-  - "3.2"
   - "3.3"
+  - "3.4"
+
+env:
+  - "TRAVIS_SPEEDUP_OPTS=--with-speedups"
+  - "TRAVIS_SPEEDUP_OPTS="
 
 before_install:
   - sudo add-apt-repository -y ppa:ubuntugis/ppa
   - sudo apt-get update -qq
-  - sudo apt-get install -qq libgeos-dev
+  - sudo apt-get install -qq libgeos-dev python-numpy cython
   - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install unittest2; fi
   - pip install -r requirements-dev.txt
 
 install:
-  - python setup.py build
+  - pip install -e .
 
-script: "python setup.py test"
+script: "py.test tests ${TRAVIS_SPEEDUP_OPTS}"
 
 notifications:
     email: false

CHANGES.txt

@@ -1,6 +1,40 @@
 Changes
 =======
 
+1.4.1 (2014-09-23)
+------------------
+- Return of support for GEOS 3.2 (#176, #178).
+
+1.4.0 (2014-09-08)
+------------------
+- SVG representations for IPython's inline image protocol.
+- Efficient and fast vectorized contains().
+- Change mitre_limit default to 5.0; raise ValueError with 0.0 (#139).
+- Allow mix of tuples and Points in sped-up LineString ctor (#152).
+- New STRtree class (#73).
+- Add ops.nearest_points() (#147).
+- Faster creation of geometric objects from others (cloning) (#165).
+- Removal of tests from package.
+
+1.3.3 (2014-07-23)
+------------------
+- Allow single-part geometries as argument to ops.cacaded_union() (#135).
+- Support affine transformations of LinearRings (#112).
+
+1.3.3 (2014-07-23)
+------------------
+- Allow single-part geometries as argument to ops.cacaded_union() (#135).
+- Support affine transformations of LinearRings (#112).
+
+1.3.2 (2014-05-13)
+------------------
+- Let LineString() take a sequence of Points (#130).
+
+1.3.1 (2014-04-22)
+------------------
+- More reliable proxy cleanup on exit (#106).
+- More robust DLL loading on all platforms (#114).
+
 1.3.0 (2013-12-31)
 ------------------
 - Include support for Python 3.2 and 3.3 (#56), minimum version is now 2.6.

CREDITS.txt

@@ -11,6 +11,7 @@ Shapely is written by:
 Patches contributed by:
 
 * Allan Adair (https://github.com/allanadair)
+* Joshua Arnott (https://github.com/snorfalorpagus)
 * Howard Butler
 * Gabi Davar (https://github.com/mindw)
 * Phil Elson (https://github.com/pelson)
@@ -20,8 +21,10 @@ Patches contributed by:
 * Kelsey Jordahl (https://github.com/kjordahl)
 * Fr |eaigue| d |eaigue| ric Junod
 * Thomas Kluyver (https://github.com/takluyver)
+* William Kyngesburye (https://github.com/kyngchaos)
 * Eric Lemoine
 * Naveen Michaud-Agrawal (https://github.com/nmichaud)
+* om-henners (https://github.com/om-henners)
 * psagers https://github.com/psagers
 * Jeethu Rao (https://github.com/jeethu)
 * Benjamin Root (https://github.com/WeatherGod)
@@ -31,6 +34,8 @@ Patches contributed by:
 * Kristian Thy
 * Mike Toews (https://github.com/mwtoews)
 * Maarten Vermeyen (https://github.com/maarten-vermeyen)
+* Jacob Wasserman (https://github.com/jwass)
+* Brandon Wood (https://github.com/woodb)
 
 See also: https://github.com/Toblerity/Shapely/graphs/contributors.
 

MANIFEST.in

@@ -5,8 +5,8 @@ recursive-exclude docs *
 recursive-exclude DLLs_AMD64 *
 recursive-exclude DLLs_x86 *
 include CHANGES.txt CREDITS.txt LICENSE.txt README.rst VERSION.txt
-recursive-include shapely/tests *.py *.txt
+recursive-include tests *.py *.txt
 recursive-include shapely/examples *.py
 recursive-exclude shapely/speedups *.pyx
-include docs/manual.txt
+include docs/*.rst
 exclude MANIFEST.in

README.rst

@@ -4,6 +4,9 @@ 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:: http://farm3.staticflickr.com/2738/4511827859_b5822043b7_o_d.png
    :width: 800
    :height: 400
@@ -20,7 +23,7 @@ integrated with packages that are. For more details, see:
 Requirements
 ============
 
-Shapely 1.3 requires
+Shapely 1.4 requires
 
 * Python >=2.6 (including Python 3.x)
 * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
@@ -30,13 +33,14 @@ Installation
 
 Windows users should use the executable installer, which contains the required
 GEOS DLL. Other users should acquire libgeos_c by any means, make sure that it
-is on the system library path, and install from the Python package index::
+is on the system library path, and install from the Python package index.
 
-  $ pip install Shapely
+.. code-block:: console
 
-or from a source distribution with the setup script::
+  $ pip install shapely
 
-  $ python setup.py install
+Shapely is also provided by popular Python distributions like Enthought Canopy
+and Continuum Analytics Anaconda. 
 
 .. warning:: Windows users:
    do not under any circumstances use pip (or easy_install) to uninstall
@@ -48,7 +52,9 @@ Usage
 =====
 
 Here is the canonical example of building an approximately circular patch by
-buffering a point::
+buffering a point.
+
+.. code-block:: pycon
 
   >>> from shapely.geometry import Point
   >>> patch = Point(0.0, 0.0).buffer(10.0)
@@ -65,40 +71,51 @@ Integration
 
 Shapely does not read or write data files, but it can serialize and deserialize
 using several well known formats and protocols. The shapely.wkb and shapely.wkt
-modules provide dumpers and loaders inspired by Python's pickle module.::
+modules provide dumpers and loaders inspired by Python's pickle module.
+
+.. code-block:: pycon
 
   >>> from shapely.wkt import dumps, loads
   >>> dumps(loads('POINT (0 0)'))
   'POINT (0.0000000000000000 0.0000000000000000)'
 
 All linear objects, such as the rings of a polygon (like ``patch`` above),
-provide the Numpy array interface.::
+provide the Numpy array interface.
+
+.. code-block:: pycon
 
-  >>> from numpy import asarray
-  >>> ag = asarray(patch.exterior)
-  >>> ag
+  >>> import numpy as np
+  >>> np.array(patch.exterior)
   array([[  1.00000000e+01,   0.00000000e+00],
          [  9.95184727e+00,  -9.80171403e-01],
          [  9.80785280e+00,  -1.95090322e+00],
          ...
          [  1.00000000e+01,   0.00000000e+00]])
 
-That yields a Numpy array of [x, y] arrays. This is not always exactly what one
-wants for plotting shapes with Matplotlib (for example), so Shapely 1.2 adds
-a `xy` property for obtaining separate arrays of coordinate x and y values.::
+That yields a Numpy array of `[x, y]` arrays. This is not always exactly what one
+wants for plotting shapes with Matplotlib (for example), so Shapely adds
+a `xy` property for obtaining separate arrays of coordinate x and y values.
+
+.. code-block:: pycon
 
   >>> x, y = patch.exterior.xy
-  >>> ax = asarray(x)
-  >>> ax
+  >>> np.array(x)
   array([  1.00000000e+01,   9.95184727e+00,   9.80785280e+00,  ...])
 
-Numpy arrays can also be adapted to Shapely linestrings::
+Numpy arrays of `[x, y]` arrays can also be adapted to Shapely linestrings.
+
+.. code-block:: pycon
 
-  >>> from shapely.geometry import asLineString
-  >>> asLineString(ag).length
+  >>> from shapely.geometry import LineString
+  >>> LineString(np.array(patch.exterior)).length
   62.806623139095073
-  >>> asLineString(ag).wkt
-  'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
+
+Numpy arrays of x and y must be transposed.
+
+.. code-block::
+
+  >>> LineString(np.transpose(np.array(patch.exterior.xy))).length
+  62.80662313909507
 
 Shapely can also integrate with other Python GIS packages using data modeled
 after GeoJSON.
@@ -116,22 +133,36 @@ after GeoJSON.
 Development and Testing
 =======================
 
-Dependecies for developing Shapely are listed in requirements-dev.txt. Cython
+Dependencies for developing Shapely are listed in requirements-dev.txt. Cython
 and Numpy are not required for production installations, only for development.
-Use of a virtual environment is strongly recommended.::
+Use of a virtual environment is strongly recommended.
+
+.. code-block:: console
 
   $ virtualenv .
   $ source bin/activate
   (env)$ pip install -r requirements-dev.txt
-  (env)$ python setup.py develop
+  (env)$ pip install -e .
+
+We use py.test to run Shapely's suite of unittests and doctests.
+
+.. code-block:: console
+
+  (env)$ py.test tests
+
+Roadmap and Maintenance
+=======================
 
-Shapely uses a Zope-stye suite of unittests and doctests, exercised via
-setup.py.::
+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.
 
-  (env)$ python setup.py test
+Shapely 1.3.x is a maintenance-only branch supporting Pythons 2.7 and 3+.
 
-Nosetests won't run the tests properly; Zope doctest suites are not currently
-supported well by nose.
+"Shapely 3000" is the name of the next milestone. New features will include
+vectorized operations, better integration with IPython Notebook, support for
+fixed precision models, and more. Less ctypes and more Cython is another theme
+in this branch. A 1.4 release should come out of this by Summer, 2014.
 
 Support
 =======
@@ -141,12 +172,12 @@ http://lists.gispython.org/mailman/listinfo/community.
 
 Bugs may be reported at https://github.com/Toblerity/Shapely.
 
-.. include:: ../CREDITS.txt
+.. include:: CREDITS.txt
 
 .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
 .. _PostGIS: http://postgis.org
 .. _GEOS: http://trac.osgeo.org/geos/
-.. _example apps: https://github.com/sgillies/shapely/tree/master/shapely/examples
+.. _example apps: https://github.com/Toblerity/shapely/tree/master/shapely/examples
 .. _manual: http://toblerity.github.com/shapely/manual.html
 .. _Pleiades: http://pleiades.stoa.org
 

docs/code/triangulate.py

@@ -0,0 +1,24 @@
+from shapely.geometry import MultiPoint
+from shapely.ops import triangulate
+
+from matplotlib import pyplot
+from descartes.patch import PolygonPatch
+from figures import SIZE, BLUE, GRAY
+
+points = MultiPoint([(0, 0), (1, 1), (0, 2), (2, 2), (3, 1), (1, 0)])
+triangles = triangulate(points)
+
+fig = pyplot.figure(1, figsize=SIZE, dpi=90)
+fig.set_frameon(True)
+ax = fig.add_subplot(111)
+
+for triangle in triangles:
+    patch = PolygonPatch(triangle, facecolor=BLUE, edgecolor=BLUE, alpha=0.5, zorder=2)
+    ax.add_patch(patch)
+
+for point in points:
+    pyplot.plot(point.x, point.y, 'o', color=GRAY)
+
+pyplot.xlim(-0.5, 3.5)
+pyplot.ylim(-0.5, 2.5)
+pyplot.show()

docs/conf.py

@@ -35,15 +35,15 @@
     'matplotlib.sphinxext.only_directives',
     'matplotlib.sphinxext.plot_directive',
     'sphinx.ext.autodoc',
-    'sphinx.ext.pngmath', # <----- pick one, not both
-    #'sphinx.ext.mathjax', # <--/
+    #'sphinx.ext.pngmath', # <----- pick one, not both
+    'sphinx.ext.mathjax', # <--/
 ]
 
 # Add any paths that contain templates here, relative to this directory.
 #templates_path = ['_templates']
 
 # The suffix of source filenames.
-source_suffix = '.txt'
+source_suffix = '.rst'
 
 # The encoding of source files.
 #source_encoding = 'utf-8'