Skip to content

Commit 99bac80

Browse files
toobaztoobaz
committed
Imported Upstream version 1.3.0
1 parent 8eb6d6f commit 99bac80

File tree

143 files changed

+8062
-7693
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+8062
-7693
lines changed

‎.gitignore

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
*.pyc
2+
VERSION.txt
3+
Shapely.egg-info/
4+
build/
5+
dist/
6+
docs/_build/
7+
shapely/speedups/_speedups.*
8+
docs/shapely.*.txt
9+
docs/shapely.txt
10+
docs/modules.txt

‎.travis.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
language: python
2+
3+
python:
4+
- "2.6"
5+
- "2.7"
6+
- "3.2"
7+
- "3.3"
8+
9+
before_install:
10+
- sudo add-apt-repository -y ppa:ubuntugis/ppa
11+
- sudo apt-get update -qq
12+
- sudo apt-get install -qq libgeos-dev
13+
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install unittest2; fi
14+
- pip install -r requirements-dev.txt
15+
16+
install:
17+
- python setup.py build
18+
19+
script: "python setup.py test"
20+
21+
notifications:
22+
email: false

‎CHANGES.txt

+51-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,57 @@
1-
=======
21
Changes
32
=======
43

4+
1.3.0 (2013-12-31)
5+
------------------
6+
- Include support for Python 3.2 and 3.3 (#56), minimum version is now 2.6.
7+
- Switch to GEOS WKT/WKB Reader/Writer API, with defaults changed to enable 3D
8+
output dimensions, and to 'trim' WKT output for GEOS >=3.3.0.
9+
- Use GEOS version instead of GEOS C API version to determine library
10+
capabilities (#65).
11+
12+
1.2.19 (2013-12-30)
13+
-------------------
14+
- Add buffering style options (#55).
15+
16+
1.2.18 (2013-07-23)
17+
--------------------
18+
- Add shapely.ops.transform.
19+
- Permit empty sequences in collection constructors (#49, #50).
20+
- Individual polygons in MultiPolygon.__geo_interface__ are changed to tuples
21+
to match Polygon.__geo_interface__ (#51).
22+
- Add shapely.ops.polygonize_full (#57).
23+
24+
1.2.17 (2013-01-27)
25+
-------------------
26+
- Avoid circular import between wkt/wkb and geometry.base by moving calls
27+
to GEOS serializers to the latter module.
28+
- Set _ndim when unpickling (issue #6).
29+
- Don't install DLLs to Python's DLL directory (#37).
30+
- Add affinity module of affine transformation (#31).
31+
- Fix NameError that blocked installation with PyPy (#40, #41).
32+
33+
1.2.16 (2012-09-18)
34+
-------------------
35+
- Add ops.unary_union function.
36+
- Alias ops.cascaded_union to ops.unary_union when GEOS CAPI >= (1,7,0).
37+
- Add geos_version_string attribute to shapely.geos.
38+
- Ensure parent is set when child geometry is accessed.
39+
- Generate _speedups.c using Cython when building from repo when missing,
40+
stale, or the build target is "sdist".
41+
- The is_simple predicate of invalid, self-intersecting linear rings now
42+
returns ``False``.
43+
- Remove VERSION.txt from repo, it's now written by the distutils setup script
44+
with value of shapely.__version__.
45+
46+
1.2.15 (2012-06-27)
47+
-------------------
48+
- Eliminate numerical sensitivity in a method chaining test (Debian bug
49+
#663210).
50+
- Account for cascaded union of random buffered test points being a polygon
51+
or multipolygon (Debian bug #666655).
52+
- Use Cython to build speedups if it is installed.
53+
- Avoid stumbling over SVN revision numbers in GEOS C API version strings.
54+
555
1.2.14 (2012-01-23)
656
-------------------
757
- A geometry's coords property is now sliceable, yielding a list of coordinate

‎CREDITS.txt

+22
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Credits
2+
=======
3+
14
Shapely is written by:
25

36
* Sean Gillies
@@ -7,12 +10,29 @@ Shapely is written by:
710

811
Patches contributed by:
912

13+
* Allan Adair (https://github.com/allanadair)
1014
* Howard Butler
15+
* Gabi Davar (https://github.com/mindw)
16+
* Phil Elson (https://github.com/pelson)
17+
* Johan Euphrosine (https://github.com/proppy)
18+
* Bertrand Gervais (https://github.com/BertrandGervais)
19+
* Marc Jansen (https://github.com/marcjansen)
20+
* Kelsey Jordahl (https://github.com/kjordahl)
1121
* Fr |eaigue| d |eaigue| ric Junod
22+
* Thomas Kluyver (https://github.com/takluyver)
1223
* Eric Lemoine
24+
* Naveen Michaud-Agrawal (https://github.com/nmichaud)
25+
* psagers https://github.com/psagers
26+
* Jeethu Rao (https://github.com/jeethu)
27+
* Benjamin Root (https://github.com/WeatherGod)
28+
* Jason Sanford (https://github.com/JasonSanford)
29+
* Johannes Schönberger (https://github.com/ahojnnes)
1330
* Jonathan Tartley
1431
* Kristian Thy
1532
* Mike Toews (https://github.com/mwtoews)
33+
* Maarten Vermeyen (https://github.com/maarten-vermeyen)
34+
35+
See also: https://github.com/Toblerity/Shapely/graphs/contributors.
1636

1737
Additional help from:
1838

@@ -24,4 +44,6 @@ Additional help from:
2444
Major portions of this work were supported by a grant (for Pleiades_) from the
2545
U.S. National Endowment for the Humanities (http://www.neh.gov).
2646

47+
.. |eaigue| unicode:: U+00E9
48+
:trim:
2749
.. _Pleiades: http://pleiades.stoa.org

‎DLLs_AMD64_VC9/README.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
AMD64 DLLs

‎DLLs_x86_VC7/README.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
x86 DLLs

‎DLLs_x86_VC9/README.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
x86 DLLs

‎GEOS-C-API.txt

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
Ctypes declarations for functions present in GEOS C API 1.4, but not present in
2+
1.3, are listed below:
3+
4+
lgeos.GEOS_getWKBOutputDims.restype = ctypes.c_int
5+
lgeos.GEOS_getWKBByteOrder.restype = ctypes.c_int
6+
lgeos.GEOS_setWKBByteOrder.restype = ctypes.c_int
7+
lgeos.GEOS_setWKBByteOrder.argtypes = [ctypes.c_int]
8+
lgeos.GEOSGeomFromHEX_buf.restype = ctypes.c_void_p
9+
lgeos.GEOSGeomFromHEX_buf.argtypes = [ctypes.c_void_p, ctypes.c_size_t]
10+
lgeos.GEOSSimplify.restype = ctypes.c_void_p
11+
lgeos.GEOSSimplify.argtypes = [ctypes.c_void_p, ctypes.c_double]
12+
lgeos.GEOSTopologyPreserveSimplify.restype = ctypes.c_void_p
13+
lgeos.GEOSTopologyPreserveSimplify.argtypes = [ctypes.c_void_p, ctypes.c_double]
14+
lgeos.GEOSEqualsExact.restype = ctypes.c_int
15+
lgeos.GEOSEqualsExact.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_double]
16+
lgeos.GEOSNormalize.restype = ctypes.c_int
17+
lgeos.GEOSNormalize.argtypes = [ctypes.c_void_p]
18+
lgeos.GEOSWKTReader_create.restype = ctypes.c_void_p
19+
lgeos.GEOSWKTReader_destroy.restype = None
20+
lgeos.GEOSWKTReader_destroy.argtypes = [ctypes.c_void_p]
21+
lgeos.GEOSWKTReader_read.restype = ctypes.c_void_p
22+
lgeos.GEOSWKTReader_read.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
23+
lgeos.GEOSWKTWriter_create.restype = ctypes.c_void_p
24+
lgeos.GEOSWKTWriter_destroy.restype = None
25+
lgeos.GEOSWKTWriter_destroy.argtypes = [ctypes.c_void_p]
26+
lgeos.GEOSWKTWriter_write.restype = ctypes.c_char_p
27+
lgeos.GEOSWKTWriter_write.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
28+
lgeos.GEOSWKBReader_create.restype = ctypes.c_void_p
29+
lgeos.GEOSWKBReader_destroy.restype = None
30+
lgeos.GEOSWKBReader_destroy.argtypes = [ctypes.c_void_p]
31+
lgeos.GEOSWKBReader_read.restype = ctypes.c_void_p
32+
lgeos.GEOSWKBReader_read.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_size_t]
33+
lgeos.GEOSWKBReader_readHEX.restype = ctypes.c_void_p
34+
lgeos.GEOSWKBReader_readHEX.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_size_t]
35+
lgeos.GEOSWKBWriter_create.restype = ctypes.c_void_p
36+
lgeos.GEOSWKBWriter_destroy.restype = None
37+
lgeos.GEOSWKBWriter_destroy.argtypes = [ctypes.c_void_p]
38+
lgeos.GEOSWKBWriter_getOutputDimension.restype = ctypes.c_int
39+
lgeos.GEOSWKBWriter_getOutputDimension.argtypes = [ctypes.c_void_p]
40+
lgeos.GEOSWKBWriter_setOutputDimension.restype = None
41+
lgeos.GEOSWKBWriter_setOutputDimension.argtypes = [ctypes.c_void_p, ctypes.c_int]
42+
lgeos.GEOSWKBWriter_getByteOrder.restype = ctypes.c_int
43+
lgeos.GEOSWKBWriter_getByteOrder.argtypes = [ctypes.c_void_p]
44+
lgeos.GEOSWKBWriter_setByteOrder.restype = None
45+
lgeos.GEOSWKBWriter_setByteOrder.argtypes = [ctypes.c_void_p, ctypes.c_int]
46+
lgeos.GEOSWKBWriter_getIncludeSRID.restype = ctypes.c_char
47+
lgeos.GEOSWKBWriter_getIncludeSRID.argtypes = [ctypes.c_void_p]
48+
lgeos.GEOSWKBWriter_setIncludeSRID.restype = None
49+
lgeos.GEOSWKBWriter_setIncludeSRID.argtypes = [ctypes.c_void_p, ctypes.c_char]
50+
51+
Furthermore, the following unneeded declarations are removed to avoid problems
52+
with Debian's 2.2.3 package:
53+
54+
lgeos.GEOSCoordSeq_getOrdinate.restype = ctypes.c_int
55+
lgeos.GEOSCoordSeq_getOrdinate.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_uint, ctypes.c_void_p]

‎MANIFEST.in

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
exclude *.txt
2+
recursive-exclude manual *
3+
recursive-exclude debian *
4+
recursive-exclude docs *
5+
recursive-exclude DLLs_AMD64 *
6+
recursive-exclude DLLs_x86 *
7+
include CHANGES.txt CREDITS.txt LICENSE.txt README.rst VERSION.txt
8+
recursive-include shapely/tests *.py *.txt
9+
recursive-include shapely/examples *.py
10+
recursive-exclude shapely/speedups *.pyx
11+
include docs/manual.txt
12+
exclude MANIFEST.in

0 commit comments

Comments
 (0)