[python-pdal] 04/05: Drop patches, applied upstream.

[Sebastiaan Couwenberg]

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

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

commit ace1f930b27c17a55c127e709628f9f23a51257f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 2 03:05:01 2016 +0200

    Drop patches, applied upstream.
---
 debian/changelog                             |  1 +
 debian/patches/clean-setup.patch             | 26 ---------------
 debian/patches/series                        |  2 --
 debian/patches/skip-tests-missing-data.patch | 50 ----------------------------
 4 files changed, 1 insertion(+), 78 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 409901b..6eb59eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ python-pdal (1.2.0~git20160301-979fcd7+ds-1) UNRELEASED; urgency=medium
     - Tarball created from PDAL 1.2.0 source,
       PyPi still has 1.1.0 which is incompatible with PDAL 1.2.0.
   * Update dh_python & dh_numpy calls to act on specific package.
+  * Drop patches, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Apr 2016 02:55:47 +0200
 
diff --git a/debian/patches/clean-setup.patch b/debian/patches/clean-setup.patch
deleted file mode 100644
index 89edc84..0000000
--- a/debian/patches/clean-setup.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Reduce requirements for clean target.
- Don't require pdal-config, and don't cythonize the extensions.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/PDAL/PDAL/pull/1185
-Applied-Upstream: https://github.com/PDAL/PDAL/commit/5aa0e60087bd20aebdb6b518f51a047bc00103eb
-
---- a/setup.py
-+++ b/setup.py
-@@ -108,7 +108,7 @@ extra_link_args = []
- 
- from setuptools.extension import Extension as DistutilsExtension
- 
--if pdal_config:
-+if pdal_config and "clean" not in sys.argv:
-     # Collect other options from PDAL
-     for item in get_pdal_config('--includes').split():
-         if item.startswith("-I"):
-@@ -135,7 +135,7 @@ extensions = [DistutilsExtension("*",
-                                    extra_compile_args=extra_compile_args,
-                                    libraries=libraries,
-                                    extra_link_args=extra_link_args,)]
--if USE_CYTHON:
-+if USE_CYTHON and "clean" not in sys.argv:
-     from Cython.Build import cythonize
-     extensions= cythonize(extensions, language="c++")
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5b3a76a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-clean-setup.patch
-skip-tests-missing-data.patch
diff --git a/debian/patches/skip-tests-missing-data.patch b/debian/patches/skip-tests-missing-data.patch
deleted file mode 100644
index 3853953..0000000
--- a/debian/patches/skip-tests-missing-data.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Skip tests when test data is missing.
- The test data is missing from the PyPi tarballs.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/PDAL/PDAL/pull/1186
-Applied-Upstream: https://github.com/PDAL/PDAL/commit/89f89416ed8a06eb875f343e4e537bb0fc8f59f1
-
---- a/test/test_libpdal.py
-+++ b/test/test_libpdal.py
-@@ -2,6 +2,7 @@ import pdal
- from pdal import libpdalpython
- # import pdal.libpdalpython
- import unittest
-+import os
- 
- def fetch_xml(filename):
-     output = ''
-@@ -11,11 +12,15 @@ def fetch_xml(filename):
- 
- class TestPDALArray(unittest.TestCase):
- 
-+  @unittest.skipUnless(os.path.exists('../test/data/pipeline/pipeline_read.xml'),
-+                       "missing test data")
-   def test_construction(self):
-     """Can we construct a PDAL pipeline"""
-     xml = fetch_xml('../test/data/pipeline/pipeline_read.xml')
-     r = libpdalpython.PyPipeline(xml)
- 
-+  @unittest.skipUnless(os.path.exists('../test/data/pipeline/pipeline_read.xml'),
-+                       "missing test data")
-   def test_execution(self):
-     """Can we execute a PDAL pipeline"""
-     xml = fetch_xml('../test/data/pipeline/pipeline_read.xml')
-@@ -23,6 +28,8 @@ class TestPDALArray(unittest.TestCase):
-     r.execute()
-     self.assertEqual(len(r.xml), 2184)
- 
-+  @unittest.skipUnless(os.path.exists('../test/data/pipeline/pipeline_read.xml'),
-+                       "missing test data")
-   def test_array(self):
-     """Can we fetch PDAL data as a numpy array"""
-     xml = fetch_xml('../test/data/pipeline/pipeline_read.xml')
-@@ -35,6 +42,8 @@ class TestPDALArray(unittest.TestCase):
-     self.assertAlmostEqual(a[0][0], 637012.24, 7)
-     self.assertAlmostEqual(a[1064][2], 423.92, 7)
- 
-+  @unittest.skipUnless(os.path.exists('../test/data/filters/chip.xml'),
-+                       "missing test data")
-   def test_merged_arrays(self):
-     """Can we fetch merged PDAL data """
-     xml = fetch_xml('../test/data/filters/chip.xml')

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