This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-pdal.
commit 955a53ccd28216d9d33b07accb9424890616179f Author: Bas Couwenberg <[email protected]> Date: Mon Oct 23 12:25:16 2017 +0200 New upstream version 1.6.0+ds --- PKG-INFO | 2 +- VERSION.txt | 2 +- pdal/PyPipeline.cpp | 2 +- pdal/PyPipeline.hpp | 7 ++++--- pdal/__init__.py | 2 +- pdal/libpdalpython.cpp | 21 ++++++++++----------- pdal/libpdalpython.pyx | 2 +- setup.py | 1 - 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/PKG-INFO b/PKG-INFO index 1323f96..7d2bfc0 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: PDAL -Version: 1.5.0 +Version: 1.6.0 Summary: Point cloud data processing Home-page: http://pdal.io Author: Howard Butler diff --git a/VERSION.txt b/VERSION.txt index 3e1ad72..ce6a70b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.5.0 \ No newline at end of file +1.6.0 \ No newline at end of file diff --git a/pdal/PyPipeline.cpp b/pdal/PyPipeline.cpp index 63f1f17..880cbf0 100644 --- a/pdal/PyPipeline.cpp +++ b/pdal/PyPipeline.cpp @@ -91,7 +91,7 @@ std::vector<PArray> Pipeline::getArrays() const for (auto i: pvset) { - PArray array = new pdal::plang::Array; + PArray array = new pdal::python::Array; array->update(i); output.push_back(array); } diff --git a/pdal/PyPipeline.hpp b/pdal/PyPipeline.hpp index e356f7e..df7c1ef 100644 --- a/pdal/PyPipeline.hpp +++ b/pdal/PyPipeline.hpp @@ -37,7 +37,7 @@ #include <pdal/PipelineManager.hpp> #include <pdal/PipelineWriter.hpp> #include <pdal/util/FileUtils.hpp> -#include <pdal/plang/Array.hpp> +#include <pdal/PyArray.hpp> #include <pdal/PipelineExecutor.hpp> #include <string> @@ -46,8 +46,9 @@ #undef tolower #undef isspace +#ifndef PY_ARRAY_UNIQUE_SYMBOL #define PY_ARRAY_UNIQUE_SYMBOL LIBPDALPYTHON_ARRAY_API -#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION +#endif #include <numpy/arrayobject.h> @@ -62,7 +63,7 @@ public: {} }; - typedef pdal::plang::Array* PArray; + typedef pdal::python::Array* PArray; class Pipeline { public: diff --git a/pdal/__init__.py b/pdal/__init__.py index 0ec0921..4e4e32f 100644 --- a/pdal/__init__.py +++ b/pdal/__init__.py @@ -1,3 +1,3 @@ -__version__='1.5.0' +__version__='1.6.0' from .pipeline import Pipeline diff --git a/pdal/libpdalpython.cpp b/pdal/libpdalpython.cpp index 600b88d..b50931f 100644 --- a/pdal/libpdalpython.cpp +++ b/pdal/libpdalpython.cpp @@ -4,7 +4,7 @@ { "distutils": { "depends": [ - "/Users/hobu/pdal-build/include/pdal/plang/Array.hpp", + "/Users/hobu/pdal-build/include/pdal/PyArray.hpp", "/usr/local/lib/python3.6/site-packages/numpy/core/include/numpy/arrayobject.h", "/usr/local/lib/python3.6/site-packages/numpy/core/include/numpy/ufuncobject.h", "pdal/PyPipeline.hpp" @@ -14,16 +14,15 @@ ], "include_dirs": [ "/Users/hobu/pdal-build/include", - "/usr/local/Cellar/gdal/1.11.5_1/include", + "/usr/local/Cellar/gdal/1.11.5_3/include", "/usr/local/Cellar/libxml2/2.9.4/include/libxml2", "/usr/local/include", - "/usr/local/include/laszip", + "/usr/local/include", "/usr/local/lib/python3.6/site-packages/numpy/core/include" ], "language": "c++", "libraries": [ - "pdalcpp", - "pdal_plang" + "pdalcpp" ], "library_dirs": [ "/Users/hobu/pdal-build/lib" @@ -488,7 +487,7 @@ static CYTHON_INLINE float __PYX_NAN() { #include <stdlib.h> #include "numpy/arrayobject.h" #include "numpy/ufuncobject.h" -#include "pdal/plang/Array.hpp" +#include "pdal/PyArray.hpp" #include "PyPipeline.hpp" #include "pythread.h" #ifdef _OPENMP @@ -2320,15 +2319,15 @@ static PyObject *__pyx_pw_4pdal_13libpdalpython_10PyPipeline_6arrays_1__get__(Py } static PyObject *__pyx_pf_4pdal_13libpdalpython_10PyPipeline_6arrays___get__(struct __pyx_obj_4pdal_13libpdalpython_PyPipeline *__pyx_v_self) { - std::vector<pdal::plang::Array *> __pyx_v_v; + std::vector<pdal::python::Array *> __pyx_v_v; PyObject *__pyx_v_output = NULL; - std::vector<pdal::plang::Array *> ::iterator __pyx_v_it; - pdal::plang::Array *__pyx_v_a; - pdal::plang::Array *__pyx_v_ptr; + std::vector<pdal::python::Array *> ::iterator __pyx_v_it; + pdal::python::Array *__pyx_v_a; + pdal::python::Array *__pyx_v_ptr; void *__pyx_v_o; PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations - std::vector<pdal::plang::Array *> __pyx_t_1; + std::vector<pdal::python::Array *> __pyx_t_1; PyObject *__pyx_t_2 = NULL; int __pyx_t_3; void *__pyx_t_4; diff --git a/pdal/libpdalpython.pyx b/pdal/libpdalpython.pyx index 0728cc1..6c7b748 100644 --- a/pdal/libpdalpython.pyx +++ b/pdal/libpdalpython.pyx @@ -12,7 +12,7 @@ from cpython cimport PyObject, Py_INCREF from cython.operator cimport dereference as deref, preincrement as inc -cdef extern from "pdal/plang/Array.hpp" namespace "pdal::plang": +cdef extern from "pdal/PyArray.hpp" namespace "pdal::python": cdef cppclass Array: void* getPythonArray() except+ diff --git a/setup.py b/setup.py index 0542234..a4a87a5 100644 --- a/setup.py +++ b/setup.py @@ -145,7 +145,6 @@ if pdal_config and "clean" not in sys.argv: include_dirs.append(numpy.get_include()) extra_compile_args = ['-std=c++11',] -libraries.append('pdal_plang') DEBUG=False if DEBUG: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-pdal.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
