[python-shapely] 97/148: Removed obsolete patches (all of them)

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Thu Aug 20 17:42:08 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository python-shapely.

commit 35b316b78e7a7ac659942dcf99fe2c6d352757cc
Author: Pietro Battiston <me at pietrobattiston.it>
Date:   Mon Jan 20 10:53:25 2014 +0100

    Removed obsolete patches (all of them)
---
 .../patches/0001-disable-broken-locale-test.patch  | 49 ----------------------
 debian/patches/0002-rerun-cython.patch             | 33 ---------------
 .../patches/0003-Fix-for-Debian-bug-663210.patch   | 29 -------------
 .../patches/0004-Fix-for-Debian-bug-666655.patch   | 26 ------------
 debian/patches/series                              |  4 --
 5 files changed, 141 deletions(-)

diff --git a/debian/patches/0001-disable-broken-locale-test.patch b/debian/patches/0001-disable-broken-locale-test.patch
deleted file mode 100644
index 9239ccd..0000000
--- a/debian/patches/0001-disable-broken-locale-test.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Pietro Battiston <me at pietrobattiston.it>
-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.
-Author: Pietro Battiston <me at pietrobattiston.it>
-Forwarded: yes
----
- shapely/tests/wkt_locale.txt | 28 ----------------------------
- 1 file changed, 28 deletions(-)
- delete mode 100644 shapely/tests/wkt_locale.txt
-
-diff --git a/shapely/tests/wkt_locale.txt b/shapely/tests/wkt_locale.txt
-deleted file mode 100644
-index ebbc024..0000000
---- 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, '')
diff --git a/debian/patches/0002-rerun-cython.patch b/debian/patches/0002-rerun-cython.patch
deleted file mode 100644
index 6abc10a..0000000
--- a/debian/patches/0002-rerun-cython.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Pietro Battiston <me at pietrobattiston.it>
-Date: Wed, 21 Dec 2011 15:29:24 +0100
-Subject: rerun-cython
-
-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.
----
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 328c0b6..0b5f17f 100644
---- a/setup.py
-+++ b/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
- import platform
-@@ -109,7 +109,7 @@ elif (hasattr(platform, 'python_implementation')
- 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/0003-Fix-for-Debian-bug-663210.patch b/debian/patches/0003-Fix-for-Debian-bug-663210.patch
deleted file mode 100644
index 82de2a2..0000000
--- a/debian/patches/0003-Fix-for-Debian-bug-663210.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: sgillies <sean.gillies at gmail.com>
-Date: Sat, 10 Mar 2012 11:22:25 -0800
-Subject: Fix for Debian bug #663210.
-
-There's no need for Shapely to be incidentally testing the numerical
-details of GEOS, so this patch cuts that out of the test.
-
-Signed-off-by: Pietro Battiston <me at pietrobattiston.it>
----
- shapely/tests/attribute-chains.txt | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/shapely/tests/attribute-chains.txt b/shapely/tests/attribute-chains.txt
-index 9b7933d..442cc2b 100644
---- a/shapely/tests/attribute-chains.txt
-+++ b/shapely/tests/attribute-chains.txt
-@@ -28,10 +28,8 @@ anonymous references.
-     >>> print list(p.interiors[0].coords)
-     [(-0.25, 0.25), (-0.25, 0.75), (-0.75, 0.75), (-0.75, 0.25), (-0.25, 0.25)]
-     >>> xy = list(p.interiors[0].buffer(1).exterior.coords)[0]
--    >>> xy[0] + 0.25 <= 1.0e-7
--    True
--    >>> xy[1] + 0.75 <= 1.0e-7
--    True
-+    >>> len(xy)
-+    2
- 
- Test multiple operators, boundary of a buffer
- 
diff --git a/debian/patches/0004-Fix-for-Debian-bug-666655.patch b/debian/patches/0004-Fix-for-Debian-bug-666655.patch
deleted file mode 100644
index 3560d38..0000000
--- a/debian/patches/0004-Fix-for-Debian-bug-666655.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Pietro Battiston <me at pietrobattiston.it>
-Date: Mon, 9 Apr 2012 11:49:47 +0200
-Subject: Fix for Debian bug #666655.
-
-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 file 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
--  <shapely.geometry.multipolygon.MultiPolygon object at 0x...>
-+  >>> u = cascaded_union(spots) # doctest: +ELLIPSIS
-+  >>> u.__class__.__name__.endswith( 'Polygon' )
-+  True
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f72d9f8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-0001-disable-broken-locale-test.patch
-0002-rerun-cython.patch
-0003-Fix-for-Debian-bug-663210.patch
-0004-Fix-for-Debian-bug-666655.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git



More information about the Pkg-grass-devel mailing list