[mbsystem] 02/05: Merge tag 'upstream/5.5.2252'
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mbsystem. commit c98aa9f2639934fcd43d40fd81e253dcfb99bd82 Merge: 2c9d5ae cd455aa Author: Andreas Tille Date: Thu Aug 20 10:44:22 2015 +0200 Merge tag 'upstream/5.5.2252' Upstream version 5.5.2252 ChangeLog | 300 +- Makefile.in| 21 +- Makefile.template | 55 - configure | 3871 ++-- configure.ac | 1027 ++-- configure.ac => configure.ac.save | 172 +- configure.cmd | 197 +- configureGMT5.cmd | 15 + html/ChayesJul2003.gif | Bin 0 -> 19022 bytes html/MBTeamJul2003.gif | Bin 0 -> 146993 bytes html/ValJul2003.gif| Bin 0 -> 20392 bytes html/caress2001.gif| Bin 0 -> 14069 bytes html/gpl.html | 604 ++ {src/html => html}/index.html |2 +- {src/html => html}/mbsystem.html |8 +- html/mbsystem_capabilities.html| 254 + {src/html => html}/mbsystem_copyright.html |0 html/mbsystem_faq.html | 433 ++ {src/html => html}/mbsystem_formats.html |2 +- html/mbsystem_future.html | 122 + src/html/index.html => html/mbsystem_home.html |2 +- {src/html => html}/mbsystem_how_to_get.html|0 html/mbsystem_logo.gif | Bin 0 -> 66436 bytes html/mbsystem_logo_small.gif | Bin 0 -> 6158 bytes {src/html => html}/mbsystem_man_list.html |0 {src/html => html}/mbsystem_whatsnew.html |0 install_makefiles | 1020 libtool| 6154 ltmain.sh | 5528 +++--- src/Makefile.am|5 +- src/Makefile.in| 23 +- src/Makefile.template | 65 - src/bsio/Makefile.in | 18 +- src/bsio/Makefile.template | 109 - src/bsio/bs2asc.c |4 +- src/bsio/mbbs.h|4 +- src/bsio/mbbs_defines.h| 15 +- src/bsio/mbbs_io.c |7 +- src/bsio/mbbs_iomrv1.c |4 +- src/bsio/mbbs_iomrv2.c |4 +- src/bsio/mbbs_mem.h|6 +- src/bsio/mbbs_memalloc.c |8 +- src/bsio/mbbs_misc.c | 18 +- src/bsio/mbbs_swapbytes.c |4 +- src/bsio/mbbs_tm.c |4 +- src/bsio/mbbs_utils.c | 12 +- src/bsio/mbbs_wrhdrfields.c|4 +- src/bsio/mbbs_wrsampflags.c|4 +- src/gmt/Makefile.am| 23 +- src/gmt/Makefile.in| 256 +- src/gmt/Makefile.template | 105 - src/gmt/common_byteswap.h | 135 + src/gmt/common_math.h | 107 + src/gmt/common_runpath.h | 59 + src/gmt/common_sighandler.h| 34 + src/gmt/common_string.h| 88 + src/gmt/gmt_calclock.h | 68 + src/gmt/gmt_colors.h | 60 + src/gmt/gmt_common.h | 187 + src/gmt/gmt_config.h |0 src/gmt/gmt_constants.h| 224 + src/gmt/gmt_contour.h | 158 + src/gmt/gmt_core_module.h | 114 + src/gmt/gmt_crossing.h | 40 + src/gmt/gmt_customio.h | 55 + src/gmt/gmt_dcw.h | 55 + src/gmt/gmt_defaults.h | 170 + src/gmt/gmt_define.h | 45 + src/gmt/gmt_dev.h | 146 + src/gmt/gmt_dimensions.h | 29 + src/gmt/gmt_error.h| 139 + src/gmt/gmt_error_codes.h | 107 + src/gmt/gmt_fft.h | 102 + src/gmt/gmt_gdalread.h
[mbsystem] 01/01: pristine-tar data for mbsystem_5.5.2252.orig.tar.gz
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch pristine-tar in repository mbsystem. commit 8d8ef94fcc2b4e0f25142943c2e89148b716fc10 Author: Andreas Tille Date: Thu Aug 20 10:44:22 2015 +0200 pristine-tar data for mbsystem_5.5.2252.orig.tar.gz --- mbsystem_5.5.2252.orig.tar.gz.delta | Bin 0 -> 33279 bytes mbsystem_5.5.2252.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/mbsystem_5.5.2252.orig.tar.gz.delta b/mbsystem_5.5.2252.orig.tar.gz.delta new file mode 100644 index 000..b05384a Binary files /dev/null and b/mbsystem_5.5.2252.orig.tar.gz.delta differ diff --git a/mbsystem_5.5.2252.orig.tar.gz.id b/mbsystem_5.5.2252.orig.tar.gz.id new file mode 100644 index 000..d9e85c4 --- /dev/null +++ b/mbsystem_5.5.2252.orig.tar.gz.id @@ -0,0 +1 @@ +79e077d427e4dd2d87e45b9909929af0f10d6df0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mbsystem] 03/05: Inject new upstream version (same build failures as in previous version :-()
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mbsystem. commit c7d90f9d85402f2933e6024c9f6b4fc89b7adef5 Author: Andreas Tille Date: Thu Aug 20 10:45:40 2015 +0200 Inject new upstream version (same build failures as in previous version :-() --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0d4be1e..053a91d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mbsystem (5.5.2252-1) UNRELEASED; urgency=low + + New upstream version + + -- Andreas Tille Thu, 20 Aug 2015 10:45:14 +0200 + mbsystem (5.4.2220-0) UNRELEASED; urgency=low [ M. Hamish Bowman ] -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mbsystem] 05/05: Enhance long description of main package
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mbsystem. commit 32bbde3302f08a037610220a1636dff4d5dee4f8 Author: Andreas Tille Date: Thu Aug 20 11:50:10 2015 +0200 Enhance long description of main package --- debian/control | 10 ++ 1 file changed, 10 insertions(+) diff --git a/debian/control b/debian/control index afa46eb..395ec1c 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,16 @@ Description: Processing tools for multibeam and sidescan sonar data display of bathymetry and backscatter imagery data derived from multibeam, interferometry, and sidescan sonars. It interacts with GMT (The Generic Mapping Tools) and other GIS applications. + . + MB-System was originally developed at the Lamont-Doherty Earth + Observatory of Columbia University (L-DEO) and is now a collaborative + effort between the Monterey Bay Aquarium Research Institute (MBARI) and + L-DEO. The National Science Foundation has provided the primary support + for MB-System development since 1993. The Packard Foundation has + provided significant support through MBARI since 1998. Additional + support has derived from SeaBeam Instruments (1994-1997), NOAA (2002- + 2004), and others. + Package: mbsystem-doc Architecture: all -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mbsystem] branch upstream updated (4125fb2 -> cd455aa)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch upstream in repository mbsystem. from 4125fb2 Imported Upstream version 5.4.2220 new cd455aa Imported Upstream version 5.5.2252 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: ChangeLog | 300 +- Makefile.in| 21 +- Makefile.template | 55 - configure | 3871 ++-- configure.ac | 1027 ++-- configure.ac => configure.ac.save | 172 +- configure.cmd | 197 +- configureGMT5.cmd | 15 + {src/html => html}/ChayesJul2003.gif | Bin {src/html => html}/MBTeamJul2003.gif | Bin {src/html => html}/ValJul2003.gif | Bin {src/html => html}/caress2001.gif | Bin {src/html => html}/gpl.html|0 src/html/mbsystem_home.html => html/index.html |0 {src/html => html}/mbsystem.html |8 +- {src/html => html}/mbsystem_capabilities.html |0 {src/html => html}/mbsystem_copyright.html |0 {src/html => html}/mbsystem_faq.html |0 {src/html => html}/mbsystem_formats.html |2 +- {src/html => html}/mbsystem_future.html|0 {src/html => html}/mbsystem_home.html |0 {src/html => html}/mbsystem_how_to_get.html|0 {src/html => html}/mbsystem_logo.gif | Bin {src/html => html}/mbsystem_logo_small.gif | Bin {src/html => html}/mbsystem_man_list.html |0 {src/html => html}/mbsystem_whatsnew.html |0 install_makefiles | 1020 libtool| 6154 ltmain.sh | 5528 +++--- src/Makefile.am|5 +- src/Makefile.in| 23 +- src/Makefile.template | 65 - src/bsio/Makefile.in | 18 +- src/bsio/Makefile.template | 109 - src/bsio/bs2asc.c |4 +- src/bsio/mbbs.h|4 +- src/bsio/mbbs_defines.h| 15 +- src/bsio/mbbs_io.c |7 +- src/bsio/mbbs_iomrv1.c |4 +- src/bsio/mbbs_iomrv2.c |4 +- src/bsio/mbbs_mem.h|6 +- src/bsio/mbbs_memalloc.c |8 +- src/bsio/mbbs_misc.c | 18 +- src/bsio/mbbs_swapbytes.c |4 +- src/bsio/mbbs_tm.c |4 +- src/bsio/mbbs_utils.c | 12 +- src/bsio/mbbs_wrhdrfields.c|4 +- src/bsio/mbbs_wrsampflags.c|4 +- src/gmt/Makefile.am| 23 +- src/gmt/Makefile.in| 256 +- src/gmt/Makefile.template | 105 - src/gmt/common_byteswap.h | 135 + src/gmt/common_math.h | 107 + src/gmt/common_runpath.h | 59 + src/gmt/common_sighandler.h| 34 + src/gmt/common_string.h| 88 + src/gmt/gmt_calclock.h | 68 + src/gmt/gmt_colors.h | 60 + src/gmt/gmt_common.h | 187 + src/gmt/gmt_config.h |0 src/gmt/gmt_constants.h| 224 + src/gmt/gmt_contour.h | 158 + src/gmt/gmt_core_module.h | 114 + src/gmt/gmt_crossing.h | 40 + src/gmt/gmt_customio.h | 55 + src/gmt/gmt_dcw.h | 55 + src/gmt/gmt_defaults.h | 170 + src/gmt/gmt_define.h | 45 + src/gmt/gmt_dev.h | 146 + src/gmt/gmt_dimensions.h | 29 + src/gmt/gmt_error.h| 139 + src/gmt/gmt_error_codes.h | 107 + src/gmt/gmt_fft.h | 102 +
[mbsystem] 04/05: New version has needs versioned dependency libgmt-dev (>= 5.1.2)
This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mbsystem. commit 581b9a53167b133c981e9279b235b2dfeb162159 Author: Andreas Tille Date: Thu Aug 20 10:47:16 2015 +0200 New version has needs versioned dependency libgmt-dev (>= 5.1.2) --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 053a91d..69b9ac5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mbsystem (5.5.2252-1) UNRELEASED; urgency=low - New upstream version + * New upstream version + * New package needs versioned dependency libgmt-dev (>= 5.1.2) -- Andreas Tille Thu, 20 Aug 2015 10:45:14 +0200 diff --git a/debian/control b/debian/control index bb45569..afa46eb 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Section: science Priority: optional Build-Depends: debhelper (>= 9), dh-autoreconf, - libgmt-dev, + libgmt-dev (>= 5.1.2), lesstif2-dev | libmotif-dev, libxt-dev, libnetcdf-dev, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[mbsystem] branch pristine-tar updated (96f22cb -> 8d8ef94)
This is an automated email from the git hooks/post-receive script. tille pushed a change to branch pristine-tar in repository mbsystem. from 96f22cb pristine-tar data for mbsystem_5.4.2220.orig.tar.gz new 8d8ef94 pristine-tar data for mbsystem_5.5.2252.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: mbsystem_5.5.2252.orig.tar.gz.delta | Bin 0 -> 33279 bytes mbsystem_5.5.2252.orig.tar.gz.id| 1 + 2 files changed, 1 insertion(+) create mode 100644 mbsystem_5.5.2252.orig.tar.gz.delta create mode 100644 mbsystem_5.5.2252.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mbsystem.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libkml] branch master updated (7b9f47a -> 4f68fd4)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository libkml. from 7b9f47a Set distribution to unstable. new 9290cbc Add required build dependencies to libkml-dev dependencies. new 4f68fd4 Set distribution to unstable. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 debian/control | 3 +++ 2 files changed, 11 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processing of libkml_1.3.0~rc0-3_amd64.changes
libkml_1.3.0~rc0-3_amd64.changes uploaded successfully to localhost along with the files: libkml_1.3.0~rc0-3.dsc libkml_1.3.0~rc0-3.debian.tar.xz libkml-dev_1.3.0~rc0-3_amd64.deb libkml-java_1.3.0~rc0-3_amd64.deb libkmlbase1_1.3.0~rc0-3_amd64.deb libkmlconvenience1_1.3.0~rc0-3_amd64.deb libkmldom1_1.3.0~rc0-3_amd64.deb libkmlengine1_1.3.0~rc0-3_amd64.deb libkmlregionator1_1.3.0~rc0-3_amd64.deb libkmlxsd1_1.3.0~rc0-3_amd64.deb python-kml_1.3.0~rc0-3_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libkml] 02/02: Set distribution to unstable.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libkml. commit 4f68fd4b2ec1d453d03ba5a66519a5ce72cc3632 Author: Bas Couwenberg Date: Thu Aug 20 16:17:49 2015 +0200 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e427952..4fdbbce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libkml (1.3.0~rc0-3) UNRELEASED; urgency=medium +libkml (1.3.0~rc0-3) unstable; urgency=medium * Add required build dependencies to libkml-dev dependencies: libboost-dev, libexpat1-dev & zlib1g-dev in addition to libminizip-dev & liburiparser-dev. - -- Bas Couwenberg Thu, 20 Aug 2015 16:15:45 +0200 + -- Bas Couwenberg Thu, 20 Aug 2015 16:17:37 +0200 libkml (1.3.0~rc0-2) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libkml] 01/02: Add required build dependencies to libkml-dev dependencies.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libkml. commit 9290cbcb4cded476cc8262c61c977b964ecd4804 Author: Bas Couwenberg Date: Thu Aug 20 16:17:26 2015 +0200 Add required build dependencies to libkml-dev dependencies. --- debian/changelog | 8 debian/control | 3 +++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 226f838..e427952 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libkml (1.3.0~rc0-3) UNRELEASED; urgency=medium + + * Add required build dependencies to libkml-dev dependencies: +libboost-dev, libexpat1-dev & zlib1g-dev in addition to +libminizip-dev & liburiparser-dev. + + -- Bas Couwenberg Thu, 20 Aug 2015 16:15:45 +0200 + libkml (1.3.0~rc0-2) unstable; urgency=medium * Update symbols for other architectures. diff --git a/debian/control b/debian/control index 726cfe2..17b289f 100644 --- a/debian/control +++ b/debian/control @@ -128,6 +128,9 @@ Depends: libkmlbase1 (= ${binary:Version}), libkmlxsd1 (= ${binary:Version}), libminizip-dev, liburiparser-dev (>= 0.7.1), + libboost-dev, + libexpat1-dev, + zlib1g-dev, ${misc:Depends} Description: Library to manipulate KML 2.2 OGC standard files - development files This is a library for use with applications that want to parse, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[libkml] tag debian/1.3.0.rc0-3 created (now 4f68fd4)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to tag debian/1.3.0.rc0-3 in repository libkml. at 4f68fd4 (commit) No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
mkgmap-splitter 0.0.0+svn427-1 MIGRATED to testing
FYI: The status of the mkgmap-splitter source package in Debian's testing distribution has changed. Previous version: 0.0.0+svn426-1 Current version: 0.0.0+svn427-1 -- This email is automatically generated once a day. As the installation of new packages into testing happens multiple times a day you will receive later changes on the next day. See https://release.debian.org/testing-watch/ for more information. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[bts-link] source package src:rasterio
# # bts-link upstream status pull for source package src:rasterio # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # user bts-link-upstr...@lists.alioth.debian.org # remote status report for #790549 (http://bugs.debian.org/790549) # Bug title: rasterio: FTBFS on *-i386: AssertionError in test suite # * https://github.com/mapbox/rasterio/issues/229 # * remote status changed: open -> closed # * closed upstream tags 790549 + fixed-upstream usertags 790549 - status-open usertags 790549 + status-closed thanks ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: [bts-link] source package src:rasterio
Processing commands for cont...@bugs.debian.org: > # > # bts-link upstream status pull for source package src:rasterio > # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html > # > user bts-link-upstr...@lists.alioth.debian.org Setting user to bts-link-upstr...@lists.alioth.debian.org (was bts-link-de...@lists.alioth.debian.org). > # remote status report for #790549 (http://bugs.debian.org/790549) > # Bug title: rasterio: FTBFS on *-i386: AssertionError in test suite > # * https://github.com/mapbox/rasterio/issues/229 > # * remote status changed: open -> closed > # * closed upstream > tags 790549 + fixed-upstream Bug #790549 [src:rasterio] rasterio: FTBFS on *-i386: AssertionError in test suite Added tag(s) fixed-upstream. > usertags 790549 - status-open Usertags were: status-open. Usertags are now: . > usertags 790549 + status-closed There were no usertags set. Usertags are now: status-closed. > thanks Stopping processing here. Please contact me if you need assistance. -- 790549: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790549 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 02/148: Imported Debian patch 1.0.14-1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit fbaa2f85dbd20b2dab55773a82f9e699508c3396 Author: Pietro Battiston Date: Fri Nov 6 11:54:00 2009 +0100 Imported Debian patch 1.0.14-1 --- Shapely.egg-info/requires.txt | 3 +- debian/changelog | 26 debian/compat | 1 + debian/control| 24 debian/copyright | 269 ++ debian/examples | 1 + debian/rules | 41 +++ debian/watch | 4 + 8 files changed, 367 insertions(+), 2 deletions(-) diff --git a/Shapely.egg-info/requires.txt b/Shapely.egg-info/requires.txt index e0bd690..8b6d003 100644 --- a/Shapely.egg-info/requires.txt +++ b/Shapely.egg-info/requires.txt @@ -1,2 +1 @@ -setuptools -ctypes \ No newline at end of file +setuptools \ No newline at end of file diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000..41743a1 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,26 @@ +python-shapely (1.0.14-1) unstable; urgency=low + + * New upstream release + + -- Pietro Battiston Fri, 06 Nov 2009 11:54:00 +0100 + +python-shapely (1.0.12-1) unstable; urgency=low + + * New upstream release (Closes: #530775) + * Migration from python-central to python-support + + -- Pietro Battiston Fri, 29 May 2009 09:56:00 +0200 + +python-shapely (1.0.11-2) unstable; urgency=low + + * Added information about packaging license (Closes: #511984) + * debian/rules: improve clean rule by removing generated files + + -- Pietro Battiston Fri, 16 Jan 2009 12:24:42 +0100 + +python-shapely (1.0.11-1) unstable; urgency=low + + * Initial release (Closes: #509253) + + -- Pietro Battiston Tue, 16 Dec 2008 22:35:31 +0100 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 000..987f5d2 --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +Source: python-shapely +Section: python +Priority: optional +Maintainer: Pietro Battiston +Build-Depends: debhelper (>= 7) +Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6) +Standards-Version: 3.8.3 +XS-Python-Version: >= 2.4 +Homepage: http://trac.gispython.org/lab/wiki/Shapely + +Package: python-shapely +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, python (>=2.5) | python-ctypes, libgeos-c1 (>= 2.3.3) +Suggests: python-numpy +Enhances: python-numpy +XB-Python-Version: ${python:Versions} +Description: manipulation and analysis of 2D geospatial geometries + Shapely is a package for manipulation and analysis of 2D geospatial geometries. + Its capabilities include: + * obtaining the unions, intersections, or differences of 2D shapes + * determining whether 2D shapes intersect, touch, or contain one another + and more. + . + Shapes can be points, polygonal chains or polygones. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000..7313ecd --- /dev/null +++ b/debian/copyright @@ -0,0 +1,269 @@ +This package was debianized by Pietro Battiston on +Tue, 16 Dec 2008 22:35:31 +0100. + +It was downloaded from http://pypi.python.org/packages/source/S/Shapely/ + +Upstream Authors: + +Sean Gillies +(see /usr/share/doc/python-shapely/CREDITS.txt for full list). + +Copyright: + +Copyright (c) 2007, Sean C. Gillies + +License: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +* Neither the name of Sean C. Gillies nor the names of + its contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE
[python-shapely] 07/148: Added Vcs-* fields
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit ddc8603d295a1f07bce3663cb79954df3df6d0f5 Author: Pietro Battiston Date: Fri Apr 30 14:23:23 2010 +0200 Added Vcs-* fields --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index ebe4aae..49ce654 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,8 @@ Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6) Standards-Version: 3.8.4 XS-Python-Version: >= 2.4 Homepage: http://trac.gispython.org/lab/wiki/Shapely +Vcs-Browser: http://git.debian.org/?p=collab-maint/python-shapely.git +Vcs-Git: git://git.debian.org/git/collab-maint/python-shapely.git Package: python-shapely Architecture: all -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 03/148: Merge commit 'upstream/1.0.15'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit f87b0d5bfd9149f46381c2bbf311d8ed8c2dd97f Merge: fbaa2f8 e2c0198 Author: Pietro Battiston Date: Fri Apr 30 12:21:53 2010 +0200 Merge commit 'upstream/1.0.15' ._CHANGES.txt| Bin 0 -> 186 bytes ._CREDITS.txt| Bin 0 -> 185 bytes ._HISTORY.txt| Bin 0 -> 184 bytes ._LICENSE.txt| Bin 0 -> 184 bytes ._MANIFEST.in| Bin 0 -> 186 bytes ._README.txt | Bin 0 -> 187 bytes PKG-INFO | 2 +- Shapely.egg-info/PKG-INFO| 2 +- Shapely.egg-info/SOURCES.txt | 7 -- examples/._geoms.py | Bin 0 -> 184 bytes examples/._world.py | Bin 0 -> 184 bytes manual/style.css | 231 - setup.py | 2 +- setup_windows.py | 37 -- shapely/.___init__.py| Bin 0 -> 185 bytes shapely/._ctypes_declarations.py | Bin 0 -> 187 bytes shapely/._iterops.py | Bin 0 -> 184 bytes shapely/._ops.py | Bin 0 -> 184 bytes shapely/._predicates.py | Bin 0 -> 186 bytes shapely/._topology.py| Bin 0 -> 187 bytes shapely/._wkb.py | Bin 0 -> 187 bytes shapely/geometry/._base.py | Bin 0 -> 184 bytes shapely/geometry/._linestring.py | Bin 0 -> 184 bytes shapely/geos.py | 69 +++ tests/._Array.txt| Bin 0 -> 184 bytes tests/._GeoInterface.txt | Bin 0 -> 184 bytes tests/._Persist.txt | Bin 0 -> 184 bytes tests/._Point.txt| Bin 0 -> 184 bytes tests/._Predicates.txt | Bin 0 -> 184 bytes tests/._binascii_hex.txt | Bin 0 -> 184 bytes tests/__init__.py| 2 - tests/rungrind.dist | 4 - tests/test_doctests.py | 35 -- tests/test_threads.py| 33 -- tests/valgrind-python.supp | 240 --- tests/wkt_locale.txt | 2 +- 36 files changed, 51 insertions(+), 615 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] branch master created (now fca3e5b)
This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository python-shapely. at fca3e5b Team upload. This branch includes the following new commits: new 3b2ae68 Imported Upstream version 1.0.14 new fbaa2f8 Imported Debian patch 1.0.14-1 new f87b0d5 Merge commit 'upstream/1.0.15' new e2c0198 Imported Upstream version 1.0.15 new c65288b machine-parseable copyright new fabf414 standards version bump new ddc8603 Added Vcs-* fields new 2821dfe 1.0.15-1 new b2ccc41 format 3.0 (quilt) new fa32a58 dh 7.0 magic new 0be9ab3 debian/docs new b472fc4 uversionmangle so that when I package Shapely 1.2*, it is not considered older than 1.2b*. Thanks Piotr new 2dfd509 Merge commit 'upstream/1.2.1' new 0d70304 Imported Upstream version 1.2.1 new 3607149 Packaging update patch from Sean Gillies - thanks new bd0b60a Toward 1.2.1-1 new 11a Merge commit 'upstream/1.2.1' new f0b2198 Imported Upstream version 1.2.1 new 6b50aa2 Do not install examples (which are already installed as examples) in /usr/bin new 032c83b added debian/patches new 8727ea9 Run tests before building new aca0a4a Merge commit 'upstream/1.2.2' new ecf59da Imported Upstream version 1.2.2 new 65c52d9 1.2.2-1 new f04f99f Removed non-working locale new ead6a6f Updated standards to 3.9.1 new 7fbf396 Merge commit 'upstream/1.2.3' new 25b6849 Imported Upstream version 1.2.3 new ce8474b 1.2.3-1 changelog new cd88cea Require newer version of debhelper to support override_dh_auto_test new e178d64 Removed useless changelog line new 40ba0a2 Revert "Removed non-working locale", do reintroduce patch as patch. new 17db760 Patch to disable broken test new ed340e0 Examples are removed from PATH by patch new 5ad0bc8 Backported fixes from 1.2.3 manual new db8ae7b Run tests, except wkt_locale.txt which is broken. new 2a91e59 Standards-Version: 3.9.1 new 1e77740 1.2.1-2 new f03b888 Backported fixes from 1.2.3 manual - patch new 7d8df8c Broken locale test disabled - patch (?!??!) new 1760dd8 ligeos in build-depends for tests new c20c783 Added missing build-depends for tests new c4f5a19 Merge "squeeze" in "master" new 3d1a23f Imported Upstream version 1.2.4 new 1557f80 Imported Upstream version 1.2.4 new 9189995 1.2.4 new 7272fb4 Removed patch for manual new 689cfb1 The non-run test _must_ still be there... new 623aa38 Removed double patch entry new dcef951 patched typo in test new 350cd22 Updated copyright format & my email new 781d44b Imported Upstream version 1.2.8 new 651016f Merge commit 'upstream/1.2.8' new 7895b9d Remove obsolete patch "typo-in-dll-test". new 48984c1 Updated email address new 08e507b Use dh_python2 new fd5b2d9 Suggest python-matplotlib (used in example scripts) new 235dd58 1.2.8-1 new d402565 dh_python2 migration leftovers new 37b5515 Removed spurious changelog entry new c327cec Merge commit 'upstream/1.2.10' new 6cca9d1 Imported Upstream version 1.2.10 new d8ef89a 1.2.10-1 new 29404eb Removed obsolete patch new e9b7c0c Updated dependencies new 486eca0 Drop "Breaks" new 035e4bd Regenerate _speedups.c at runtime new 292311a patch in changelog new 3efcf37 Now using gbp-pq to manage patches. new 9db99d6 Imported Upstream version 1.2.13 new fbb71f7 Merge commit 'upstream/1.2.13' new 3160fc7 Imported Upstream version 1.2.13 new 728d2cc Updated patch rerun-cython new 688ab00 1.2.13-1 new 4e3c412 Imported upstream patch to floats in test new e2867a7 README.txt is now README.rst new 24317f2 Updated debian/copyright new 977095f Run tests with all supported Python versions new 5df40d9 Changelog filled, ready for release new 8eb6d6f Imported Upstream version 1.2.14 new fdb68ed Merge commit 'upstream/1.2.14' new 5f95bc9 Removed now obsolete python 2.7 support patch new 0970d57 Rebased patches new b4f3718 1.2.14-1 new 13c9c23 Readded missing description line in patch new 3f851fa Upstream patch for broken test new 281f4e0 Added set -e before for loop for policy compliancy new 5ad7673 Remove .c file only before build (to make gbp happy) new f29f0d8 Updated policy version new 0376bc4 Updated changelog
[python-shapely] 09/148: format 3.0 (quilt)
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit b2ccc41a8bba63547a5256ac78b94da1acec752b Author: Pietro Battiston Date: Fri Apr 30 14:50:03 2010 +0200 format 3.0 (quilt) --- debian/source/format | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 04/148: Imported Upstream version 1.0.15
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit e2c019839e9a8efe62f99c64f6bee9cba42fc7ad Author: Pietro Battiston Date: Fri Apr 30 12:21:53 2010 +0200 Imported Upstream version 1.0.15 --- ._CHANGES.txt| Bin 0 -> 186 bytes ._CREDITS.txt| Bin 0 -> 185 bytes ._HISTORY.txt| Bin 0 -> 184 bytes ._LICENSE.txt| Bin 0 -> 184 bytes ._MANIFEST.in| Bin 0 -> 186 bytes ._README.txt | Bin 0 -> 187 bytes PKG-INFO | 2 +- Shapely.egg-info/PKG-INFO| 2 +- Shapely.egg-info/SOURCES.txt | 7 -- Shapely.egg-info/requires.txt| 3 +- examples/._geoms.py | Bin 0 -> 184 bytes examples/._world.py | Bin 0 -> 184 bytes manual/style.css | 231 - setup.py | 2 +- setup_windows.py | 37 -- shapely/.___init__.py| Bin 0 -> 185 bytes shapely/._ctypes_declarations.py | Bin 0 -> 187 bytes shapely/._iterops.py | Bin 0 -> 184 bytes shapely/._ops.py | Bin 0 -> 184 bytes shapely/._predicates.py | Bin 0 -> 186 bytes shapely/._topology.py| Bin 0 -> 187 bytes shapely/._wkb.py | Bin 0 -> 187 bytes shapely/geometry/._base.py | Bin 0 -> 184 bytes shapely/geometry/._linestring.py | Bin 0 -> 184 bytes shapely/geos.py | 69 +++ tests/._Array.txt| Bin 0 -> 184 bytes tests/._GeoInterface.txt | Bin 0 -> 184 bytes tests/._Persist.txt | Bin 0 -> 184 bytes tests/._Point.txt| Bin 0 -> 184 bytes tests/._Predicates.txt | Bin 0 -> 184 bytes tests/._binascii_hex.txt | Bin 0 -> 184 bytes tests/__init__.py| 2 - tests/rungrind.dist | 4 - tests/test_doctests.py | 35 -- tests/test_threads.py| 33 -- tests/valgrind-python.supp | 240 --- tests/wkt_locale.txt | 2 +- 37 files changed, 52 insertions(+), 617 deletions(-) diff --git a/._CHANGES.txt b/._CHANGES.txt new file mode 100644 index 000..e4be6ea Binary files /dev/null and b/._CHANGES.txt differ diff --git a/._CREDITS.txt b/._CREDITS.txt new file mode 100644 index 000..2da06ff Binary files /dev/null and b/._CREDITS.txt differ diff --git a/._HISTORY.txt b/._HISTORY.txt new file mode 100644 index 000..963bf98 Binary files /dev/null and b/._HISTORY.txt differ diff --git a/._LICENSE.txt b/._LICENSE.txt new file mode 100644 index 000..1dd305d Binary files /dev/null and b/._LICENSE.txt differ diff --git a/._MANIFEST.in b/._MANIFEST.in new file mode 100644 index 000..74268d9 Binary files /dev/null and b/._MANIFEST.in differ diff --git a/._README.txt b/._README.txt new file mode 100644 index 000..5881da3 Binary files /dev/null and b/._README.txt differ diff --git a/PKG-INFO b/PKG-INFO index ac76cbe..6764f2a 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.0.14 +Version: 1.0.15 Summary: Geospatial geometries, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/PKG-INFO b/Shapely.egg-info/PKG-INFO index ac76cbe..6764f2a 100644 --- a/Shapely.egg-info/PKG-INFO +++ b/Shapely.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.0.14 +Version: 1.0.15 Summary: Geospatial geometries, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/SOURCES.txt b/Shapely.egg-info/SOURCES.txt index 3784d1b..f13dc9e 100644 --- a/Shapely.egg-info/SOURCES.txt +++ b/Shapely.egg-info/SOURCES.txt @@ -6,7 +6,6 @@ LICENSE.txt MANIFEST.in README.txt setup.py -setup_windows.py Shapely.egg-info/PKG-INFO Shapely.egg-info/SOURCES.txt Shapely.egg-info/dependency_links.txt @@ -15,7 +14,6 @@ Shapely.egg-info/top_level.txt examples/geoms.py examples/world.py manual/manual.txt -manual/style.css shapely/__init__.py shapely/ctypes_declarations.py shapely/geos.py @@ -48,14 +46,9 @@ tests/Persist.txt tests/Point.txt tests/Polygon.txt tests/Predicates.txt -tests/__init__.py tests/attribute-chains.txt tests/binascii_hex.txt tests/dimensions.txt tests/invalid_intersection.txt tests/polygonize.txt -tests/rungrind.dist -tests/test_doctests.py -tests/test_threads.py -tests/valgrind-python.supp tests/wkt_locale.txt \ No newline at end of file diff --git a/Shapely.egg-info/requires.txt b/Shapely.egg-info/requires.txt index e0bd690..8b6d003 100644 --- a/Shapely.egg-info/requires.txt +++ b/Shapely.egg-info/requires.txt @@ -1,2 +1 @@ -setuptools -ctypes \ No newline at end of f
[python-shapely] 05/148: machine-parseable copyright
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit c65288bf00efbdfb9cb2d58a00b3d2d7ef02df0d Author: Pietro Battiston Date: Fri Apr 30 13:02:14 2010 +0200 machine-parseable copyright --- debian/copyright | 520 +++ 1 file changed, 251 insertions(+), 269 deletions(-) diff --git a/debian/copyright b/debian/copyright index 7313ecd..8ab7d2a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,269 +1,251 @@ -This package was debianized by Pietro Battiston on -Tue, 16 Dec 2008 22:35:31 +0100. - -It was downloaded from http://pypi.python.org/packages/source/S/Shapely/ - -Upstream Authors: - -Sean Gillies -(see /usr/share/doc/python-shapely/CREDITS.txt for full list). - -Copyright: - -Copyright (c) 2007, Sean C. Gillies - -License: - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -* Neither the name of Sean C. Gillies nor the names of - its contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - - -Exceptions -- - -File manual/manual.txt is Copyright (c) 2008, Sean C. Gillies, covered by a -Creative Commons Attribution 3.0 United States License: - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS -PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR -OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS -LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE -BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED -TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN -CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. - -1. Definitions - - a. "Collective Work" means a work, such as a periodical issue, anthology or - encyclopedia, in which the Work in its entirety in unmodified form, along - with one or more other contributions, constituting separate and independent - works in themselves, are assembled into a collective whole. A work that - constitutes a Collective Work will not be considered a Derivative Work (as - defined below) for the purposes of this License. - b. "Derivative Work" means a work based upon the Work or upon the Work and - other pre-existing works, such as a translation, musical arrangement, - dramatization, fictionalization, motion picture version, sound recording, - art reproduction, abridgment, condensation, or any other form in which the - Work may be recast, transformed, or adapted, except that a work that - constitutes a Collective Work will not be considered a Derivative Work for - the purpose of this License. For the avoidance of doubt, where the Work is a - musical composition or sound recording, the synchronization of the Work in - timed-relation with a moving image ("synching") will be considered a - Derivative Work for the purpose of this License. - c. "Licensor" means the individual, individuals, entity or entities that - offers the Work under the terms of this License. - d. "Original Author" means the individual, individuals, entity or entities - who created the Work. - e. "Work" means the copyrightable work of authorship offered under the terms - of this License. - f. "You" means an individual or entity exercising rights under this License - who has not previously violated the terms of this License with respect to the - Work, or who has received express permission from the Licensor to exercise - rights under this License despite a previous vio
[python-shapely] 13/148: Merge commit 'upstream/1.2.1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 2dfd5094b8b4df8789d1722d7f64be7ce7c8bddc Merge: b472fc4 0d70304 Author: Pietro Battiston Date: Thu Jun 24 15:04:08 2010 +0200 Merge commit 'upstream/1.2.1' ._CHANGES.txt | Bin 186 -> 0 bytes ._CREDITS.txt | Bin 185 -> 0 bytes ._HISTORY.txt | Bin 184 -> 0 bytes ._LICENSE.txt | Bin 184 -> 0 bytes ._MANIFEST.in | Bin 186 -> 0 bytes ._README.txt | Bin 187 -> 0 bytes CHANGES.txt | 89 ++- CREDITS.txt | 33 +- GEOS-C-API.txt| 55 -- HISTORY.txt | 24 - MANIFEST.in | 8 +- PKG-INFO | 201 +++-- README.txt| 191 +++-- Shapely.egg-info/PKG-INFO | 201 +++-- Shapely.egg-info/SOURCES.txt | 64 +- Shapely.egg-info/requires.txt | 1 - examples/._geoms.py | Bin 184 -> 0 bytes examples/._world.py | Bin 184 -> 0 bytes examples/dissolve.py | 53 ++ examples/geoms.py | 51 -- examples/intersect.py | 81 ++ examples/world.py | 21 - manual/manual.txt | 875 -- setup.py | 63 +- shapely/.___init__.py | Bin 185 -> 0 bytes shapely/._ctypes_declarations.py | Bin 187 -> 0 bytes shapely/._iterops.py | Bin 184 -> 0 bytes shapely/._ops.py | Bin 184 -> 0 bytes shapely/._predicates.py | Bin 186 -> 0 bytes shapely/._topology.py | Bin 187 -> 0 bytes shapely/._wkb.py | Bin 187 -> 0 bytes shapely/__init__.py | 2 +- shapely/coords.py | 167 + shapely/ctypes_declarations.py| 100 ++- shapely/geometry/._base.py| Bin 184 -> 0 bytes shapely/geometry/._linestring.py | Bin 184 -> 0 bytes shapely/geometry/__init__.py | 12 + shapely/geometry/base.py | 786 ++- shapely/geometry/collection.py| 16 +- shapely/geometry/geo.py | 8 +- shapely/geometry/linestring.py| 257 +++ shapely/geometry/multilinestring.py | 160 ++-- shapely/geometry/multipoint.py| 155 ++-- shapely/geometry/multipolygon.py | 153 ++-- shapely/geometry/point.py | 245 +++--- shapely/geometry/polygon.py | 450 ++- shapely/geometry/proxy.py | 32 +- shapely/geos.py | 296 +++- shapely/impl.py | 81 ++ shapely/iterops.py| 11 +- shapely/linref.py | 26 + shapely/ops.py| 110 ++- shapely/predicates.py | 81 +- shapely/prepared.py | 54 ++ {tests => shapely/tests}/Array.txt| 0 {tests => shapely/tests}/GeoInterface.txt | 0 {tests => shapely/tests}/IterOps.txt | 0 {tests => shapely/tests}/LineString.txt | 16 +- {tests => shapely/tests}/MultiLineString.txt | 19 +- {tests => shapely/tests}/MultiPoint.txt | 18 +- {tests => shapely/tests}/MultiPolygon.txt | 18 +- {tests => shapely/tests}/Operations.txt | 16 + {tests => shapely/tests}/Persist.txt | 0 {tests => shapely/tests}/Point.txt| 20 +- {tests => shapely/tests}/Polygon.txt | 10 +- {tests => shapely/tests}/Predicates.txt | 0 shapely/tests/__init__.py | 18 + {tests => shapely/tests}/attribute-chains.txt | 16 +- {tests => shapely/tests}/binascii_hex.txt | 0 shapely/tests/cascaded_union.txt | 24 + {tests => shapely/tests}/dimensions.txt | 0 {tests => shapely/tests}/invalid_intersection.txt | 6 +- shapely/tests/linear-referencing.txt | 58 ++ shapely/tests/linemerge.txt
[python-shapely] 06/148: standards version bump
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit fabf4140110381b932847953c753ce5a0aa56dad Author: Pietro Battiston Date: Fri Apr 30 14:20:36 2010 +0200 standards version bump --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 987f5d2..ebe4aae 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Pietro Battiston Build-Depends: debhelper (>= 7) Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6) -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 XS-Python-Version: >= 2.4 Homepage: http://trac.gispython.org/lab/wiki/Shapely -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 08/148: 1.0.15-1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 2821dfea1a080aae21b1b70d77ddef4fea99fbb3 Author: Pietro Battiston Date: Fri Apr 30 14:25:37 2010 +0200 1.0.15-1 --- debian/changelog | 8 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 41743a1..b637aa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-shapely (1.0.15-1) unstable; urgency=low + + * New upstream release (Closes: #577213) + * Switched to machine-readable debian/copyright + * Updated debian/control with standards version and VCS information + + -- Pietro Battiston Fri, 30 Apr 2010 12:24:27 +0200 + python-shapely (1.0.14-1) unstable; urgency=low * New upstream release -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 12/148: uversionmangle so that when I package Shapely 1.2*, it is not considered older than 1.2b*. Thanks Piotr
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit b472fc432a64fb1f22d6d9911cfdefab29a401c3 Author: Pietro Battiston Date: Mon May 3 20:59:47 2010 +0200 uversionmangle so that when I package Shapely 1.2*, it is not considered older than 1.2b*. Thanks Piotr --- debian/watch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index 58cc38b..a63f83e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ # Compulsory line, this is a version 3 file version=3 - +opts=uversionmangle=s/(a|b|rc)/~$1/ \ http://pypi.python.org/packages/source/S/Shapely/ Shapely-(.*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 11/148: debian/docs
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 0be9ab3969d0be82f5d51fe0d47d01f392d47be4 Author: Pietro Battiston Date: Sat May 1 15:01:46 2010 +0200 debian/docs --- debian/docs | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/docs b/debian/docs new file mode 100644 index 000..a5962e2 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +manual/manual.txt -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 10/148: dh 7.0 magic
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit fa32a58b5fc6ef95efb1a93ecdc2ba71c1b97873 Author: Pietro Battiston Date: Sat May 1 14:52:18 2010 +0200 dh 7.0 magic --- debian/rules | 42 ++ 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/debian/rules b/debian/rules index c09202d..706b324 100755 --- a/debian/rules +++ b/debian/rules @@ -1,41 +1,11 @@ #!/usr/bin/make -f # -*- makefile -*- -PACKAGE_NAME=python-shapely +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -build-arch: -build-indep: -build: build-arch build-indep +# This has to be exported to make some magic below work. +export DH_OPTIONS -clean: - dh_testdir - dh_testroot - find . -name '*\.pyc' -delete - rm -rf $(CURDIR)/build - dh_clean $(CURDIR)/Shapely.egg-info/SOURCES.txt - -install: - dh_testdir - dh_testroot - dh_installdirs - - python setup.py install --no-compile --root $(CURDIR)/debian/$(PACKAGE_NAME) - -binary-arch: -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs CHANGES.txt - dh_installdocs - dh_installexamples - dh_pysupport - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch - -.PHONY: build clean binary-indep binary-arch binary install build-arch build-indep build +%: + dh $@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 17/148: Merge commit 'upstream/1.2.1'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 11acd46833ca72688bd3dc13946b07d9b45c Merge: bd0b60a f0b2198 Author: Pietro Battiston Date: Thu Jun 24 16:16:32 2010 +0200 Merge commit 'upstream/1.2.1' MANIFEST.in |1 + Shapely.egg-info/SOURCES.txt |1 + docs/manual.txt | 1731 ++ 3 files changed, 1733 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 15/148: Packaging update patch from Sean Gillies - thanks
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 3607149ea3ae60c3a819d4f6aaa686a61c5dec43 Author: Pietro Battiston Date: Thu Jun 24 15:08:44 2010 +0200 Packaging update patch from Sean Gillies - thanks --- debian/changelog | 9 + debian/control | 16 debian/docs | 4 +++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index b637aa1..0b36be2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-shapely (1.2-1) unstable; urgency=low + + * New upstream release (Closes: ) + * Matched package description to upstream readme + * Indicate new upstream manual + * Mark depedence on Python >= 2.5 and GEOS >= 3.1 + + -- X + python-shapely (1.0.15-1) unstable; urgency=low * New upstream release (Closes: #577213) diff --git a/debian/control b/debian/control index 49ce654..5f9b8f3 100644 --- a/debian/control +++ b/debian/control @@ -5,22 +5,22 @@ Maintainer: Pietro Battiston Build-Depends: debhelper (>= 7) Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6) Standards-Version: 3.8.4 -XS-Python-Version: >= 2.4 +XS-Python-Version: >= 2.5 Homepage: http://trac.gispython.org/lab/wiki/Shapely Vcs-Browser: http://git.debian.org/?p=collab-maint/python-shapely.git Vcs-Git: git://git.debian.org/git/collab-maint/python-shapely.git Package: python-shapely Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python (>=2.5) | python-ctypes, libgeos-c1 (>= 2.3.3) +Depends: ${python:Depends}, ${misc:Depends}, python (>=2.5) | python-ctypes, libgeos-c1 (>= 3.1.0) Suggests: python-numpy Enhances: python-numpy XB-Python-Version: ${python:Versions} -Description: manipulation and analysis of 2D geospatial geometries - Shapely is a package for manipulation and analysis of 2D geospatial geometries. +Description: geometric objects, predicates, and operations + Shapely is a package for manipulation and analysis of 2D features. Its capabilities include: - * obtaining the unions, intersections, or differences of 2D shapes - * determining whether 2D shapes intersect, touch, or contain one another - and more. + * calculating the point set unions, intersections, or differences of features + * predicate tests on features: intersects, touches, contains, and more. . - Shapes can be points, polygonal chains or polygones. + Supported geometric types are points, line strings, linear rings, polygons, and + homogeneous or heterogeneous collections thereof. diff --git a/debian/docs b/debian/docs index a5962e2..eaa8129 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1,3 @@ -manual/manual.txt +README.txt +docs/manual.txt + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 22/148: Merge commit 'upstream/1.2.2'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit aca0a4a2701ed14c4957882f0a0ff117ba99f5a5 Merge: 8727ea9 ecf59da Author: Pietro Battiston Date: Sat Aug 14 22:39:40 2010 +0200 Merge commit 'upstream/1.2.2' CHANGES.txt| 4 +++ PKG-INFO | 2 +- Shapely.egg-info/PKG-INFO | 2 +- Shapely.egg-info/SOURCES.txt | 1 + docs/{ => _build/html/_sources}/manual.txt | 47 -- docs/manual.txt| 42 -- setup.py | 2 +- shapely/geometry/base.py | 6 +++- shapely/geos.py| 2 ++ shapely/impl.py| 21 + shapely/tests/Operations.txt | 3 +- 11 files changed, 116 insertions(+), 16 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 21/148: Run tests before building
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 8727ea95fb4bebbc775a1e2ef69173667a0017ef Author: Pietro Battiston Date: Mon Jun 28 15:31:45 2010 +0200 Run tests before building --- debian/rules | 5 + 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules index 706b324..c3e5c74 100755 --- a/debian/rules +++ b/debian/rules @@ -9,3 +9,8 @@ export DH_OPTIONS %: dh $@ + +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + python setup.py test +endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 26/148: Updated standards to 3.9.1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit ead6a6f0fd5bbcc154a9150f08b7f702ab5c0606 Author: Pietro Battiston Date: Tue Sep 14 11:10:58 2010 +0200 Updated standards to 3.9.1 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5f9b8f3..cd2f27a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Pietro Battiston Build-Depends: debhelper (>= 7) Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6) -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 Homepage: http://trac.gispython.org/lab/wiki/Shapely Vcs-Browser: http://git.debian.org/?p=collab-maint/python-shapely.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 27/148: Merge commit 'upstream/1.2.3'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 7fbf3960cb554c58bd92396e0481cada8567c109 Merge: ead6a6f 25b6849 Author: Pietro Battiston Date: Tue Sep 14 11:11:08 2010 +0200 Merge commit 'upstream/1.2.3' CHANGES.txt | 5 + PKG-INFO | 2 +- Shapely.egg-info/PKG-INFO| 2 +- Shapely.egg-info/SOURCES.txt | 1 + docs/_build/html/_sources/manual.txt | 35 +-- docs/manual.txt | 30 +- setup.py | 2 +- shapely/ctypes_declarations.py | 6 +++--- shapely/geometry/__init__.py | 4 ++-- shapely/geometry/base.py | 9 ++--- shapely/geometry/geo.py | 4 shapely/geos.py | 4 ++-- shapely/tests/__init__.py| 2 ++ shapely/tests/test_mapping.py| 11 +++ shapely/validation.py| 2 +- 15 files changed, 90 insertions(+), 29 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 23/148: Imported Upstream version 1.2.2
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit ecf59dae5942b44397ade569abd898293b7588a7 Author: Pietro Battiston Date: Sat Aug 14 22:39:40 2010 +0200 Imported Upstream version 1.2.2 --- CHANGES.txt| 4 +++ PKG-INFO | 2 +- Shapely.egg-info/PKG-INFO | 2 +- Shapely.egg-info/SOURCES.txt | 1 + docs/{ => _build/html/_sources}/manual.txt | 47 -- docs/manual.txt| 42 -- setup.py | 2 +- shapely/geometry/base.py | 6 +++- shapely/geos.py| 2 ++ shapely/impl.py| 21 + shapely/tests/Operations.txt | 3 +- 11 files changed, 116 insertions(+), 16 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 9e0bb95..1115aab 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,9 @@ All tickets are children of http://trac.gispython.org/lab/ticket. +1.2.2 (2010-07-23) +-- +- Add representative_point method. + 1.2.1 (2010-06-23) -- - Fixed bounds of singular polygons. diff --git a/PKG-INFO b/PKG-INFO index 38b4232..25d9b53 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.2.1 +Version: 1.2.2 Summary: Geometric objects, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/PKG-INFO b/Shapely.egg-info/PKG-INFO index 38b4232..25d9b53 100644 --- a/Shapely.egg-info/PKG-INFO +++ b/Shapely.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.2.1 +Version: 1.2.2 Summary: Geometric objects, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/SOURCES.txt b/Shapely.egg-info/SOURCES.txt index f3483a1..a6b5418 100644 --- a/Shapely.egg-info/SOURCES.txt +++ b/Shapely.egg-info/SOURCES.txt @@ -10,6 +10,7 @@ Shapely.egg-info/SOURCES.txt Shapely.egg-info/dependency_links.txt Shapely.egg-info/top_level.txt docs/manual.txt +docs/_build/html/_sources/manual.txt examples/dissolve.py examples/intersect.py shapely/__init__.py diff --git a/docs/manual.txt b/docs/_build/html/_sources/manual.txt similarity index 97% copy from docs/manual.txt copy to docs/_build/html/_sources/manual.txt index de2ec5b..4ebd883 100644 --- a/docs/manual.txt +++ b/docs/_build/html/_sources/manual.txt @@ -3,8 +3,8 @@ The Shapely 1.2 User Manual (Preview) = :Author: Sean Gillies, -:Revision: 1.2 -:Date: 24 May 2010 +:Revision: 1.2.1 +:Date: 13 July 2010 :Copyright: This work is licensed under a `Creative Commons Attribution 3.0 United States License`__. @@ -208,6 +208,27 @@ General Attributes and Methods >>> Point(0,0).distance(Point(1,1)) 1.4142135623730951 +.. method:: object.representative_point() + + Returns a cheaply computed point that is guaranteed to be within the + geometric object. + +.. note:: + This is not in the general the same as the centroid. + +.. sourcecode:: pycon + + >>> donut = Point(0, 0).buffer(2.0).difference(Point(0, 0).buffer(1.0)) + >>> donut.centroid.wkt + 'POINT (-0.0001 -0.)' + >>> donut.representative_point().wkt + 'POINT (-1.5000 0.)' + +.. sourcecode:: pycon + + >>> Point(0,0).distance(Point(1,1)) + 1.4142135623730951 + .. _points: Points @@ -1501,7 +1522,7 @@ first use the :func:`prepared.prep` function. .. sourcecode:: pycon >>> from shapely.geometry import Point - >>> from shapely.prepared import polyprep + >>> from shapely.prepared import prep >>> points = [...] # large list of points >>> polygon = Point(0.0, 0.0).buffer(1.0) >>> prepared_polygon = prep(polygon) @@ -1514,6 +1535,26 @@ Prepared geometries instances have the following methods: ``contains``, same arguments and usage as their counterparts in non-prepared geometric objects. +Diagnostics +--- + +.. function:: validation.explain_validity(ob): + + Returns a string explaining the validity or invalidity of the object. + + `New in version 1.2.1`. + +The messages may or may not have a representation of a problem point that can +be parsed out. + +.. sourcecode:: python + + >>> coords = [(0, 0), (0, 2), (1, 1), (2, 2), (2, 0), (1, 1), (0, 0)] + >>> p = Polygon(coords) + >>> from shapely.validation import explain_validity + >>> explain_validity(p) + 'Ring Self-intersection[1 1]' + Interoperation == diff --git a/docs/manual.txt b/docs/manual.txt index de2ec5b..350acc0 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -3,8 +3,8 @@ The Shapely 1.2 User Manual (Preview)
[python-shapely] 20/148: added debian/patches
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 032c83b8a55f141e93613206b42cb484009a0d2d Author: Pietro Battiston Date: Thu Jun 24 16:34:24 2010 +0200 added debian/patches --- debian/patches/do-not-install-examples-as-scripts | 18 ++ debian/patches/series | 1 + 2 files changed, 19 insertions(+) diff --git a/debian/patches/do-not-install-examples-as-scripts b/debian/patches/do-not-install-examples-as-scripts new file mode 100644 index 000..353b766 --- /dev/null +++ b/debian/patches/do-not-install-examples-as-scripts @@ -0,0 +1,18 @@ +Description: Do not install examples as scripts + Scripts in examples dir are already installed in + /usr/share/doc/python-shapely/examples + and should not be installed in /usr/bin. +Author: Pietro Battiston +Forwarded: yes + +--- python-shapely-1.2.1.orig/setup.py python-shapely-1.2.1/setup.py +@@ -29,7 +29,7 @@ setup_args = dict( + url = 'http://trac.gispython.org/lab/wiki/Shapely', + long_description= readme_text, + packages= ['shapely', 'shapely.geometry'], +-scripts = ['examples/dissolve.py', 'examples/intersect.py'], ++#scripts = ['examples/dissolve.py', 'examples/intersect.py'], + test_suite = 'shapely.tests.test_suite', + classifiers = [ + 'Development Status :: 5 - Production/Stable', diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..6d3430f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +do-not-install-examples-as-scripts -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 31/148: Removed useless changelog line
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit e178d6491c4ed3fff761f7e0045277cca05339ff Author: Pietro Battiston Date: Tue Sep 14 11:26:49 2010 +0200 Removed useless changelog line --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8af85f8..98d5ba8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ python-shapely (1.2.3-1) unstable; urgency=low * New upstream release (Closes: #590475) - * Removed non-working locale * Updated standards to 3.9.1 * Run tests, except wkt_locale which is broken. * Require newer version of debhelper to support override_dh_auto_test. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 35/148: Backported fixes from 1.2.3 manual
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 5ad0bc828b3105c663a3c9e85372d34f2ad64503 Author: Pietro Battiston Date: Tue Sep 14 18:30:08 2010 +0200 Backported fixes from 1.2.3 manual --- docs/manual.txt | 26 +++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/docs/manual.txt b/docs/manual.txt index de2ec5b..8ee83be 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -1366,8 +1366,8 @@ Figure 1. Convex hull (blue) of 2 points (left) and of 6 points (right). .. attribute:: object.envelope - Returns a representation of the point or smallest rectangular polygon that - contains the object. + Returns a representation of the point or smallest rectangular polygon (with + sides parallel to the coordinate axes) that contains the object. .. sourcecode:: pycon @@ -1501,7 +1501,7 @@ first use the :func:`prepared.prep` function. .. sourcecode:: pycon >>> from shapely.geometry import Point - >>> from shapely.prepared import polyprep + >>> from shapely.prepared import prep >>> points = [...] # large list of points >>> polygon = Point(0.0, 0.0).buffer(1.0) >>> prepared_polygon = prep(polygon) @@ -1514,6 +1514,26 @@ Prepared geometries instances have the following methods: ``contains``, same arguments and usage as their counterparts in non-prepared geometric objects. +Diagnostics +--- + +.. function:: validation.explain_validity(ob): + + Returns a string explaining the validity or invalidity of the object. + + `New in version 1.2.1`. + +The messages may or may not have a representation of a problem point that can +be parsed out. + +.. sourcecode:: python + + >>> coords = [(0, 0), (0, 2), (1, 1), (2, 2), (2, 0), (1, 1), (0, 0)] + >>> p = Polygon(coords) + >>> from shapely.validation import explain_validity + >>> explain_validity(p) + 'Ring Self-intersection[1 1]' + Interoperation == -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 16/148: Toward 1.2.1-1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit bd0b60ad0fe49cfe28f38e53ccbe6d60938b0074 Author: Pietro Battiston Date: Thu Jun 24 15:17:21 2010 +0200 Toward 1.2.1-1 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0b36be2..7aea12e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -python-shapely (1.2-1) unstable; urgency=low +python-shapely (1.2.1-1) unstable; urgency=low - * New upstream release (Closes: ) + * New upstream release * Matched package description to upstream readme * Indicate new upstream manual * Mark depedence on Python >= 2.5 and GEOS >= 3.1 - -- X + -- Pietro Battiston Fri, 24 Jun 2010 15:11:27 +0200 python-shapely (1.0.15-1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 29/148: 1.2.3-1 changelog
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit ce8474bf2f521cf6599c7eb9faab862158ee3c20 Author: Pietro Battiston Date: Tue Sep 14 11:18:11 2010 +0200 1.2.3-1 changelog --- debian/changelog | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 276d1ba..e4445f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -python-shapely (1.2.2-1) unstable; urgency=low +python-shapely (1.2.3-1) unstable; urgency=low - * Imported Upstream version 1.2.2 (Closes: #590475) - * Run tests, except the locale one. + * New upstream release (Closes: #590475) + * Removed non-working locale + * Updated standards to 3.9.1 + * Run tests, except wkt_locale which is broken. + + -- Pietro Battiston Tue, 14 Sep 2010 11:12:38 +0200 - -- Pietro Battiston Sat, 14 Aug 2010 22:40:04 +0200 python-shapely (1.2.1-1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 28/148: Imported Upstream version 1.2.3
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 25b6849ecebba82631c83dfc94994733aaa90a31 Author: Pietro Battiston Date: Tue Sep 14 11:11:08 2010 +0200 Imported Upstream version 1.2.3 --- CHANGES.txt | 5 + PKG-INFO | 2 +- Shapely.egg-info/PKG-INFO| 2 +- Shapely.egg-info/SOURCES.txt | 1 + docs/_build/html/_sources/manual.txt | 35 +-- docs/manual.txt | 30 +- setup.py | 2 +- shapely/ctypes_declarations.py | 6 +++--- shapely/geometry/__init__.py | 4 ++-- shapely/geometry/base.py | 9 ++--- shapely/geometry/geo.py | 4 shapely/geos.py | 4 ++-- shapely/tests/__init__.py| 2 ++ shapely/tests/test_mapping.py| 11 +++ shapely/validation.py| 2 +- 15 files changed, 90 insertions(+), 29 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 1115aab..95b6144 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,10 @@ All tickets are children of http://trac.gispython.org/lab/ticket. +1.2.3 (2010-08-17) +-- +- Add mapping function. +- Fix problem with GEOSisValidReason symbol for GEOS < 3.1. + 1.2.2 (2010-07-23) -- - Add representative_point method. diff --git a/PKG-INFO b/PKG-INFO index 25d9b53..d1567fe 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.2.2 +Version: 1.2.3 Summary: Geometric objects, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/PKG-INFO b/Shapely.egg-info/PKG-INFO index 25d9b53..d1567fe 100644 --- a/Shapely.egg-info/PKG-INFO +++ b/Shapely.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.2.2 +Version: 1.2.3 Summary: Geometric objects, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/SOURCES.txt b/Shapely.egg-info/SOURCES.txt index a6b5418..8674cb8 100644 --- a/Shapely.egg-info/SOURCES.txt +++ b/Shapely.egg-info/SOURCES.txt @@ -64,6 +64,7 @@ shapely/tests/test_doctests.py shapely/tests/test_emptiness.py shapely/tests/test_equality.py shapely/tests/test_geomseq.py +shapely/tests/test_mapping.py shapely/tests/test_prepared.py shapely/tests/test_singularity.py shapely/tests/test_validation.py diff --git a/docs/_build/html/_sources/manual.txt b/docs/_build/html/_sources/manual.txt index 4ebd883..dd6ee8d 100644 --- a/docs/_build/html/_sources/manual.txt +++ b/docs/_build/html/_sources/manual.txt @@ -3,8 +3,8 @@ The Shapely 1.2 User Manual (Preview) = :Author: Sean Gillies, -:Revision: 1.2.1 -:Date: 13 July 2010 +:Revision: 1.2.2 +:Date: 10 August 2010 :Copyright: This work is licensed under a `Creative Commons Attribution 3.0 United States License`__. @@ -214,7 +214,7 @@ General Attributes and Methods geometric object. .. note:: - This is not in the general the same as the centroid. + This is not in general the same as the centroid. .. sourcecode:: pycon @@ -224,11 +224,6 @@ General Attributes and Methods >>> donut.representative_point().wkt 'POINT (-1.5000 0.)' -.. sourcecode:: pycon - - >>> Point(0,0).distance(Point(1,1)) - 1.4142135623730951 - .. _points: Points @@ -1387,8 +1382,8 @@ Figure 1. Convex hull (blue) of 2 points (left) and of 6 points (right). .. attribute:: object.envelope - Returns a representation of the point or smallest rectangular polygon that - contains the object. + Returns a representation of the point or smallest rectangular polygon (with + sides parallel to the coordinate axes) that contains the object. .. sourcecode:: pycon @@ -1714,6 +1709,26 @@ Or a simple placemark-type object: >>> list(shape.coords) [(0.0, 0.0)] +The GeoJSON-like mapping of a geometric object can be obtained using +:func:`shapely.geometry.mapping`. + +.. function:: shapely.geometry.mapping(ob) + + Return a new, independent geometry with coordinates `copied` from the + context. + +For example, using the same `GeoThing` class: + +.. sourcecode:: pycon + + >>> from shapely.geometry import mapping + >>> thing = GeoThing({"type": "Point", "coordinates": (0.0, 0.0)}) + >>> m = mapping(thing) + >>> m['type'] + 'Point' + >>> m['coordinates'] + (0.0, 0.0)} + Conclusion == diff --git a/docs/manual.txt b/docs/manual.txt index 350acc0..dd6ee8d 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -3,8 +3,8 @@ The Shapely 1.2 User Manual (Preview) = :Author: Sean Gillies, -:Revision: 1.2.1 -:Date: 13 July 2010
[python-shapely] 25/148: Removed non-working locale
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit f04f99f9171d0a04fd618fb6a74464c6b7f23b19 Author: Pietro Battiston Date: Sat Aug 14 22:46:01 2010 +0200 Removed non-working locale --- shapely/tests/wkt_locale.txt | 28 1 file changed, 28 deletions(-) diff --git a/shapely/tests/wkt_locale.txt b/shapely/tests/wkt_locale.txt deleted file mode 100644 index ebbc024..000 --- a/shapely/tests/wkt_locale.txt +++ /dev/null @@ -1,28 +0,0 @@ -Test locale independence of WKT -=== - -Set locale to one that uses a comma as decimal seperator` - - >>> import locale, sys - >>> if sys.platform == 'win32': - ... _ = locale.setlocale(locale.LC_ALL, 'portuguese_brazil') - ... else: - ... _ = locale.setlocale(locale.LC_ALL, 'pt_BR.UTF-8') - -Test reading and writing` - - >>> from shapely.wkt import loads - >>> p = loads('POINT (0.0 0.0)') - >>> p.x == 0.0 - True - >>> p.y == 0.0 - True - >>> p.wkt - 'POINT (0.0...)' - >>> from shapely.wkt import dumps - >>> dumps(p) - 'POINT (0.0...)' - -Reset locale - - >>> _ = locale.setlocale(locale.LC_ALL, '') -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 19/148: Do not install examples (which are already installed as examples) in /usr/bin
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 6b50aa2b9ad9d23b126b97cbb2afa05852101efd Author: Pietro Battiston Date: Thu Jun 24 16:27:30 2010 +0200 Do not install examples (which are already installed as examples) in /usr/bin --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0ed51f1..c00bf64 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ setup_args = dict( url = 'http://trac.gispython.org/lab/wiki/Shapely', long_description= readme_text, packages= ['shapely', 'shapely.geometry'], -scripts = ['examples/dissolve.py', 'examples/intersect.py'], +#scripts = ['examples/dissolve.py', 'examples/intersect.py'], test_suite = 'shapely.tests.test_suite', classifiers = [ 'Development Status :: 5 - Production/Stable', -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 32/148: Revert "Removed non-working locale", do reintroduce patch as patch.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 40ba0a2ed80a61043ba36b0885e9ea981725c69c Author: Pietro Battiston Date: Tue Sep 14 12:05:57 2010 +0200 Revert "Removed non-working locale", do reintroduce patch as patch. This reverts commit f04f99f9171d0a04fd618fb6a74464c6b7f23b19. --- shapely/tests/wkt_locale.txt | 28 1 file changed, 28 insertions(+) diff --git a/shapely/tests/wkt_locale.txt b/shapely/tests/wkt_locale.txt new file mode 100644 index 000..ebbc024 --- /dev/null +++ b/shapely/tests/wkt_locale.txt @@ -0,0 +1,28 @@ +Test locale independence of WKT +=== + +Set locale to one that uses a comma as decimal seperator` + + >>> import locale, sys + >>> if sys.platform == 'win32': + ... _ = locale.setlocale(locale.LC_ALL, 'portuguese_brazil') + ... else: + ... _ = locale.setlocale(locale.LC_ALL, 'pt_BR.UTF-8') + +Test reading and writing` + + >>> from shapely.wkt import loads + >>> p = loads('POINT (0.0 0.0)') + >>> p.x == 0.0 + True + >>> p.y == 0.0 + True + >>> p.wkt + 'POINT (0.0...)' + >>> from shapely.wkt import dumps + >>> dumps(p) + 'POINT (0.0...)' + +Reset locale + + >>> _ = locale.setlocale(locale.LC_ALL, '') -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 33/148: Patch to disable broken test
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 17db760096807998f05c5b1c5e0d9c8764a767e1 Author: Pietro Battiston Date: Tue Sep 14 12:08:00 2010 +0200 Patch to disable broken test --- debian/patches/disable-broken-locale-test | 38 +++ debian/patches/series | 1 + 2 files changed, 39 insertions(+) diff --git a/debian/patches/disable-broken-locale-test b/debian/patches/disable-broken-locale-test new file mode 100644 index 000..58f37b3 --- /dev/null +++ b/debian/patches/disable-broken-locale-test @@ -0,0 +1,38 @@ +Description: The following test assumes that the locale "pt_BR.UTF-8" is +installed, and fails otherwise. Since there is no "non-trivial" locale which we +can assume is installed, the only way to fix this seems to disable it. +Forwarded, but upstream seems willing to not drop the test. +Author: Pietro Battiston +Forwarded: yes + +--- python-shapely.orig/shapely/tests/wkt_locale.txt 2010-09-14 11:43:00.0 +0200 /dev/null 1970-01-01 00:00:00.0 + +@@ -1,28 +0,0 @@ +-Test locale independence of WKT +-=== +- +-Set locale to one that uses a comma as decimal seperator` +- +- >>> import locale, sys +- >>> if sys.platform == 'win32': +- ... _ = locale.setlocale(locale.LC_ALL, 'portuguese_brazil') +- ... else: +- ... _ = locale.setlocale(locale.LC_ALL, 'pt_BR.UTF-8') +- +-Test reading and writing` +- +- >>> from shapely.wkt import loads +- >>> p = loads('POINT (0.0 0.0)') +- >>> p.x == 0.0 +- True +- >>> p.y == 0.0 +- True +- >>> p.wkt +- 'POINT (0.0...)' +- >>> from shapely.wkt import dumps +- >>> dumps(p) +- 'POINT (0.0...)' +- +-Reset locale +- +- >>> _ = locale.setlocale(locale.LC_ALL, '') diff --git a/debian/patches/series b/debian/patches/series index 6d3430f..73be9e9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +disable-broken-locale-test do-not-install-examples-as-scripts -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 24/148: 1.2.2-1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 65c52d9717633e242449f05f2d222a1ce57c4f4c Author: Pietro Battiston Date: Sat Aug 14 22:43:39 2010 +0200 1.2.2-1 --- debian/changelog | 7 +++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7aea12e..276d1ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-shapely (1.2.2-1) unstable; urgency=low + + * Imported Upstream version 1.2.2 (Closes: #590475) + * Run tests, except the locale one. + + -- Pietro Battiston Sat, 14 Aug 2010 22:40:04 +0200 + python-shapely (1.2.1-1) unstable; urgency=low * New upstream release -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 18/148: Imported Upstream version 1.2.1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit f0b21987b4d28f745d51be088a18274b1f104cfc Author: Pietro Battiston Date: Thu Jun 24 16:16:32 2010 +0200 Imported Upstream version 1.2.1 --- MANIFEST.in |1 + Shapely.egg-info/SOURCES.txt |1 + docs/manual.txt | 1731 ++ 3 files changed, 1733 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index c34208b..47f989e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,3 +4,4 @@ recursive-exclude debian * include CHANGES.txt CREDITS.txt LICENSE.txt README.txt recursive-include shapely/tests *.py *.txt recursive-include shapely/examples *.py +recursive-include docs manual.txt diff --git a/Shapely.egg-info/SOURCES.txt b/Shapely.egg-info/SOURCES.txt index 01c238d..f3483a1 100644 --- a/Shapely.egg-info/SOURCES.txt +++ b/Shapely.egg-info/SOURCES.txt @@ -9,6 +9,7 @@ Shapely.egg-info/PKG-INFO Shapely.egg-info/SOURCES.txt Shapely.egg-info/dependency_links.txt Shapely.egg-info/top_level.txt +docs/manual.txt examples/dissolve.py examples/intersect.py shapely/__init__.py diff --git a/docs/manual.txt b/docs/manual.txt new file mode 100644 index 000..de2ec5b --- /dev/null +++ b/docs/manual.txt @@ -0,0 +1,1731 @@ += +The Shapely 1.2 User Manual (Preview) += + +:Author: Sean Gillies, +:Revision: 1.2 +:Date: 24 May 2010 +:Copyright: + This work is licensed under a `Creative Commons Attribution 3.0 + United States License`__. + +.. __: http://creativecommons.org/licenses/by/3.0/us/ + +:Abstract: + This document explains how to use the Shapely Python package for + computational geometry. + +.. sectnum:: + +.. _intro: + +Introduction + + +Deterministic spatial analysis is an important component of computational +approaches to problems in agriculture, ecology, epidemiology, sociology, and +many other fields. What is the surveyed perimeter/area ratio of these patches +of animal habitat? Which properties in this town intersect with the 50-year +flood contour from this new flooding model? What are the extents of findspots +for ancient ceramic wares with maker's marks "A" and "B", and where do the +extents overlap? What's the path from home to office that best skirts +identified zones of location based spam? These are just a few of the possible +questions addressable using non-statistical spatial analysis, and more +specifically, computational geometry. + +Shapely is a Python package for set-theoretic analysis and manipulation of +planar features using (via Python's :mod:`ctypes` module) functions from the +well known and widely deployed GEOS_ library. GEOS, a port of the `Java +Topology Suite`_ (JTS), is the geometry engine of the PostGIS_ spatial +extension for the PostgreSQL RDBMS. The designs of JTS and GEOS are largely +guided by the `Open Geospatial Consortium`_'s Simple Features Access +Specification [1]_ and Shapely adheres mainly to the same set of standard +classes and operations. Shapely is thereby deeply rooted in the conventions of +the geographic information systems (GIS) world, but aspires to be equally +useful to programmers working on non-conventional problems. + +The first premise of Shapely is that Python programmers should be able to +perform PostGIS type geometry operations outside of an RDBMS. Not all +geographic data originate or reside in a RDBMS or are best processed using SQL. +We can load data into a spatial RDBMS to do work, but if there's no mandate to +manage (the "M" in "RDBMS") the data over time in the database we're using the +wrong tool for the job. The second premise is that the persistence, +serialization, and map projection of features are significant, but orthogonal +problems. You may not need a hundred GIS format readers and writers or the +multitude of State Plane projections, and Shapely doesn't burden you with them. +The third premise is that Python idioms trump GIS (or Java, in this case, since +the GEOS library is derived from JTS, a Java project) idioms. + +If you enjoy and profit from Python idioms, appreciate packages that do one +thing well, and agree that a spatially enabled RDBMS is often enough the wrong +tool for your computational geometry job, Shapely might be for you. + +.. _intro-spatial-data-model: + +Spatial Data Model +-- + +The fundamental types of geometric objects implemented by Shapely are points, +curves, and surfaces. Each is associated with three sets of (possibly infinite) +points in the plane. The `interior`, `boundary`, and `exterior` sets of a +feature are mutually exclusive and their union coincides with the entire plane +[2]_. + +* A `Point` has an `interior` set of exactly one point, a `boundary` set of + exactly no points, and an `exterior` set of all other points. A `Point` has + a topological dimension of 0.
[python-shapely] 41/148: ligeos in build-depends for tests
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 1760dd821ca9779266641a3283aacf94cff10bfb Author: Pietro Battiston Date: Thu Sep 16 07:29:39 2010 +0200 ligeos in build-depends for tests --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index dd78f43..4de3fca 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Pietro Battiston Build-Depends: debhelper (>= 7.0.50) -Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6) +Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6), libgeos-c1 (>= 3.1.0) Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 Homepage: http://trac.gispython.org/lab/wiki/Shapely -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 39/148: Backported fixes from 1.2.3 manual - patch
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit f03b888b5128ed16ee496e1843e846143a385fbb Author: Pietro Battiston Date: Tue Sep 14 19:13:21 2010 +0200 Backported fixes from 1.2.3 manual - patch --- debian/patches/manual-backported-fixes | 56 ++ debian/patches/series | 1 + 2 files changed, 57 insertions(+) diff --git a/debian/patches/manual-backported-fixes b/debian/patches/manual-backported-fixes new file mode 100644 index 000..01f445a --- /dev/null +++ b/debian/patches/manual-backported-fixes @@ -0,0 +1,56 @@ +Description: Backported fixes to manual. + The manual in 1.2.3 contains a couple of fixes, this patch applies + them to the 1.2.1 version. Notice that this doesn't make it identical + to the 1.2.3 version, which also documents new features. +Author: Pietro Battiston +Forwarded: not-needed + +--- python-shapely-1.2.1.orig/docs/manual.txt python-shapely-1.2.1/docs/manual.txt +@@ -1366,8 +1366,8 @@ Figure 1. Convex hull (blue) of 2 points + + .. attribute:: object.envelope + +- Returns a representation of the point or smallest rectangular polygon that +- contains the object. ++ Returns a representation of the point or smallest rectangular polygon (with ++ sides parallel to the coordinate axes) that contains the object. + + .. sourcecode:: pycon + +@@ -1501,7 +1501,7 @@ first use the :func:`prepared.prep` func + .. sourcecode:: pycon + + >>> from shapely.geometry import Point +- >>> from shapely.prepared import polyprep ++ >>> from shapely.prepared import prep + >>> points = [...] # large list of points + >>> polygon = Point(0.0, 0.0).buffer(1.0) + >>> prepared_polygon = prep(polygon) +@@ -1514,6 +1514,26 @@ Prepared geometries instances have the f + same arguments and usage as their counterparts in non-prepared geometric + objects. + ++Diagnostics ++--- ++ ++.. function:: validation.explain_validity(ob): ++ ++ Returns a string explaining the validity or invalidity of the object. ++ ++ `New in version 1.2.1`. ++ ++The messages may or may not have a representation of a problem point that can ++be parsed out. ++ ++.. sourcecode:: python ++ ++ >>> coords = [(0, 0), (0, 2), (1, 1), (2, 2), (2, 0), (1, 1), (0, 0)] ++ >>> p = Polygon(coords) ++ >>> from shapely.validation import explain_validity ++ >>> explain_validity(p) ++ 'Ring Self-intersection[1 1]' ++ + Interoperation + == + diff --git a/debian/patches/series b/debian/patches/series index 6d3430f..2f0d9f5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ do-not-install-examples-as-scripts +manual-backported-fixes -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 36/148: Run tests, except wkt_locale.txt which is broken.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit db8ae7b5ba0c7c8207e31db593ea00e23e2a122c Author: Pietro Battiston Date: Tue Sep 14 18:33:11 2010 +0200 Run tests, except wkt_locale.txt which is broken. --- debian/control | 2 +- debian/rules | 5 + shapely/tests/wkt_locale.txt | 28 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/debian/control b/debian/control index 5f9b8f3..dc7bf72 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: python-shapely Section: python Priority: optional Maintainer: Pietro Battiston -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper (>= 7.0.50) Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6) Standards-Version: 3.8.4 XS-Python-Version: >= 2.5 diff --git a/debian/rules b/debian/rules index 706b324..c3e5c74 100755 --- a/debian/rules +++ b/debian/rules @@ -9,3 +9,8 @@ export DH_OPTIONS %: dh $@ + +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + python setup.py test +endif diff --git a/shapely/tests/wkt_locale.txt b/shapely/tests/wkt_locale.txt deleted file mode 100644 index ebbc024..000 --- a/shapely/tests/wkt_locale.txt +++ /dev/null @@ -1,28 +0,0 @@ -Test locale independence of WKT -=== - -Set locale to one that uses a comma as decimal seperator` - - >>> import locale, sys - >>> if sys.platform == 'win32': - ... _ = locale.setlocale(locale.LC_ALL, 'portuguese_brazil') - ... else: - ... _ = locale.setlocale(locale.LC_ALL, 'pt_BR.UTF-8') - -Test reading and writing` - - >>> from shapely.wkt import loads - >>> p = loads('POINT (0.0 0.0)') - >>> p.x == 0.0 - True - >>> p.y == 0.0 - True - >>> p.wkt - 'POINT (0.0...)' - >>> from shapely.wkt import dumps - >>> dumps(p) - 'POINT (0.0...)' - -Reset locale - - >>> _ = locale.setlocale(locale.LC_ALL, '') -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 42/148: Added missing build-depends for tests
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit c20c7833711d0c6d145d5d976e274ce8533e7fed Author: Pietro Battiston Date: Thu Sep 16 23:15:54 2010 +0200 Added missing build-depends for tests --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 4de3fca..55b3cd6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Pietro Battiston Build-Depends: debhelper (>= 7.0.50) -Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6), libgeos-c1 (>= 3.1.0) +Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6), libgeos-c1 (>= 3.1.0), python-numpy, python (>=2.5) | python-ctypes Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 Homepage: http://trac.gispython.org/lab/wiki/Shapely -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 43/148: Merge "squeeze" in "master"
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit c4f5a196729a1f5650242762b750dd87583ab000 Merge: ed340e0 c20c783 Author: Pietro Battiston Date: Sun Sep 19 10:09:14 2010 +0200 Merge "squeeze" in "master" debian/changelog | 9 +++--- debian/control | 2 +- debian/patches/manual-backported-fixes | 56 ++ debian/patches/series | 2 ++ shapely/tests/wkt_locale.txt | 28 - 5 files changed, 63 insertions(+), 34 deletions(-) diff --cc debian/patches/series index 73be9e9,997cff1..0952ee5 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,2 -1,3 +1,4 @@@ +disable-broken-locale-test do-not-install-examples-as-scripts + manual-backported-fixes + disable-broken-locale-test -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 30/148: Require newer version of debhelper to support override_dh_auto_test
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit cd88cea7418ffb27475cba81663167257f4f3291 Author: Pietro Battiston Date: Tue Sep 14 11:21:39 2010 +0200 Require newer version of debhelper to support override_dh_auto_test --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e4445f1..8af85f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ python-shapely (1.2.3-1) unstable; urgency=low * Removed non-working locale * Updated standards to 3.9.1 * Run tests, except wkt_locale which is broken. + * Require newer version of debhelper to support override_dh_auto_test. -- Pietro Battiston Tue, 14 Sep 2010 11:12:38 +0200 diff --git a/debian/control b/debian/control index cd2f27a..dd78f43 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: python-shapely Section: python Priority: optional Maintainer: Pietro Battiston -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper (>= 7.0.50) Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6) Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 49/148: Removed double patch entry
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 623aa3848f62175eb824611fefe78a04a83bdc34 Author: Pietro Battiston Date: Sun Sep 19 10:59:07 2010 +0200 Removed double patch entry --- debian/patches/series | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/patches/series b/debian/patches/series index 15b5446..cdb00cc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -disable-broken-locale-test do-not-install-examples-as-scripts disable-broken-locale-test -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 46/148: 1.2.4
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 91899959eec70b7818897b84b1583d671c7aa552 Author: Pietro Battiston Date: Sun Sep 19 10:13:55 2010 +0200 1.2.4 --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c8d9211..9145f65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-shapely (1.2.4-1) experimental; urgency=low + + * New upstream release (Closes: #590475) + + -- Pietro Battiston Sun, 19 Sep 2010 10:11:40 +0200 + python-shapely (1.2.1-2) unstable; urgency=low * Fixes to manual from upstream version 1.2.3 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 50/148: patched typo in test
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit dcef951bdcb0bfcf5566ef563a89450e1ca7f6f3 Author: Pietro Battiston Date: Sun Sep 19 11:14:07 2010 +0200 patched typo in test --- debian/patches/series | 1 + debian/patches/typo-in-dll-test | 17 + 2 files changed, 18 insertions(+) diff --git a/debian/patches/series b/debian/patches/series index cdb00cc..68f9215 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ do-not-install-examples-as-scripts disable-broken-locale-test +typo-in-dll-test diff --git a/debian/patches/typo-in-dll-test b/debian/patches/typo-in-dll-test new file mode 100644 index 000..991a71c --- /dev/null +++ b/debian/patches/typo-in-dll-test @@ -0,0 +1,17 @@ +Description: Typo in test_dlls.py + The following test has a typo, which makes it fail, and which I + thereby fix. +Author: Pietro Battiston +Forwarded: yes + +--- python-shapely-1.2.4.orig/shapely/tests/test_dlls.py python-shapely-1.2.4/shapely/tests/test_dlls.py +@@ -8,7 +8,7 @@ class LoadingTestCase(unittest.TestCase) + def test_load(self): + self.assertRaises(OSError, load_dll, 'geosh_c') + def test_fallbacks(self): +-a = load_dll('geosh_c', fallbacks=['/opt/local/lib/libgeos_c.dylib']) ++a = load_dll('geos_c', fallbacks=['/opt/local/lib/libgeos_c.dylib']) + + def test_suite(): + return unittest.TestLoader().loadTestsFromTestCase(LoadingTestCase) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 55/148: Updated email address
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 48984c1eabcb5caf4aa0c63fbb0055f1a87deda0 Author: Pietro Battiston Date: Fri Feb 11 11:57:39 2011 +0100 Updated email address --- debian/control| 2 +- debian/patches/disable-broken-locale-test | 2 +- debian/patches/do-not-install-examples-as-scripts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 55b3cd6..9441107 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: python-shapely Section: python Priority: optional -Maintainer: Pietro Battiston +Maintainer: Pietro Battiston Build-Depends: debhelper (>= 7.0.50) Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6), libgeos-c1 (>= 3.1.0), python-numpy, python (>=2.5) | python-ctypes Standards-Version: 3.9.1 diff --git a/debian/patches/disable-broken-locale-test b/debian/patches/disable-broken-locale-test index 58f37b3..8e0e7ab 100644 --- a/debian/patches/disable-broken-locale-test +++ b/debian/patches/disable-broken-locale-test @@ -2,7 +2,7 @@ Description: The following test assumes that the locale "pt_BR.UTF-8" is installed, and fails otherwise. Since there is no "non-trivial" locale which we can assume is installed, the only way to fix this seems to disable it. Forwarded, but upstream seems willing to not drop the test. -Author: Pietro Battiston +Author: Pietro Battiston Forwarded: yes --- python-shapely.orig/shapely/tests/wkt_locale.txt 2010-09-14 11:43:00.0 +0200 diff --git a/debian/patches/do-not-install-examples-as-scripts b/debian/patches/do-not-install-examples-as-scripts index 353b766..2d5e25a 100644 --- a/debian/patches/do-not-install-examples-as-scripts +++ b/debian/patches/do-not-install-examples-as-scripts @@ -2,7 +2,7 @@ Description: Do not install examples as scripts Scripts in examples dir are already installed in /usr/share/doc/python-shapely/examples and should not be installed in /usr/bin. -Author: Pietro Battiston +Author: Pietro Battiston Forwarded: yes --- python-shapely-1.2.1.orig/setup.py -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 37/148: Standards-Version: 3.9.1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 2a91e59e582191733b790834d9a78e91105c50cc Author: Pietro Battiston Date: Tue Sep 14 18:36:40 2010 +0200 Standards-Version: 3.9.1 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index dc7bf72..dd78f43 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Pietro Battiston Build-Depends: debhelper (>= 7.0.50) Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6) -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 Homepage: http://trac.gispython.org/lab/wiki/Shapely Vcs-Browser: http://git.debian.org/?p=collab-maint/python-shapely.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 52/148: Imported Upstream version 1.2.8
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 781d44b8fffd6c6887a9605411840d12fa907c69 Author: Pietro Battiston Date: Fri Feb 11 11:17:23 2011 +0100 Imported Upstream version 1.2.8 --- CHANGES.txt | 25 +- MANIFEST.in |7 - PKG-INFO |2 +- Shapely.egg-info/PKG-INFO|2 +- Shapely.egg-info/SOURCES.txt |6 +- docs/_build/html/_sources/manual.txt | 1789 -- docs/manual.txt | 14 +- setup.py | 15 +- shapely/ctypes_declarations.py |3 + shapely/ftools.py| 78 ++ shapely/geometry/base.py | 14 +- shapely/geometry/collection.py |5 +- shapely/geometry/linestring.py | 33 +- shapely/geometry/polygon.py | 10 +- shapely/geos.py | 13 +- shapely/impl.py |5 +- shapely/tests/__init__.py|5 +- shapely/tests/cascaded_union.txt |2 +- shapely/tests/linear-referencing.txt | 58 - shapely/tests/test_collection.py |1 + shapely/tests/test_delegated.py |8 +- shapely/tests/test_dlls.py |5 +- shapely/tests/test_linear_referencing.py | 67 ++ shapely/tests/test_products_z.py | 14 + 24 files changed, 285 insertions(+), 1896 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index b006bbc..eefb494 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,11 +1,30 @@ -All tickets are children of http://trac.gispython.org/lab/ticket. +1.2.8 (2011-12-03) +-- +- New parallel_offset method (#6). +- Support for Python 2.4. + +1.2.7 (2010-11-05) +-- +- Support for Windows eggs. + +1.2.6 (2010-10-21) +-- +- The geoms property of an empty collection yields [] instead of a ValueError + (#3). +- The coords and geometry type sproperties have the same behavior as above. +- Ensure that z values carry through into products of operations (#4). + +1.2.5 (2010-09-19) +-- +- Stop distributing docs/_build. +- Include library fallbacks in test_dlls.py for linux platform. 1.2.4 (2010-09-09) -- - Raise AttributeError when there's no backend support for a method. - Raise OSError if libgeos_c.so (or variants) can't be found and loaded. -- Add geos_c DLL loading support for linux platforms where find_library - doesn't work. +- Add geos_c DLL loading support for linux platforms where find_library doesn't + work. 1.2.3 (2010-08-17) -- diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 47f989e..000 --- a/MANIFEST.in +++ /dev/null @@ -1,7 +0,0 @@ -exclude *.txt -recursive-exclude manual * -recursive-exclude debian * -include CHANGES.txt CREDITS.txt LICENSE.txt README.txt -recursive-include shapely/tests *.py *.txt -recursive-include shapely/examples *.py -recursive-include docs manual.txt diff --git a/PKG-INFO b/PKG-INFO index e881ef0..db7cc87 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.2.4 +Version: 1.2.8 Summary: Geometric objects, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/PKG-INFO b/Shapely.egg-info/PKG-INFO index e881ef0..db7cc87 100644 --- a/Shapely.egg-info/PKG-INFO +++ b/Shapely.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.2.4 +Version: 1.2.8 Summary: Geometric objects, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/SOURCES.txt b/Shapely.egg-info/SOURCES.txt index d0a387c..b4200b7 100644 --- a/Shapely.egg-info/SOURCES.txt +++ b/Shapely.egg-info/SOURCES.txt @@ -1,7 +1,6 @@ CHANGES.txt CREDITS.txt LICENSE.txt -MANIFEST.in README.txt setup.cfg setup.py @@ -10,12 +9,12 @@ Shapely.egg-info/SOURCES.txt Shapely.egg-info/dependency_links.txt Shapely.egg-info/top_level.txt docs/manual.txt -docs/_build/html/_sources/manual.txt examples/dissolve.py examples/intersect.py shapely/__init__.py shapely/coords.py shapely/ctypes_declarations.py +shapely/ftools.py shapely/geos.py shapely/impl.py shapely/iterops.py @@ -56,7 +55,6 @@ shapely/tests/binascii_hex.txt shapely/tests/cascaded_union.txt shapely/tests/dimensions.txt shapely/tests/invalid_intersection.txt -shapely/tests/linear-referencing.txt shapely/tests/linemerge.txt shapely/tests/polygonize.txt shapely/tests/test_collection.py @@ -66,8 +64,10 @@ shapely/tests/test_doctests.py shapely/tests/test_emptiness.py shapely/tests/test_equality.py shapely/tests/test_geomseq.py +shapely/tests/test_linear_referencing.py
[python-shapely] 54/148: Remove obsolete patch "typo-in-dll-test".
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 7895b9d7c5b3be445e8ff45f7404fde9f238fc11 Author: Pietro Battiston Date: Fri Feb 11 11:26:59 2011 +0100 Remove obsolete patch "typo-in-dll-test". --- debian/patches/series | 1 - debian/patches/typo-in-dll-test | 17 - 2 files changed, 18 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 68f9215..cdb00cc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ do-not-install-examples-as-scripts disable-broken-locale-test -typo-in-dll-test diff --git a/debian/patches/typo-in-dll-test b/debian/patches/typo-in-dll-test deleted file mode 100644 index 991a71c..000 --- a/debian/patches/typo-in-dll-test +++ /dev/null @@ -1,17 +0,0 @@ -Description: Typo in test_dlls.py - The following test has a typo, which makes it fail, and which I - thereby fix. -Author: Pietro Battiston -Forwarded: yes - python-shapely-1.2.4.orig/shapely/tests/test_dlls.py -+++ python-shapely-1.2.4/shapely/tests/test_dlls.py -@@ -8,7 +8,7 @@ class LoadingTestCase(unittest.TestCase) - def test_load(self): - self.assertRaises(OSError, load_dll, 'geosh_c') - def test_fallbacks(self): --a = load_dll('geosh_c', fallbacks=['/opt/local/lib/libgeos_c.dylib']) -+a = load_dll('geos_c', fallbacks=['/opt/local/lib/libgeos_c.dylib']) - - def test_suite(): - return unittest.TestLoader().loadTestsFromTestCase(LoadingTestCase) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 48/148: The non-run test _must_ still be there...
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 689cfb1cfc4c2bd6082564cce647bfbd6a8382a7 Author: Pietro Battiston Date: Sun Sep 19 10:54:04 2010 +0200 The non-run test _must_ still be there... --- shapely/tests/wkt_locale.txt | 28 1 file changed, 28 insertions(+) diff --git a/shapely/tests/wkt_locale.txt b/shapely/tests/wkt_locale.txt new file mode 100644 index 000..ebbc024 --- /dev/null +++ b/shapely/tests/wkt_locale.txt @@ -0,0 +1,28 @@ +Test locale independence of WKT +=== + +Set locale to one that uses a comma as decimal seperator` + + >>> import locale, sys + >>> if sys.platform == 'win32': + ... _ = locale.setlocale(locale.LC_ALL, 'portuguese_brazil') + ... else: + ... _ = locale.setlocale(locale.LC_ALL, 'pt_BR.UTF-8') + +Test reading and writing` + + >>> from shapely.wkt import loads + >>> p = loads('POINT (0.0 0.0)') + >>> p.x == 0.0 + True + >>> p.y == 0.0 + True + >>> p.wkt + 'POINT (0.0...)' + >>> from shapely.wkt import dumps + >>> dumps(p) + 'POINT (0.0...)' + +Reset locale + + >>> _ = locale.setlocale(locale.LC_ALL, '') -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 47/148: Removed patch for manual
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 7272fb479d837aff71986f6340fcf7a10ea54f8b Author: Pietro Battiston Date: Sun Sep 19 10:14:57 2010 +0200 Removed patch for manual --- debian/patches/manual-backported-fixes | 56 -- debian/patches/series | 1 - 2 files changed, 57 deletions(-) diff --git a/debian/patches/manual-backported-fixes b/debian/patches/manual-backported-fixes deleted file mode 100644 index 01f445a..000 --- a/debian/patches/manual-backported-fixes +++ /dev/null @@ -1,56 +0,0 @@ -Description: Backported fixes to manual. - The manual in 1.2.3 contains a couple of fixes, this patch applies - them to the 1.2.1 version. Notice that this doesn't make it identical - to the 1.2.3 version, which also documents new features. -Author: Pietro Battiston -Forwarded: not-needed - python-shapely-1.2.1.orig/docs/manual.txt -+++ python-shapely-1.2.1/docs/manual.txt -@@ -1366,8 +1366,8 @@ Figure 1. Convex hull (blue) of 2 points - - .. attribute:: object.envelope - -- Returns a representation of the point or smallest rectangular polygon that -- contains the object. -+ Returns a representation of the point or smallest rectangular polygon (with -+ sides parallel to the coordinate axes) that contains the object. - - .. sourcecode:: pycon - -@@ -1501,7 +1501,7 @@ first use the :func:`prepared.prep` func - .. sourcecode:: pycon - - >>> from shapely.geometry import Point -- >>> from shapely.prepared import polyprep -+ >>> from shapely.prepared import prep - >>> points = [...] # large list of points - >>> polygon = Point(0.0, 0.0).buffer(1.0) - >>> prepared_polygon = prep(polygon) -@@ -1514,6 +1514,26 @@ Prepared geometries instances have the f - same arguments and usage as their counterparts in non-prepared geometric - objects. - -+Diagnostics -+--- -+ -+.. function:: validation.explain_validity(ob): -+ -+ Returns a string explaining the validity or invalidity of the object. -+ -+ `New in version 1.2.1`. -+ -+The messages may or may not have a representation of a problem point that can -+be parsed out. -+ -+.. sourcecode:: python -+ -+ >>> coords = [(0, 0), (0, 2), (1, 1), (2, 2), (2, 0), (1, 1), (0, 0)] -+ >>> p = Polygon(coords) -+ >>> from shapely.validation import explain_validity -+ >>> explain_validity(p) -+ 'Ring Self-intersection[1 1]' -+ - Interoperation - == - diff --git a/debian/patches/series b/debian/patches/series index 0952ee5..15b5446 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ disable-broken-locale-test do-not-install-examples-as-scripts -manual-backported-fixes disable-broken-locale-test -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 45/148: Imported Upstream version 1.2.4
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 1557f80198839c56190b5ada745ad1ee605955b2 Author: Pietro Battiston Date: Sun Sep 19 10:10:19 2010 +0200 Imported Upstream version 1.2.4 --- CHANGES.txt | 7 + PKG-INFO | 2 +- Shapely.egg-info/PKG-INFO| 2 +- Shapely.egg-info/SOURCES.txt | 2 ++ docs/_build/html/_sources/manual.txt | 6 ++-- docs/manual.txt | 6 ++-- setup.py | 2 +- shapely/geometry/base.py | 8 +++-- shapely/geos.py | 60 shapely/impl.py | 28 - shapely/prepared.py | 8 +++-- shapely/tests/__init__.py| 4 ++- shapely/tests/test_delegated.py | 22 + shapely/tests/test_dlls.py | 14 + 14 files changed, 125 insertions(+), 46 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 95b6144..b006bbc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,12 @@ All tickets are children of http://trac.gispython.org/lab/ticket. +1.2.4 (2010-09-09) +-- +- Raise AttributeError when there's no backend support for a method. +- Raise OSError if libgeos_c.so (or variants) can't be found and loaded. +- Add geos_c DLL loading support for linux platforms where find_library + doesn't work. + 1.2.3 (2010-08-17) -- - Add mapping function. diff --git a/PKG-INFO b/PKG-INFO index d1567fe..e881ef0 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.2.3 +Version: 1.2.4 Summary: Geometric objects, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/PKG-INFO b/Shapely.egg-info/PKG-INFO index d1567fe..e881ef0 100644 --- a/Shapely.egg-info/PKG-INFO +++ b/Shapely.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.2.3 +Version: 1.2.4 Summary: Geometric objects, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/SOURCES.txt b/Shapely.egg-info/SOURCES.txt index 8674cb8..d0a387c 100644 --- a/Shapely.egg-info/SOURCES.txt +++ b/Shapely.egg-info/SOURCES.txt @@ -60,6 +60,8 @@ shapely/tests/linear-referencing.txt shapely/tests/linemerge.txt shapely/tests/polygonize.txt shapely/tests/test_collection.py +shapely/tests/test_delegated.py +shapely/tests/test_dlls.py shapely/tests/test_doctests.py shapely/tests/test_emptiness.py shapely/tests/test_equality.py diff --git a/docs/_build/html/_sources/manual.txt b/docs/_build/html/_sources/manual.txt index dd6ee8d..9025c9c 100644 --- a/docs/_build/html/_sources/manual.txt +++ b/docs/_build/html/_sources/manual.txt @@ -3,8 +3,8 @@ The Shapely 1.2 User Manual (Preview) = :Author: Sean Gillies, -:Revision: 1.2.2 -:Date: 10 August 2010 +:Revision: 1.2.3 +:Date: 19 August 2010 :Copyright: This work is licensed under a `Creative Commons Attribution 3.0 United States License`__. @@ -1717,6 +1717,8 @@ The GeoJSON-like mapping of a geometric object can be obtained using Return a new, independent geometry with coordinates `copied` from the context. + `New in version 1.2.3`. + For example, using the same `GeoThing` class: .. sourcecode:: pycon diff --git a/docs/manual.txt b/docs/manual.txt index dd6ee8d..9025c9c 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -3,8 +3,8 @@ The Shapely 1.2 User Manual (Preview) = :Author: Sean Gillies, -:Revision: 1.2.2 -:Date: 10 August 2010 +:Revision: 1.2.3 +:Date: 19 August 2010 :Copyright: This work is licensed under a `Creative Commons Attribution 3.0 United States License`__. @@ -1717,6 +1717,8 @@ The GeoJSON-like mapping of a geometric object can be obtained using Return a new, independent geometry with coordinates `copied` from the context. + `New in version 1.2.3`. + For example, using the same `GeoThing` class: .. sourcecode:: pycon diff --git a/setup.py b/setup.py index 00ad9b1..494211e 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ readme_text = file('README.txt', 'rb').read() setup_args = dict( metadata_version= '1.2', name= 'Shapely', -version = '1.2.3', +version = '1.2.4', requires_python = '>=2.5,<3', requires_external = 'libgeos_c (>=3.1)', description = 'Geometric objects, predicates, and operations', diff --git a/shapely/geometry/base.py b/shapely/geometry/base.py index ee1db9f..e6e6fee 100644 --- a/shapely/geometry/base.py +++ b/shapely/geometry/base.py @@ -7,7 +7,7 @@ import warnings from shapely.coords import
[python-shapely] 57/148: Suggest python-matplotlib (used in example scripts)
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit fd5b2d9ff75576709e6aac8b9cf666ff14bd2108 Author: Pietro Battiston Date: Fri Feb 11 12:30:59 2011 +0100 Suggest python-matplotlib (used in example scripts) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 44db31a..4f4b58d 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Vcs-Git: git://git.debian.org/git/collab-maint/python-shapely.git Package: python-shapely Architecture: all Depends: ${python:Depends}, ${misc:Depends}, python (>=2.5) | python-ctypes, libgeos-c1 (>= 3.1.0) -Suggests: python-numpy +Suggests: python-numpy, python-matplotlib Enhances: python-numpy XB-Python-Version: ${python:Versions} Description: geometric objects, predicates, and operations -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 56/148: Use dh_python2
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 08e507bbfa20fab60796fa9310328d826b04b957 Author: Pietro Battiston Date: Fri Feb 11 12:13:13 2011 +0100 Use dh_python2 --- debian/control | 2 +- debian/rules | 5 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 9441107..44db31a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Pietro Battiston Build-Depends: debhelper (>= 7.0.50) -Build-Depends-Indep: python-setuptools (>= 0.6), python-support (>= 0.6), libgeos-c1 (>= 3.1.0), python-numpy, python (>=2.5) | python-ctypes +Build-Depends-Indep: python-setuptools (>= 0.6), libgeos-c1 (>= 3.1.0), python-numpy, python (>=2.5) | python-ctypes Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 Homepage: http://trac.gispython.org/lab/wiki/Shapely diff --git a/debian/rules b/debian/rules index c3e5c74..69bcfca 100755 --- a/debian/rules +++ b/debian/rules @@ -4,11 +4,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This has to be exported to make some magic below work. -export DH_OPTIONS - %: - dh $@ + dh $@ --with python2 override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 60/148: Removed spurious changelog entry
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 37b5515c72c6af0a89ba2010b514eb0c1f1b88a2 Author: Pietro Battiston Date: Mon Feb 14 23:41:54 2011 +0100 Removed spurious changelog entry --- CHANGES.txt | 7 --- 1 file changed, 7 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 3684109..eefb494 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -26,13 +26,6 @@ - Add geos_c DLL loading support for linux platforms where find_library doesn't work. -1.2.4 (2010-09-09) --- -- Raise AttributeError when there's no backend support for a method. -- Raise OSError if libgeos_c.so (or variants) can't be found and loaded. -- Add geos_c DLL loading support for linux platforms where find_library - doesn't work. - 1.2.3 (2010-08-17) -- - Add mapping function. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 59/148: dh_python2 migration leftovers
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit d402565f7d79009246d60f290811c0d4a58526fb Author: Pietro Battiston Date: Mon Feb 14 12:59:13 2011 +0100 dh_python2 migration leftovers --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 4f4b58d..fa30d17 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: python Priority: optional Maintainer: Pietro Battiston Build-Depends: debhelper (>= 7.0.50) -Build-Depends-Indep: python-setuptools (>= 0.6), libgeos-c1 (>= 3.1.0), python-numpy, python (>=2.5) | python-ctypes +Build-Depends-Indep: python-setuptools (>= 0.6), libgeos-c1 (>= 3.1.0), python-numpy, python (>= 2.6.6-3) Standards-Version: 3.9.1 -XS-Python-Version: >= 2.5 +X-Python-Version: >= 2.5 Homepage: http://trac.gispython.org/lab/wiki/Shapely Vcs-Browser: http://git.debian.org/?p=collab-maint/python-shapely.git Vcs-Git: git://git.debian.org/git/collab-maint/python-shapely.git @@ -15,7 +15,7 @@ Architecture: all Depends: ${python:Depends}, ${misc:Depends}, python (>=2.5) | python-ctypes, libgeos-c1 (>= 3.1.0) Suggests: python-numpy, python-matplotlib Enhances: python-numpy -XB-Python-Version: ${python:Versions} +Breaks: ${python:Breaks} Description: geometric objects, predicates, and operations Shapely is a package for manipulation and analysis of 2D features. Its capabilities include: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 51/148: Updated copyright format & my email
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 350cd2268783edc630c178c032db0adbb9431402 Author: Pietro Battiston Date: Wed Jan 26 07:27:06 2011 +0100 Updated copyright format & my email --- debian/copyright | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/copyright b/debian/copyright index 8ab7d2a..91f394d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op-file&rev=135 -Name: Shapely -Maintainer: Pietro Battiston +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 +Upstream-Name: Shapely +Upstream-Contact: Gis Python community list Source: http://pypi.python.org/packages/source/S/Shapely/ Files: * @@ -32,7 +32,7 @@ License: BSD POSSIBILITY OF SUCH DAMAGE. Files: debian/* -Copyright: © 2010 Pietro Battiston +Copyright: © 2010 Pietro Battiston License: GPL-3 This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 44/148: Imported Upstream version 1.2.4
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 3d1a23f7c8bf8b29ffe9bf4ff2b1d1594b506de8 Author: Pietro Battiston Date: Sun Sep 19 10:10:19 2010 +0200 Imported Upstream version 1.2.4 --- CHANGES.txt | 7 + PKG-INFO | 2 +- Shapely.egg-info/PKG-INFO| 2 +- Shapely.egg-info/SOURCES.txt | 2 ++ docs/_build/html/_sources/manual.txt | 6 ++-- docs/manual.txt | 6 ++-- setup.py | 2 +- shapely/geometry/base.py | 8 +++-- shapely/geos.py | 60 shapely/impl.py | 28 - shapely/prepared.py | 8 +++-- shapely/tests/__init__.py| 4 ++- shapely/tests/test_delegated.py | 22 + shapely/tests/test_dlls.py | 14 + 14 files changed, 125 insertions(+), 46 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 95b6144..b006bbc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,12 @@ All tickets are children of http://trac.gispython.org/lab/ticket. +1.2.4 (2010-09-09) +-- +- Raise AttributeError when there's no backend support for a method. +- Raise OSError if libgeos_c.so (or variants) can't be found and loaded. +- Add geos_c DLL loading support for linux platforms where find_library + doesn't work. + 1.2.3 (2010-08-17) -- - Add mapping function. diff --git a/PKG-INFO b/PKG-INFO index d1567fe..e881ef0 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.2.3 +Version: 1.2.4 Summary: Geometric objects, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/PKG-INFO b/Shapely.egg-info/PKG-INFO index d1567fe..e881ef0 100644 --- a/Shapely.egg-info/PKG-INFO +++ b/Shapely.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.2.3 +Version: 1.2.4 Summary: Geometric objects, predicates, and operations Home-page: http://trac.gispython.org/lab/wiki/Shapely Author: Sean Gillies diff --git a/Shapely.egg-info/SOURCES.txt b/Shapely.egg-info/SOURCES.txt index 8674cb8..d0a387c 100644 --- a/Shapely.egg-info/SOURCES.txt +++ b/Shapely.egg-info/SOURCES.txt @@ -60,6 +60,8 @@ shapely/tests/linear-referencing.txt shapely/tests/linemerge.txt shapely/tests/polygonize.txt shapely/tests/test_collection.py +shapely/tests/test_delegated.py +shapely/tests/test_dlls.py shapely/tests/test_doctests.py shapely/tests/test_emptiness.py shapely/tests/test_equality.py diff --git a/docs/_build/html/_sources/manual.txt b/docs/_build/html/_sources/manual.txt index dd6ee8d..9025c9c 100644 --- a/docs/_build/html/_sources/manual.txt +++ b/docs/_build/html/_sources/manual.txt @@ -3,8 +3,8 @@ The Shapely 1.2 User Manual (Preview) = :Author: Sean Gillies, -:Revision: 1.2.2 -:Date: 10 August 2010 +:Revision: 1.2.3 +:Date: 19 August 2010 :Copyright: This work is licensed under a `Creative Commons Attribution 3.0 United States License`__. @@ -1717,6 +1717,8 @@ The GeoJSON-like mapping of a geometric object can be obtained using Return a new, independent geometry with coordinates `copied` from the context. + `New in version 1.2.3`. + For example, using the same `GeoThing` class: .. sourcecode:: pycon diff --git a/docs/manual.txt b/docs/manual.txt index dd6ee8d..9025c9c 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -3,8 +3,8 @@ The Shapely 1.2 User Manual (Preview) = :Author: Sean Gillies, -:Revision: 1.2.2 -:Date: 10 August 2010 +:Revision: 1.2.3 +:Date: 19 August 2010 :Copyright: This work is licensed under a `Creative Commons Attribution 3.0 United States License`__. @@ -1717,6 +1717,8 @@ The GeoJSON-like mapping of a geometric object can be obtained using Return a new, independent geometry with coordinates `copied` from the context. + `New in version 1.2.3`. + For example, using the same `GeoThing` class: .. sourcecode:: pycon diff --git a/setup.py b/setup.py index 00ad9b1..494211e 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ readme_text = file('README.txt', 'rb').read() setup_args = dict( metadata_version= '1.2', name= 'Shapely', -version = '1.2.3', +version = '1.2.4', requires_python = '>=2.5,<3', requires_external = 'libgeos_c (>=3.1)', description = 'Geometric objects, predicates, and operations', diff --git a/shapely/geometry/base.py b/shapely/geometry/base.py index ee1db9f..e6e6fee 100644 --- a/shapely/geometry/base.py +++ b/shapely/geometry/base.py @@ -7,7 +7,7 @@ import warnings from shapely.coords import
[python-shapely] 40/148: Broken locale test disabled - patch (?!??!)
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 7d8df8cd47f92002fdb9b68a1ff0961a66f5065c Author: Pietro Battiston Date: Tue Sep 14 19:18:05 2010 +0200 Broken locale test disabled - patch (?!??!) --- debian/patches/disable-broken-locale-test | 38 +++ debian/patches/series | 1 + 2 files changed, 39 insertions(+) diff --git a/debian/patches/disable-broken-locale-test b/debian/patches/disable-broken-locale-test new file mode 100644 index 000..58f37b3 --- /dev/null +++ b/debian/patches/disable-broken-locale-test @@ -0,0 +1,38 @@ +Description: The following test assumes that the locale "pt_BR.UTF-8" is +installed, and fails otherwise. Since there is no "non-trivial" locale which we +can assume is installed, the only way to fix this seems to disable it. +Forwarded, but upstream seems willing to not drop the test. +Author: Pietro Battiston +Forwarded: yes + +--- python-shapely.orig/shapely/tests/wkt_locale.txt 2010-09-14 11:43:00.0 +0200 /dev/null 1970-01-01 00:00:00.0 + +@@ -1,28 +0,0 @@ +-Test locale independence of WKT +-=== +- +-Set locale to one that uses a comma as decimal seperator` +- +- >>> import locale, sys +- >>> if sys.platform == 'win32': +- ... _ = locale.setlocale(locale.LC_ALL, 'portuguese_brazil') +- ... else: +- ... _ = locale.setlocale(locale.LC_ALL, 'pt_BR.UTF-8') +- +-Test reading and writing` +- +- >>> from shapely.wkt import loads +- >>> p = loads('POINT (0.0 0.0)') +- >>> p.x == 0.0 +- True +- >>> p.y == 0.0 +- True +- >>> p.wkt +- 'POINT (0.0...)' +- >>> from shapely.wkt import dumps +- >>> dumps(p) +- 'POINT (0.0...)' +- +-Reset locale +- +- >>> _ = locale.setlocale(locale.LC_ALL, '') diff --git a/debian/patches/series b/debian/patches/series index 2f0d9f5..997cff1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ do-not-install-examples-as-scripts manual-backported-fixes +disable-broken-locale-test -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 34/148: Examples are removed from PATH by patch
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit ed340e0f7d4bcab7c87dc1405b7d29f30c0b8966 Author: Pietro Battiston Date: Tue Sep 14 12:48:15 2010 +0200 Examples are removed from PATH by patch --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bf1ce38..00ad9b1 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ setup_args = dict( url = 'http://trac.gispython.org/lab/wiki/Shapely', long_description= readme_text, packages= ['shapely', 'shapely.geometry'], -#scripts = ['examples/dissolve.py', 'examples/intersect.py'], +scripts = ['examples/dissolve.py', 'examples/intersect.py'], test_suite = 'shapely.tests.test_suite', classifiers = [ 'Development Status :: 5 - Production/Stable', -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 38/148: 1.2.1-2
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 1e777402df03bf32d2c7ee5a52bb2f03043416fc Author: Pietro Battiston Date: Tue Sep 14 18:31:55 2010 +0200 1.2.1-2 --- debian/changelog | 9 + 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7aea12e..c8d9211 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-shapely (1.2.1-2) unstable; urgency=low + + * Fixes to manual from upstream version 1.2.3 + * Run tests, except wkt_locale which is broken. + * Require newer version of debhelper to support override_dh_auto_test. + * Updated standards version. + + -- Pietro Battiston Tue, 14 Sep 2010 18:30:47 +0200 + python-shapely (1.2.1-1) unstable; urgency=low * New upstream release -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 53/148: Merge commit 'upstream/1.2.8'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 651016f70967b2dddc97d81f3057beb1b423d4c2 Merge: 350cd22 781d44b Author: Pietro Battiston Date: Fri Feb 11 11:25:16 2011 +0100 Merge commit 'upstream/1.2.8' Conflicts: PKG-INFO Shapely.egg-info/PKG-INFO docs/_build/html/_sources/manual.txt docs/manual.txt setup.py shapely/impl.py shapely/tests/__init__.py shapely/tests/test_delegated.py shapely/tests/test_dlls.py CHANGES.txt | 28 +- MANIFEST.in |7 - PKG-INFO |2 +- Shapely.egg-info/PKG-INFO|2 +- Shapely.egg-info/SOURCES.txt |6 +- docs/_build/html/_sources/manual.txt | 1789 -- docs/manual.txt | 14 +- setup.py | 15 +- shapely/ctypes_declarations.py |3 + shapely/ftools.py| 78 ++ shapely/geometry/base.py | 14 +- shapely/geometry/collection.py |5 +- shapely/geometry/linestring.py | 33 +- shapely/geometry/polygon.py | 10 +- shapely/geos.py | 13 +- shapely/impl.py |5 +- shapely/tests/__init__.py|5 +- shapely/tests/cascaded_union.txt |2 +- shapely/tests/linear-referencing.txt | 58 - shapely/tests/test_collection.py |1 + shapely/tests/test_delegated.py |8 +- shapely/tests/test_dlls.py |5 +- shapely/tests/test_linear_referencing.py | 67 ++ shapely/tests/test_products_z.py | 14 + 24 files changed, 290 insertions(+), 1894 deletions(-) diff --cc CHANGES.txt index b006bbc,eefb494..3684109 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,31 +1,38 @@@ - All tickets are children of http://trac.gispython.org/lab/ticket. + 1.2.8 (2011-12-03) + -- + - New parallel_offset method (#6). + - Support for Python 2.4. + + 1.2.7 (2010-11-05) + -- + - Support for Windows eggs. + + 1.2.6 (2010-10-21) + -- + - The geoms property of an empty collection yields [] instead of a ValueError + (#3). + - The coords and geometry type sproperties have the same behavior as above. + - Ensure that z values carry through into products of operations (#4). + + 1.2.5 (2010-09-19) + -- + - Stop distributing docs/_build. + - Include library fallbacks in test_dlls.py for linux platform. + + 1.2.4 (2010-09-09) + -- + - Raise AttributeError when there's no backend support for a method. + - Raise OSError if libgeos_c.so (or variants) can't be found and loaded. + - Add geos_c DLL loading support for linux platforms where find_library doesn't + work. +1.2.4 (2010-09-09) +-- +- Raise AttributeError when there's no backend support for a method. +- Raise OSError if libgeos_c.so (or variants) can't be found and loaded. +- Add geos_c DLL loading support for linux platforms where find_library + doesn't work. + 1.2.3 (2010-08-17) -- - Add mapping function. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 58/148: 1.2.8-1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 235dd58fb53c373482c3b1bcf2835931e555767b Author: Pietro Battiston Date: Fri Feb 11 12:14:15 2011 +0100 1.2.8-1 --- debian/changelog | 9 + 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9145f65..048b0c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-shapely (1.2.8-1) unstable; urgency=low + + * New upstream release. + * Use dh_python2. + * Remove obsolete patch "typo-in-dll-test". + * Added python-matplotlib (used by example scripts) in Suggests. + + -- Pietro Battiston Fri, 11 Feb 2011 12:03:40 +0200 + python-shapely (1.2.4-1) experimental; urgency=low * New upstream release (Closes: #590475) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 61/148: Merge commit 'upstream/1.2.10'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit c327cec5503d1366190786ff9262a1f7e72d2add Merge: 37b5515 6cca9d1 Author: Pietro Battiston Date: Thu Jun 30 08:23:14 2011 +0200 Merge commit 'upstream/1.2.10' CHANGES.txt | 18 + PKG-INFO| 208 +- README.txt |6 +- Shapely.egg-info/PKG-INFO | 208 +- Shapely.egg-info/SOURCES.txt| 15 +- docs/manual.txt | 89 +- setup.py| 70 +- shapely/algorithms/__init__.py |0 shapely/algorithms/cga.py | 17 + shapely/coords.py |3 +- shapely/examples/__init__.py|1 + {examples => shapely/examples}/dissolve.py |0 shapely/examples/geoms.py | 51 + {examples => shapely/examples}/intersect.py |0 shapely/examples/world.py | 21 + shapely/geometry/__init__.py|4 +- shapely/geometry/geo.py |9 +- shapely/geometry/polygon.py | 21 + shapely/geometry/proxy.py |1 - shapely/geos.py |3 +- shapely/impl.py |4 + shapely/iterops.py |2 +- shapely/predicates.py |1 - shapely/speedups/__init__.py| 39 + shapely/speedups/_speedups.c| 4551 +++ shapely/speedups/_speedups.pyx | 295 ++ shapely/tests/__init__.py |5 +- shapely/tests/test_box.py | 19 + shapely/tests/test_cga.py | 33 + shapely/tests/test_dlls.py |7 +- shapely/tests/test_speedups.py | 38 + shapely/wkb.py |3 +- 32 files changed, 5704 insertions(+), 38 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 63/148: 1.2.10-1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit d8ef89ae5fe3b0880af784a3aebba3a3a36c273e Author: Pietro Battiston Date: Thu Jun 30 08:57:48 2011 +0200 1.2.10-1 --- debian/changelog | 6 ++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 048b0c0..d67aa4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-shapely (1.2.10-1) unstable; urgency=low + + * New upstream release. + + -- Pietro Battiston Thu, 30 Jun 2011 08:57:03 +0200 + python-shapely (1.2.8-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index fa30d17..a8d12fa 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Pietro Battiston Build-Depends: debhelper (>= 7.0.50) Build-Depends-Indep: python-setuptools (>= 0.6), libgeos-c1 (>= 3.1.0), python-numpy, python (>= 2.6.6-3) -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 X-Python-Version: >= 2.5 Homepage: http://trac.gispython.org/lab/wiki/Shapely Vcs-Browser: http://git.debian.org/?p=collab-maint/python-shapely.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 65/148: Updated dependencies
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit e9b7c0c111c6a4932bd565f5dec4c4fbc9b2dc1e Author: Pietro Battiston Date: Sun Jul 3 17:29:03 2011 +0200 Updated dependencies --- debian/changelog | 1 + debian/control | 7 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d67aa4a..1d9366e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-shapely (1.2.10-1) unstable; urgency=low * New upstream release. +- Introduces Cython speedups: updated dependencies accordingly. -- Pietro Battiston Thu, 30 Jun 2011 08:57:03 +0200 diff --git a/debian/control b/debian/control index a8d12fa..65451b5 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,7 @@ Source: python-shapely Section: python Priority: optional Maintainer: Pietro Battiston -Build-Depends: debhelper (>= 7.0.50) -Build-Depends-Indep: python-setuptools (>= 0.6), libgeos-c1 (>= 3.1.0), python-numpy, python (>= 2.6.6-3) +Build-Depends: debhelper (>= 7.0.50), python-setuptools (>= 0.6), libgeos-c1 (>= 3.1.0), libgeos-dev, python-numpy, python (>= 2.6.6-3), python-all-dev Standards-Version: 3.9.2 X-Python-Version: >= 2.5 Homepage: http://trac.gispython.org/lab/wiki/Shapely @@ -11,8 +10,8 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/python-shapely.git Vcs-Git: git://git.debian.org/git/collab-maint/python-shapely.git Package: python-shapely -Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python (>=2.5) | python-ctypes, libgeos-c1 (>= 3.1.0) +Architecture: any +Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python (>=2.5) | python-ctypes, libgeos-c1 (>= 3.1.0) Suggests: python-numpy, python-matplotlib Enhances: python-numpy Breaks: ${python:Breaks} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 64/148: Removed obsolete patch
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 29404eb79df9e50ab0aa28e98b932c716903dde6 Author: Pietro Battiston Date: Sun Jul 3 17:00:54 2011 +0200 Removed obsolete patch --- debian/patches/do-not-install-examples-as-scripts | 18 -- debian/patches/series | 1 - 2 files changed, 19 deletions(-) diff --git a/debian/patches/do-not-install-examples-as-scripts b/debian/patches/do-not-install-examples-as-scripts deleted file mode 100644 index 2d5e25a..000 --- a/debian/patches/do-not-install-examples-as-scripts +++ /dev/null @@ -1,18 +0,0 @@ -Description: Do not install examples as scripts - Scripts in examples dir are already installed in - /usr/share/doc/python-shapely/examples - and should not be installed in /usr/bin. -Author: Pietro Battiston -Forwarded: yes - python-shapely-1.2.1.orig/setup.py -+++ python-shapely-1.2.1/setup.py -@@ -29,7 +29,7 @@ setup_args = dict( - url = 'http://trac.gispython.org/lab/wiki/Shapely', - long_description= readme_text, - packages= ['shapely', 'shapely.geometry'], --scripts = ['examples/dissolve.py', 'examples/intersect.py'], -+#scripts = ['examples/dissolve.py', 'examples/intersect.py'], - test_suite = 'shapely.tests.test_suite', - classifiers = [ - 'Development Status :: 5 - Production/Stable', diff --git a/debian/patches/series b/debian/patches/series index cdb00cc..c032abc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -do-not-install-examples-as-scripts disable-broken-locale-test -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 69/148: Now using gbp-pq to manage patches.
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 3efcf37c9bec661e038b9c09203a19b89f2b63bc Author: Pietro Battiston Date: Wed Dec 21 15:31:35 2011 +0100 Now using gbp-pq to manage patches. --- ...e-test => 0001-disable-broken-locale-test.patch} | 17 ++--- .../{rerun-cython => 0002-rerun-cython.patch} | 21 - debian/patches/series | 4 ++-- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/debian/patches/disable-broken-locale-test b/debian/patches/0001-disable-broken-locale-test.patch similarity index 67% rename from debian/patches/disable-broken-locale-test rename to debian/patches/0001-disable-broken-locale-test.patch index 8e0e7ab..c233c36 100644 --- a/debian/patches/disable-broken-locale-test +++ b/debian/patches/0001-disable-broken-locale-test.patch @@ -1,12 +1,22 @@ -Description: The following test assumes that the locale "pt_BR.UTF-8" is +From: Pietro Battiston +Date: Wed, 21 Dec 2011 15:29:24 +0100 +Subject: disable-broken-locale-test + installed, and fails otherwise. Since there is no "non-trivial" locale which we can assume is installed, the only way to fix this seems to disable it. Forwarded, but upstream seems willing to not drop the test. Author: Pietro Battiston Forwarded: yes +--- + shapely/tests/wkt_locale.txt | 28 + 1 files changed, 0 insertions(+), 28 deletions(-) + delete mode 100644 shapely/tests/wkt_locale.txt python-shapely.orig/shapely/tests/wkt_locale.txt 2010-09-14 11:43:00.0 +0200 -+++ /dev/null 1970-01-01 00:00:00.0 + +diff --git a/shapely/tests/wkt_locale.txt b/shapely/tests/wkt_locale.txt +deleted file mode 100644 +index ebbc024..000 +--- a/shapely/tests/wkt_locale.txt /dev/null @@ -1,28 +0,0 @@ -Test locale independence of WKT -=== @@ -36,3 +46,4 @@ Forwarded: yes -Reset locale - - >>> _ = locale.setlocale(locale.LC_ALL, '') +-- diff --git a/debian/patches/rerun-cython b/debian/patches/0002-rerun-cython.patch similarity index 58% rename from debian/patches/rerun-cython rename to debian/patches/0002-rerun-cython.patch index 937b095..eb246f7 100644 --- a/debian/patches/rerun-cython +++ b/debian/patches/0002-rerun-cython.patch @@ -1,13 +1,15 @@ -Description: Generate .pyx at compile time. - Shapely is distributed with the .pyx Cython file already transformed into a .c - file. This patch imports the modified "build_ext" from the Cython Distutils, - and then feeds it the .pyx (rather than .c) file. -Author: Pietro Battiston -Forwarded: not-needed -Last-Update: <2011-07-04> +From: Pietro Battiston +Date: Wed, 21 Dec 2011 15:29:24 +0100 +Subject: rerun-cython python-shapely-1.2.10.orig/setup.py -+++ python-shapely-1.2.10/setup.py +--- + setup.py |4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 9d30ac1..0684d30 100644 +--- a/setup.py b/setup.py @@ -12,7 +12,7 @@ except: from distutils.errors import CCompilerError, DistutilsExecError, \ DistutilsPlatformError @@ -26,3 +28,4 @@ Last-Update: <2011-07-04> ] try: +-- diff --git a/debian/patches/series b/debian/patches/series index 439fd12..061fed7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -disable-broken-locale-test -rerun-cython +0001-disable-broken-locale-test.patch +0002-rerun-cython.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 67/148: Regenerate _speedups.c at runtime
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 035e4bd178c38df69101183d65ed4b7a5d6af1e5 Author: Pietro Battiston Date: Mon Jul 4 12:56:14 2011 +0200 Regenerate _speedups.c at runtime --- debian/clean| 1 + debian/control | 2 +- debian/patches/rerun-cython | 28 debian/patches/series | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/debian/clean b/debian/clean new file mode 100644 index 000..29b2e18 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +shapely/speedups/_speedups.c diff --git a/debian/control b/debian/control index b06c3ce..6774c94 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: python-shapely Section: python Priority: optional Maintainer: Pietro Battiston -Build-Depends: debhelper (>= 7.0.50), python-setuptools (>= 0.6), libgeos-c1 (>= 3.1.0), libgeos-dev, python-numpy, python (>= 2.6.6-3), python-all-dev +Build-Depends: debhelper (>= 7.0.50), python-setuptools (>= 0.6), libgeos-c1 (>= 3.1.0), libgeos-dev, python-numpy, python (>= 2.6.6-3), python-all-dev, cython Standards-Version: 3.9.2 X-Python-Version: >= 2.5 Homepage: http://trac.gispython.org/lab/wiki/Shapely diff --git a/debian/patches/rerun-cython b/debian/patches/rerun-cython new file mode 100644 index 000..937b095 --- /dev/null +++ b/debian/patches/rerun-cython @@ -0,0 +1,28 @@ +Description: Generate .pyx at compile time. + Shapely is distributed with the .pyx Cython file already transformed into a .c + file. This patch imports the modified "build_ext" from the Cython Distutils, + and then feeds it the .pyx (rather than .c) file. +Author: Pietro Battiston +Forwarded: not-needed +Last-Update: <2011-07-04> + +--- python-shapely-1.2.10.orig/setup.py python-shapely-1.2.10/setup.py +@@ -12,7 +12,7 @@ except: + from distutils.errors import CCompilerError, DistutilsExecError, \ + DistutilsPlatformError + from setuptools.extension import Extension +-from setuptools.command.build_ext import build_ext ++from Cython.Distutils import build_ext + from setuptools import setup, find_packages + import sys + +@@ -92,7 +92,7 @@ if sys.platform == 'win32': + else: + ext_modules = [ + Extension("shapely.speedups._speedups", +- ["shapely/speedups/_speedups.c"], libraries=['geos_c']), ++ ["shapely/speedups/_speedups.pyx"], libraries=['geos_c']), + ] + + try: diff --git a/debian/patches/series b/debian/patches/series index c032abc..439fd12 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ disable-broken-locale-test +rerun-cython -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 70/148: Imported Upstream version 1.2.13
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 9db99d64430d16853230592c258129dc5b45ef61 Author: Pietro Battiston Date: Wed Dec 21 16:10:42 2011 +0100 Imported Upstream version 1.2.13 --- CHANGES.txt | 21 ++ CREDITS.txt | 4 +- PKG-INFO| 77 +- README.txt => README.rst| 52 --- Shapely.egg-info/PKG-INFO | 77 +- Shapely.egg-info/SOURCES.txt| 2 +- docs/manual.txt | 20 +++--- setup.py| 23 +-- shapely/__init__.py | 3 +- shapely/ctypes_declarations.py | 5 ++ shapely/geometry/base.py| 5 +- shapely/geometry/linestring.py | 21 +++--- shapely/geometry/multilinestring.py | 3 - shapely/geometry/multipoint.py | 5 +- shapely/geometry/polygon.py | 58 ++--- shapely/geos.py | 13 ++-- shapely/predicates.py | 4 +- shapely/prepared.py | 5 +- shapely/speedups/__init__.py| 3 + shapely/speedups/_speedups.c| 123 +++- shapely/speedups/_speedups.pyx | 22 +++ shapely/tests/test_prepared.py | 15 - shapely/topology.py | 14 ++-- shapely/wkb.py | 4 +- 24 files changed, 330 insertions(+), 249 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 3897490..970ce91 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,27 @@ CHANGES === +1.2.13 (2011-09-16) +--- +- Fixed errors in speedups on 32bit systems when GEOS references memory above 2GB. +- Add shapely.__version__ attribute. +- Update the manual. + +1.2.12 (2011-08-15) +--- +- Build Windows distributions with VC7 or VC9 as appropriate. +- More verbose report on failure to speed up. +- Fix for prepared geometries broken in 1.2.11. +- DO NOT INSTALL 1.2.11 + +1.2.11 (2011-08-04) +--- +- Ignore AttributeError during exit. +- PyPy 1.5 support. +- Prevent operation on prepared geometry crasher (#12). +- Optional Cython speedups for Windows. +- Linux 3 platform support. + 1.2.10 (2011-05-09) --- - Add optional Cython speedups. diff --git a/CREDITS.txt b/CREDITS.txt index 8967542..a496ced 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -3,6 +3,7 @@ Shapely is written by: * Sean Gillies * Aron Bierbaum * Kai Lautaportti +* Oliver Tonnhofer Patches contributed by: @@ -11,7 +12,6 @@ Patches contributed by: * Eric Lemoine * Jonathan Tartley * Kristian Thy -* Oliver Tonnhofer Additional help from: @@ -22,3 +22,5 @@ Additional help from: Major portions of this work were supported by a grant (for Pleiades_) from the U.S. National Endowment for the Humanities (http://www.neh.gov). + +.. _Pleiades: http://pleiades.stoa.org diff --git a/PKG-INFO b/PKG-INFO index 78a49df..8a6a778 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,34 +1,34 @@ Metadata-Version: 1.0 Name: Shapely -Version: 1.2.10 +Version: 1.2.13 Summary: Geometric objects, predicates, and operations -Home-page: http://trac.gispython.org/lab/wiki/Shapely +Home-page: https://github.com/sgillies/shapely Author: Sean Gillies Author-email: sean.gill...@gmail.com License: BSD -Description: == -README -== +Description: === +Shapely +=== + +PostGIS-ish operations outside a database context for Pythoneers and Pythonistas .. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png :width: 800 :height: 400 Shapely is a BSD-licensed Python package for manipulation and analysis of -planar geometric objects. It is not concerned with data formats or coordinate -systems. It is based on the widely deployed GEOS_ (the engine of PostGIS_) and -JTS_ (from which GEOS is ported) libraries. This C dependency is traded for the -ability to execute with blazing speed. - -In a nutshell: Shapely lets you do PostGIS-ish stuff outside the context of a -database using idiomatic Python. For more details, see: +planar geometric objects. It is based on the widely deployed GEOS_ (the engine +of PostGIS_) and JTS_ (from which GEOS is ported) libraries. This C dependency +is traded for the ability to execute with blazing speed. Shapely is not +concerned with data formats or coordinate systems, but can be readily +integrated with packages that are. For more details, see: * Shapely wiki_ * Shapely manual_ * Shapely `example apps`_ Dependencies - +
[python-shapely] 68/148: patch in changelog
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 292311a5a09493417ef0e005c6fa3da87c32ecd2 Author: Pietro Battiston Date: Thu Jul 7 14:09:15 2011 +0200 patch in changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 1d9366e..bd0f527 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-shapely (1.2.10-1) unstable; urgency=low * New upstream release. - Introduces Cython speedups: updated dependencies accordingly. +- Patched setup.py to recreate .c file from .pyx file. -- Pietro Battiston Thu, 30 Jun 2011 08:57:03 +0200 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 66/148: Drop "Breaks"
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 486eca085a7ac320c67f5879dd98f23bbd08b3e2 Author: Pietro Battiston Date: Sun Jul 3 18:41:57 2011 +0200 Drop "Breaks" --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 65451b5..b06c3ce 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Architecture: any Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python (>=2.5) | python-ctypes, libgeos-c1 (>= 3.1.0) Suggests: python-numpy, python-matplotlib Enhances: python-numpy -Breaks: ${python:Breaks} Description: geometric objects, predicates, and operations Shapely is a package for manipulation and analysis of 2D features. Its capabilities include: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 71/148: Merge commit 'upstream/1.2.13'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit fbb71f777aaf33adc37c7617511bf77b7312cd00 Merge: 3efcf37 3160fc7 Author: Pietro Battiston Date: Wed Dec 21 16:10:58 2011 +0100 Merge commit 'upstream/1.2.13' CHANGES.txt | 21 ++ CREDITS.txt | 4 +- PKG-INFO| 77 +- README.txt => README.rst| 52 --- Shapely.egg-info/PKG-INFO | 77 +- Shapely.egg-info/SOURCES.txt| 2 +- docs/manual.txt | 20 +++--- setup.py| 23 +-- shapely/__init__.py | 3 +- shapely/ctypes_declarations.py | 5 ++ shapely/geometry/base.py| 5 +- shapely/geometry/linestring.py | 21 +++--- shapely/geometry/multilinestring.py | 3 - shapely/geometry/multipoint.py | 5 +- shapely/geometry/polygon.py | 58 ++--- shapely/geos.py | 13 ++-- shapely/predicates.py | 4 +- shapely/prepared.py | 5 +- shapely/speedups/__init__.py| 3 + shapely/speedups/_speedups.c| 123 +++- shapely/speedups/_speedups.pyx | 22 +++ shapely/tests/test_prepared.py | 15 - shapely/topology.py | 14 ++-- shapely/wkb.py | 4 +- 24 files changed, 330 insertions(+), 249 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 72/148: Imported Upstream version 1.2.13
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 3160fc7d542924109f46ae08821e06dce2d1c163 Author: Pietro Battiston Date: Wed Dec 21 16:10:58 2011 +0100 Imported Upstream version 1.2.13 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 76/148: README.txt is now README.rst
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit e2867a7e14a182464734fc6c18d2d00d75e4b507 Author: Pietro Battiston Date: Wed Dec 21 16:55:12 2011 +0100 README.txt is now README.rst --- debian/docs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/docs b/debian/docs index eaa8129..5d2dc70 100644 --- a/debian/docs +++ b/debian/docs @@ -1,3 +1,2 @@ -README.txt +README.rst docs/manual.txt - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 75/148: Imported upstream patch to floats in test
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 4e3c4124a08582e71262ee11e4ec364bc23ae1db Author: Pietro Battiston Date: Wed Dec 21 16:46:25 2011 +0100 Imported upstream patch to floats in test --- debian/patches/0003-Fix-test-for-Python-2.7.patch | 128 ++ debian/patches/series | 1 + 2 files changed, 129 insertions(+) diff --git a/debian/patches/0003-Fix-test-for-Python-2.7.patch b/debian/patches/0003-Fix-test-for-Python-2.7.patch new file mode 100644 index 000..373bd0d --- /dev/null +++ b/debian/patches/0003-Fix-test-for-Python-2.7.patch @@ -0,0 +1,128 @@ +From: Pietro Battiston +Date: Wed, 21 Dec 2011 16:24:15 +0100 +Subject: Fix test for Python 2.7 + +Imported 07f651929f025a0cab7020038e2ff235c85804c7 from upstream, to cope with +new floats representation. + +Forwarded: not-needed +Author: Sean Gillies + +--- + shapely/tests/MultiPolygon.txt | 16 + shapely/tests/Point.txt|4 ++-- + shapely/tests/Polygon.txt |6 +++--- + 3 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/shapely/tests/MultiPolygon.txt b/shapely/tests/MultiPolygon.txt +index 8b8723a..376ddb6 100644 +--- a/shapely/tests/MultiPolygon.txt b/shapely/tests/MultiPolygon.txt +@@ -9,23 +9,23 @@ Initialization + From coordinate tuples + + >>> geom = MultiPolygon( [ +- ... (((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0)), [((0.1,0.1), (0.1,0.2), (0.2,0.2), (0.2,0.1))]) ++ ... (((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0)), [((0.25,0.25), (0.25,0.5), (0.5,0.5), (0.5,0.25))]) + ... ] ) + >>> geom # doctest: +ELLIPSIS + + >>> len(geom.geoms) + 1 + >>> geom.wkt +- 'MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.1000 0.1000, 0.1000 0.2000, 0.2000 0.2000, 0.2000 0.1000, 0.1000 0.1000)))' ++ 'MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.2500 0.2500, 0.2500 0.5000, 0.5000 0.5000, 0.5000 0.2500, 0.2500 0.2500)))' + + Or from polygons + +- >>> p = Polygon(((0, 0), (0, 1), (1, 1), (1, 0)), [((0.1,0.1), (0.1,0.2), (0.2,0.2), (0.2,0.1))]) ++ >>> p = Polygon(((0, 0), (0, 1), (1, 1), (1, 0)), [((0.25,0.25), (0.25,0.5), (0.5,0.5), (0.5,0.25))]) + >>> geom = MultiPolygon([p]) + >>> len(geom.geoms) + 1 + >>> print geom.wkt +- MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.1000 0.1000, 0.1000 0.2000, 0.2000 0.2000, 0.2000 0.1000, 0.1000 0.1000))) ++ MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.2500 0.2500, 0.2500 0.5000, 0.5000 0.5000, 0.5000 0.2500, 0.2500 0.2500))) + + Or from another multi-polygon + +@@ -33,7 +33,7 @@ Or from another multi-polygon + >>> len(geom2.geoms) + 1 + >>> print geom2.wkt +- MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.1000 0.1000, 0.1000 0.2000, 0.2000 0.2000, 0.2000 0.1000, 0.1000 0.1000))) ++ MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.2500 0.2500, 0.2500 0.5000, 0.5000 0.5000, 0.5000 0.2500, 0.2500 0.2500))) + + Sub-geometry Access + --- +@@ -41,7 +41,7 @@ Sub-geometry Access + >>> geom.geoms[0] # doctest: +ELLIPSIS + + >>> geom.geoms[0].wkt +- 'POLYGON ((0. 0., 0.000
[python-shapely] 81/148: Merge commit 'upstream/1.2.14'
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit fdb68ed7e8f8abf391a9f2f3de4155c82eaecf3e Merge: 5df40d9 8eb6d6f Author: Pietro Battiston Date: Sat Mar 10 17:38:41 2012 +0100 Merge commit 'upstream/1.2.14' Upstream version 1.2.14 CHANGES.txt | 14 +++-- CREDITS.txt | 1 + PKG-INFO| 46 --- README.rst | 29 + Shapely.egg-info/PKG-INFO | 46 --- Shapely.egg-info/SOURCES.txt| 1 + docs/manual.txt | 51 setup.py| 10 +++- shapely/__init__.py | 2 +- shapely/coords.py | 59 --- shapely/geometry/base.py| 44 +- shapely/geometry/multilinestring.py | 2 +- shapely/geometry/multipolygon.py| 2 +- shapely/geometry/polygon.py | 25 +--- shapely/tests/MultiPolygon.txt | 16 ++--- shapely/tests/Point.txt | 4 +- shapely/tests/Polygon.txt | 6 +- shapely/tests/__init__.py | 3 +- shapely/tests/test_getitem.py | 113 19 files changed, 338 insertions(+), 136 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 85/148: Readded missing description line in patch
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 13c9c233ae0578e8485857d430a3fd078615b017 Author: Pietro Battiston Date: Sat Mar 10 22:40:23 2012 +0100 Readded missing description line in patch --- debian/patches/0001-disable-broken-locale-test.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/patches/0001-disable-broken-locale-test.patch b/debian/patches/0001-disable-broken-locale-test.patch index 900d372..5682ff7 100644 --- a/debian/patches/0001-disable-broken-locale-test.patch +++ b/debian/patches/0001-disable-broken-locale-test.patch @@ -2,6 +2,7 @@ From: Pietro Battiston Date: Wed, 21 Dec 2011 15:29:24 +0100 Subject: disable-broken-locale-test +The following test assumes that the locale "pt_BR.UTF-8" is installed, and fails otherwise. Since there is no "non-trivial" locale which we can assume is installed, the only way to fix this seems to disable it. Forwarded, but upstream seems willing to not drop the test. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 83/148: Rebased patches
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 0970d5795a990f320a8e3739268116f4ad62ed0c Author: Pietro Battiston Date: Sat Mar 10 17:52:07 2012 +0100 Rebased patches --- debian/patches/0001-disable-broken-locale-test.patch | 1 - debian/patches/0002-rerun-cython.patch | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/patches/0001-disable-broken-locale-test.patch b/debian/patches/0001-disable-broken-locale-test.patch index c233c36..900d372 100644 --- a/debian/patches/0001-disable-broken-locale-test.patch +++ b/debian/patches/0001-disable-broken-locale-test.patch @@ -46,4 +46,3 @@ index ebbc024..000 -Reset locale - - >>> _ = locale.setlocale(locale.LC_ALL, '') --- diff --git a/debian/patches/0002-rerun-cython.patch b/debian/patches/0002-rerun-cython.patch index ac11884..3eb2454 100644 --- a/debian/patches/0002-rerun-cython.patch +++ b/debian/patches/0002-rerun-cython.patch @@ -7,7 +7,7 @@ Subject: rerun-cython 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index aafca2e..6726788 100644 +index 328c0b6..0b5f17f 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ except: @@ -19,7 +19,7 @@ index aafca2e..6726788 100644 from setuptools import setup, find_packages import sys import platform -@@ -105,7 +105,7 @@ elif (hasattr(platform, 'python_implementation') +@@ -109,7 +109,7 @@ elif (hasattr(platform, 'python_implementation') else: ext_modules = [ Extension("shapely.speedups._speedups", @@ -28,4 +28,3 @@ index aafca2e..6726788 100644 ] try: --- -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 79/148: Changelog filled, ready for release
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 5df40d9dfaa5c9870cbda655bbec62bbb298b5e1 Author: Pietro Battiston Date: Wed Dec 21 17:51:37 2011 +0100 Changelog filled, ready for release --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4fd6add..cacf482 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ python-shapely (1.2.13-1) unstable; urgency=low * New upstream release. * Now using gbp-pq to manage patches. + * Fixed test for Python 2.7 with upstream patch (Closes: #652183). + * Tests are now ran with all supported Python versions. + * Updated debian/copyright format. -- Pietro Battiston Wed, 21 Dec 2011 16:17:20 +0100 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 78/148: Run tests with all supported Python versions
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 977095f1897b3e314c2557e568eee8d05b3b3c0f Author: Pietro Battiston Date: Wed Dec 21 17:36:45 2011 +0100 Run tests with all supported Python versions --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 69bcfca..06a422e 100755 --- a/debian/rules +++ b/debian/rules @@ -9,5 +9,7 @@ override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - python setup.py test + for ver in `pyversions -vr`; do \ + python$$ver setup.py test; \ + done endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 73/148: Updated patch rerun-cython
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 728d2cca8d440abf54265605bab9a65664b08f64 Author: Pietro Battiston Date: Wed Dec 21 16:16:26 2011 +0100 Updated patch rerun-cython --- debian/patches/0002-rerun-cython.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/0002-rerun-cython.patch b/debian/patches/0002-rerun-cython.patch index eb246f7..ac11884 100644 --- a/debian/patches/0002-rerun-cython.patch +++ b/debian/patches/0002-rerun-cython.patch @@ -7,7 +7,7 @@ Subject: rerun-cython 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index 9d30ac1..0684d30 100644 +index aafca2e..6726788 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ except: @@ -18,8 +18,8 @@ index 9d30ac1..0684d30 100644 +from Cython.Distutils import build_ext from setuptools import setup, find_packages import sys - -@@ -92,7 +92,7 @@ if sys.platform == 'win32': + import platform +@@ -105,7 +105,7 @@ elif (hasattr(platform, 'python_implementation') else: ext_modules = [ Extension("shapely.speedups._speedups", -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 82/148: Removed now obsolete python 2.7 support patch
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 5f95bc92a55b48bd7938e12394d4868eb42df675 Author: Pietro Battiston Date: Sat Mar 10 17:49:03 2012 +0100 Removed now obsolete python 2.7 support patch --- debian/patches/0003-Fix-test-for-Python-2.7.patch | 128 -- debian/patches/series | 1 - 2 files changed, 129 deletions(-) diff --git a/debian/patches/0003-Fix-test-for-Python-2.7.patch b/debian/patches/0003-Fix-test-for-Python-2.7.patch deleted file mode 100644 index 373bd0d..000 --- a/debian/patches/0003-Fix-test-for-Python-2.7.patch +++ /dev/null @@ -1,128 +0,0 @@ -From: Pietro Battiston -Date: Wed, 21 Dec 2011 16:24:15 +0100 -Subject: Fix test for Python 2.7 - -Imported 07f651929f025a0cab7020038e2ff235c85804c7 from upstream, to cope with -new floats representation. - -Forwarded: not-needed -Author: Sean Gillies - - shapely/tests/MultiPolygon.txt | 16 - shapely/tests/Point.txt|4 ++-- - shapely/tests/Polygon.txt |6 +++--- - 3 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/shapely/tests/MultiPolygon.txt b/shapely/tests/MultiPolygon.txt -index 8b8723a..376ddb6 100644 a/shapely/tests/MultiPolygon.txt -+++ b/shapely/tests/MultiPolygon.txt -@@ -9,23 +9,23 @@ Initialization - From coordinate tuples - - >>> geom = MultiPolygon( [ -- ... (((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0)), [((0.1,0.1), (0.1,0.2), (0.2,0.2), (0.2,0.1))]) -+ ... (((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0)), [((0.25,0.25), (0.25,0.5), (0.5,0.5), (0.5,0.25))]) - ... ] ) - >>> geom # doctest: +ELLIPSIS - - >>> len(geom.geoms) - 1 - >>> geom.wkt -- 'MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.1000 0.1000, 0.1000 0.2000, 0.2000 0.2000, 0.2000 0.1000, 0.1000 0.1000)))' -+ 'MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.2500 0.2500, 0.2500 0.5000, 0.5000 0.5000, 0.5000 0.2500, 0.2500 0.2500)))' - - Or from polygons - -- >>> p = Polygon(((0, 0), (0, 1), (1, 1), (1, 0)), [((0.1,0.1), (0.1,0.2), (0.2,0.2), (0.2,0.1))]) -+ >>> p = Polygon(((0, 0), (0, 1), (1, 1), (1, 0)), [((0.25,0.25), (0.25,0.5), (0.5,0.5), (0.5,0.25))]) - >>> geom = MultiPolygon([p]) - >>> len(geom.geoms) - 1 - >>> print geom.wkt -- MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.1000 0.1000, 0.1000 0.2000, 0.2000 0.2000, 0.2000 0.1000, 0.1000 0.1000))) -+ MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.2500 0.2500, 0.2500 0.5000, 0.5000 0.5000, 0.5000 0.2500, 0.2500 0.2500))) - - Or from another multi-polygon - -@@ -33,7 +33,7 @@ Or from another multi-polygon - >>> len(geom2.geoms) - 1 - >>> print geom2.wkt -- MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.1000 0.1000, 0.1000 0.2000, 0.2000 0.2000, 0.2000 0.1000, 0.1000 0.1000))) -+ MULTIPOLYGON (((0. 0., 0. 1., 1. 1., 1. 0., 0. 0.), (0.2500 0.2500, 0.2500 0.5000, 0.5000 0.5000, 0.5000 0.2500, 0.2500 0.2500))) - - Sub-geometry Access - --- -@@ -41,7 +41,7 @@ Sub-geometry Access - >>> geom.geoms[0] # doctest: +ELLIPSIS - - >>> geom.geoms[0].wkt -- 'POLYGON ((0. 0., 0.
[python-shapely] 77/148: Updated debian/copyright
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 24317f21fbfd43fdb407e0dc233accecf266b0ed Author: Pietro Battiston Date: Wed Dec 21 17:08:22 2011 +0100 Updated debian/copyright --- debian/copyright | 44 ++-- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/debian/copyright b/debian/copyright index 91f394d..69b6be6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,15 +1,15 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 +Format: http://dep.debian.net/deps/dep5 Upstream-Name: Shapely Upstream-Contact: Gis Python community list Source: http://pypi.python.org/packages/source/S/Shapely/ Files: * -Copyright: © 2010 Sean Gillies +Copyright: © 2011 Sean Gillies (see /usr/share/doc/python-shapely/CREDITS.txt for full list). License: BSD Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + . * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright @@ -18,7 +18,7 @@ License: BSD * Neither the name of Sean C. Gillies nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -32,12 +32,12 @@ License: BSD POSSIBILITY OF SUCH DAMAGE. Files: debian/* -Copyright: © 2010 Pietro Battiston +Copyright: © 2011 Pietro Battiston License: GPL-3 This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3. - + . On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. @@ -48,14 +48,14 @@ License: CC-BY COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - + . BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. - + . 1. Definitions - + . a. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with one or more other contributions, constituting separate and independent @@ -82,17 +82,17 @@ License: CC-BY who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. - + . 2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws. - + . 3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: - + . a. to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works; @@ -126,16 +126,16 @@ License: CC-BY SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions). - + . The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved. - + . 4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: - + . a. You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must incl
[python-shapely] 74/148: 1.2.13-1
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 688ab004a65213329033f9f87d316d694ab0e3ef Author: Pietro Battiston Date: Wed Dec 21 16:17:54 2011 +0100 1.2.13-1 --- debian/changelog | 7 +++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index bd0f527..4fd6add 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-shapely (1.2.13-1) unstable; urgency=low + + * New upstream release. + * Now using gbp-pq to manage patches. + + -- Pietro Battiston Wed, 21 Dec 2011 16:17:20 +0100 + python-shapely (1.2.10-1) unstable; urgency=low * New upstream release. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 88/148: Remove .c file only before build (to make gbp happy)
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 5ad767315b21f3cc8515cebfdf8e80f21dce1071 Author: Pietro Battiston Date: Sun Mar 11 00:02:14 2012 +0100 Remove .c file only before build (to make gbp happy) --- debian/clean | 1 - debian/rules | 4 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/clean b/debian/clean deleted file mode 100644 index 29b2e18..000 --- a/debian/clean +++ /dev/null @@ -1 +0,0 @@ -shapely/speedups/_speedups.c diff --git a/debian/rules b/debian/rules index ab79f55..726dc7e 100755 --- a/debian/rules +++ b/debian/rules @@ -13,3 +13,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) python$$ver setup.py test; \ done endif + +override_dh_auto_build: + rm shapely/speedups/_speedups.c + dh_auto_build -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 90/148: Updated changelog
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 0376bc4ac85140ffa82bdbfb7c4b1f7a26588a54 Author: Pietro Battiston Date: Sun Mar 11 01:00:33 2012 +0100 Updated changelog --- debian/changelog | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7d8a442..4d1dfaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ python-shapely (1.2.14-1) unstable; urgency=low * New upstream release. - * Removed now obsolete python 2.7 support patch - * Updated patches: "rerun cython" now also removes the .c file + * Removed now obsolete python 2.7 support patch; updated other patches. + * Cython autogenerated .c file is now deleted via override. + * Introduced upstream patch which fixes broken test (Closes: #663210). + * Added "set -e" before loop in debian/rules. + * Updated policy version. -- Pietro Battiston Sat, 10 Mar 2012 17:54:53 +0100 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 87/148: Added set -e before for loop for policy compliancy
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 281f4e04262b9f23aed02168a6b8087d0102ba5e Author: Pietro Battiston Date: Sat Mar 10 23:59:23 2012 +0100 Added set -e before for loop for policy compliancy --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 06a422e..ab79f55 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - for ver in `pyversions -vr`; do \ + set -e; for ver in `pyversions -vr`; do \ python$$ver setup.py test; \ done endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[python-shapely] 92/148: Fix for Debian bug #666655
This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-shapely. commit 3d44721fcf4770bba5603231d300a6dd69ff23d8 Author: Pietro Battiston Date: Mon Apr 9 11:50:38 2012 +0200 Fix for Debian bug #55 --- .../patches/0004-Fix-for-Debian-bug-55.patch | 26 ++ debian/patches/series | 1 + 2 files changed, 27 insertions(+) diff --git a/debian/patches/0004-Fix-for-Debian-bug-55.patch b/debian/patches/0004-Fix-for-Debian-bug-55.patch new file mode 100644 index 000..b9f5fb2 --- /dev/null +++ b/debian/patches/0004-Fix-for-Debian-bug-55.patch @@ -0,0 +1,26 @@ +From: Pietro Battiston +Date: Mon, 9 Apr 2012 11:49:47 +0200 +Subject: Fix for Debian bug #55. + +The test for cascaded_union involves scattering random patches and +verifying they form a MultiPolygon: depending on the random +scattering, they can instead (rarely) form a Polygon, and in that +case the test fails. This is a (hacky?) patch solving the problem. +--- + shapely/tests/cascaded_union.txt |5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/shapely/tests/cascaded_union.txt b/shapely/tests/cascaded_union.txt +index 7d54f31..2446349 100644 +--- a/shapely/tests/cascaded_union.txt b/shapely/tests/cascaded_union.txt +@@ -19,6 +19,7 @@ Buffer the points, producing 100 polygon spots + Perform a cascaded union of the polygon spots, dissolving them into a + collection of polygon patches + +- >>> cascaded_union(spots) # doctest: +ELLIPSIS +- ++ >>> u = cascaded_union(spots) # doctest: +ELLIPSIS ++ >>> u.__class__.__name__.endswith( 'Polygon' ) ++ True + diff --git a/debian/patches/series b/debian/patches/series index 0c06c1e..f72d9f8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-disable-broken-locale-test.patch 0002-rerun-cython.patch 0003-Fix-for-Debian-bug-663210.patch +0004-Fix-for-Debian-bug-55.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel