prepare 2.2.0

Author: hobu

setup.py

@@ -156,9 +156,9 @@ def get_pdal_config(option):
     if os.name != 'nt':
         extra_compile_args += ['-g','-O0']
 
-# readers.numpy doesn't exist until PDAL 1.8
-if PDALVERSION is not None and PDALVERSION >= Version('1.8'):
-    libraries.append('pdal_plugin_reader_numpy')
+if PDALVERSION < Version('2.0.0'):
+    raise Exception("PDAL version '%s' is not compatible with PDAL Python library version '%s'"%(PDALVERSION, module_version))
+
 
 if os.name in ['nt']:
     if os.environ.get('OSGEO4W_ROOT'):
@@ -168,8 +168,6 @@ def get_pdal_config(option):
         library_dirs = ['%s\Library\lib' % prefix]
 
     libraries = ['pdalcpp','pdal_util','ws2_32']
-    if PDALVERSION >= Version('1.8'):
-        libraries.append('libpdal_plugin_reader_numpy')
 
     extra_compile_args = ['/DNOMINMAX',]
 

test/test_pipeline.py

@@ -31,30 +31,30 @@ def fetch_json(self, filename):
         return output
 
 class TestPipeline(PDALTest):
-#
+
     @unittest.skipUnless(os.path.exists(os.path.join(DATADIRECTORY, 'sort.json')),
                          "missing test data")
     def test_construction(self):
         """Can we construct a PDAL pipeline"""
         json = self.fetch_json('sort.json')
         r = pdal.Pipeline(json)
-#
+
     @unittest.skipUnless(os.path.exists(os.path.join(DATADIRECTORY, 'sort.json')),
                          "missing test data")
     def test_execution(self):
         """Can we execute a PDAL pipeline"""
         x = self.fetch_json('sort.json')
         r = pdal.Pipeline(x)
-#        r.validate()
+        r.validate()
         r.execute()
         self.assertGreater(len(r.pipeline), 200)
-#
+
     def test_validate(self):
         """Do we complain with bad pipelines"""
         r = pdal.Pipeline(bad_json)
         with self.assertRaises(RuntimeError):
             r.validate()
-#
+
     @unittest.skipUnless(os.path.exists(os.path.join(DATADIRECTORY, 'sort.json')),
                          "missing test data")
     def test_array(self):
@@ -69,7 +69,7 @@ def test_array(self):
         a = arrays[0]
         self.assertAlmostEqual(a[0][0], 635619.85, 7)
         self.assertAlmostEqual(a[1064][2], 456.92, 7)
-#
+
     @unittest.skipUnless(os.path.exists(os.path.join(DATADIRECTORY, 'sort.json')),
                          "missing test data")
     def test_metadata(self):
@@ -82,8 +82,8 @@ def test_metadata(self):
         import json
         j = json.loads(metadata)
         self.assertEqual(j["metadata"]["readers.las"][0]["count"], 1065)
-#
-#
+
+
     @unittest.skipUnless(os.path.exists(os.path.join(DATADIRECTORY, 'sort.json')),
                          "missing test data")
     def test_no_execute(self):
@@ -114,7 +114,7 @@ def test_schema(self):
         r.validate()
         r.execute()
         self.assertEqual(r.schema['schema']['dimensions'][0]['name'], 'X')
-#
+
     @unittest.skipUnless(os.path.exists(os.path.join(DATADIRECTORY, 'chip.json')),
                          "missing test data")
     def test_merged_arrays(self):
@@ -125,7 +125,7 @@ def test_merged_arrays(self):
         r.execute()
         arrays = r.arrays
         self.assertEqual(len(arrays), 43)
-#
+
 
 class TestArrayLoad(PDALTest):