[Git][debian-gis-team/python-pdal][master] 4 commits: New upstream version 2.1.6+ds

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / python-pdal


Commits:
7e16fe79 by Bas Couwenberg at 2018-11-21T05:57:36Z
New upstream version 2.1.6+ds
- - - - -
c600abb7 by Bas Couwenberg at 2018-11-21T05:57:39Z
Merge tag 'upstream/2.1.6+ds'

Upstream version 2.1.6+ds

- - - - -
68d021d4 by Bas Couwenberg at 2018-11-21T05:57:51Z
New upstream release.

- - - - -
b94d137a by Bas Couwenberg at 2018-11-21T05:58:54Z
Set distribution to unstable.

- - - - -


5 changed files:

- PKG-INFO
- VERSION.txt
- debian/changelog
- pdal/__init__.py
- setup.py


Changes:

=====================================
PKG-INFO
=====================================
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: PDAL
-Version: 2.1.5
+Version: 2.1.6
 Summary: Point cloud data processing
 Home-page: http://pdal.io
 Author: Howard Butler


=====================================
VERSION.txt
=====================================
@@ -1 +1 @@
-2.1.5
\ No newline at end of file
+2.1.6
\ No newline at end of file


=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+python-pdal (2.1.6+ds-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 21 Nov 2018 06:58:45 +0100
+
 python-pdal (2.1.5+ds-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
pdal/__init__.py
=====================================
@@ -1,4 +1,4 @@
-__version__='2.1.5'
+__version__='2.1.6'
 
 from .pipeline import Pipeline
 from .array import Array


=====================================
setup.py
=====================================
@@ -156,12 +156,21 @@ if DEBUG:
     if os.name != 'nt':
         extra_compile_args += ['-g','-O0']
 
+# readers.numpy doesn't exist until PDAL 1.8
+if PDALVERSION >= Version('1.8'):
+    libraries.append('pdal_plugin_reader_numpy')
+
 if os.name in ['nt']:
-    if os.environ['OSGEO4W_ROOT']:
-        library_dirs = ['c:/OSGeo4W64/lib']
+    if os.environ.get('OSGEO4W_ROOT'):
+        library_dirs = ['c:/%s/lib' % os.environ.get('OSGEO4W_ROOT')]
+    if os.environ.get('CONDA_PREFIX'):
+        prefix=os.path.expandvars('%CONDA_PREFIX%')
+        library_dirs = ['%s\Library\lib' % prefix]
+        
     libraries = ['pdalcpp','pdal_util','ws2_32']
     if PDALVERSION >= Version('1.8'):
-        libraries.append('pdal_plugin_reader_numpy')
+        libraries.append('libpdal_plugin_reader_numpy')
+
     extra_compile_args = ['/DNOMINMAX',]
 
 if 'linux' in sys.platform or 'linux2' in sys.platform:
@@ -172,9 +181,7 @@ if 'linux' in sys.platform or 'linux2' in sys.platform:
 elif 'darwin' in sys.platform:
     extra_compile_args += ['-std=c++11', '-Wno-unknown-pragmas']
 
-# readers.numpy doesn't exist until PDAL 1.8
-if PDALVERSION >= Version('1.8'):
-    libraries.append('pdal_plugin_reader_numpy')
+
 
 sources=['pdal/libpdalpython'+ext, "pdal/PyPipeline.cpp"  ]
 extensions = [DistutilsExtension("*",



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-pdal/compare/cda074807053f317901bdb406cdcea6f4109faf8...b94d137a3b4934da76d979ebdf16a96461ce0ba8

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-pdal/compare/cda074807053f317901bdb406cdcea6f4109faf8...b94d137a3b4934da76d979ebdf16a96461ce0ba8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181121/9a0df1f9/attachment-0001.html>