[python-pyepsg] 02/04: Drop the patch queue, applied upstream

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository python-pyepsg.

commit da6aba9efea72a392b0c33ddd6c0261b50609aff
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Jun 8 09:54:21 2017 +0100

    Drop the patch queue, applied upstream
---
 debian/patches/Add-install-requirements.patch | 20 --------
 debian/patches/Fix-the-test-suite.patch       | 67 ---------------------------
 debian/patches/series                         |  2 -
 3 files changed, 89 deletions(-)

diff --git a/debian/patches/Add-install-requirements.patch b/debian/patches/Add-install-requirements.patch
deleted file mode 100644
index dbd6818..0000000
--- a/debian/patches/Add-install-requirements.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at users.noreply.github.com>
-Date: Thu, 25 May 2017 14:22:21 +0100
-Subject: Add install requirements
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 6860bbc..60466ef 100644
---- a/setup.py
-+++ b/setup.py
-@@ -33,6 +33,6 @@ setup(
-                  'Topic :: Scientific/Engineering :: GIS'],
-     description='Easy access to the EPSG database via http://epsg.io/',
-     long_description=open('README.rst').read(),
--
-+    install_requires=['requests'],
-     py_modules=['pyepsg'],
- )
diff --git a/debian/patches/Fix-the-test-suite.patch b/debian/patches/Fix-the-test-suite.patch
deleted file mode 100644
index 8c362ea..0000000
--- a/debian/patches/Fix-the-test-suite.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Thu, 25 May 2017 14:15:29 +0100
-Subject: Fix the test suite
-
-This is a squash commit of the following pull requests:
-- https://github.com/rhattersley/pyepsg/pull/6
-- https://github.com/rhattersley/pyepsg/pull/7
----
- pyepsg.py | 25 ++++++++++++-------------
- 1 file changed, 12 insertions(+), 13 deletions(-)
-
-diff --git a/pyepsg.py b/pyepsg.py
-index 658c5e7..466f119 100644
---- a/pyepsg.py
-+++ b/pyepsg.py
-@@ -189,31 +189,30 @@ class CRS(EPSG):
-         For example::
- 
-             >>> print(get(21781).domain_of_validity())
--            [5.97, 10.49, 45.83, 47.81]
-+            [5.96, 10.49, 45.82, 47.81]
- 
- 
-         """
--        # TODO: Check for gmd:EX_GeographicBoundingBox and blow up otherwise.
-         # TODO: Generalise interface to return a polygon? (Can we find
-         # something that uses a polygon instead?)
-         domain = self.element.find(GML_NS + 'domainOfValidity')
-         domain_href = domain.attrib[XLINK_NS + 'href']
-         url = '{prefix}{code}.gml?download'.format(prefix=EPSG_IO_URL,
-                                                    code=domain_href)
--        xml = requests.get(url).text
--        gml = ET.fromstring(xml.encode('UTF-8'))
-+        xml = requests.get(url).content
-+        gml = ET.fromstring(xml)
- 
--        def extract_bound(i, tag):
--            # TODO: Figure out if this is our problem or ET's.
--            # `find` isn't returning anything :(
--            # ns = '{http://www.isotc211.org/2005/gmd}'
--            # bound = gml.find(ns + tag)
--            bound = gml[1][0][1][0][i]
--            return float(bound[0].text)
-+        def extract_bound(tag):
-+            ns = '{http://www.isotc211.org/2005/gmd}'
-+            xpath = './/{ns}EX_GeographicBoundingBox/{ns}{tag}/'.format(
-+                ns=ns,
-+                tag=tag)
-+            bound = gml.find(xpath)
-+            return float(bound.text)
- 
-         tags = ('westBoundLongitude', 'eastBoundLongitude',
-                 'southBoundLatitude', 'northBoundLatitude')
--        bounds = [extract_bound(i, tag) for i, tag in enumerate(tags)]
-+        bounds = [extract_bound(tag) for tag in tags]
-         return bounds
- 
- 
-@@ -272,7 +271,7 @@ def get(code):
-     if instance is None:
-         url = '{prefix}{code}.gml?download'.format(prefix=EPSG_IO_URL,
-                                                    code=code)
--        xml = requests.get(url).text
-+        xml = requests.get(url).content
-         root = ET.fromstring(xml)
-         class_for_tag = {
-             GML_NS + 'CartesianCS': CartesianCS,
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0928c71..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix-the-test-suite.patch
-Add-install-requirements.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-pyepsg.git