[Git][debian-gis-team/pykdtree][master] 5 commits: New upstream version 1.3.1
Antonio Valentino
gitlab at salsa.debian.org
Mon Jun 25 07:14:37 BST 2018
Antonio Valentino pushed to branch master at Debian GIS Project / pykdtree
Commits:
aa1f8f51 by Antonio Valentino at 2018-06-25T06:03:46+00:00
New upstream version 1.3.1
- - - - -
94b8f5c1 by Antonio Valentino at 2018-06-25T06:03:46+00:00
Update upstream source from tag 'upstream/1.3.1'
Update to upstream version '1.3.1'
with Debian dir d6ed49d4cffb1f948962ea15910027d60ecce493
- - - - -
bd5fe6c2 by Antonio Valentino at 2018-06-25T06:08:14+00:00
New upstream release
- - - - -
19de72e1 by Antonio Valentino at 2018-06-25T06:09:35+00:00
Refresh all patches
- - - - -
990db35f by Antonio Valentino at 2018-06-25T06:12:38+00:00
Set distribution to unstable
- - - - -
11 changed files:
- + LICENSE.txt
- MANIFEST.in
- PKG-INFO
- README
- debian/changelog
- debian/patches/0001-fix_egginfo_source.patch
- pykdtree.egg-info/PKG-INFO
- pykdtree.egg-info/SOURCES.txt
- pykdtree/_kdtree_core.c
- pykdtree/test_tree.py
- setup.py
Changes:
=====================================
LICENSE.txt
=====================================
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007, 2015 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
=====================================
MANIFEST.in
=====================================
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,2 @@
exclude pykdtree/render_template.py
+include LICENSE.txt
=====================================
PKG-INFO
=====================================
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: pykdtree
-Version: 1.3.0
+Version: 1.3.1
Summary: Fast kd-tree implementation with OpenMP-enabled queries
Home-page: UNKNOWN
Author: Esben S. Nielsen
@@ -14,3 +14,4 @@ Classifier: Programming Language :: Python
Classifier: Operating System :: OS Independent
Classifier: Intended Audience :: Science/Research
Classifier: Topic :: Scientific/Engineering
+Requires-Python: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
=====================================
README
=====================================
--- a/README
+++ b/README
@@ -125,7 +125,9 @@ turned off by adding the following to `appveyor.yml` in the
Changelog
---------
-v1.3.0 : Keyword argument "mask" added to "qeury" method. OpenMP compilation now works for MS Visual Studio compiler
+v1.3.1 : Fix masking in the "query" method introduced in 1.3.0
+
+v1.3.0 : Keyword argument "mask" added to "query" method. OpenMP compilation now works for MS Visual Studio compiler
v1.2.2 : Build process fixes
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pykdtree (1.3.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/patches
+ - refresh all patches
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Mon, 25 Jun 2018 06:12:18 +0000
+
pykdtree (1.3.0-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/patches/0001-fix_egginfo_source.patch
=====================================
--- a/debian/patches/0001-fix_egginfo_source.patch
+++ b/debian/patches/0001-fix_egginfo_source.patch
@@ -8,10 +8,11 @@ Add missing setup.cfg file in the pykdtree.egg-info/SOURCES.txt
1 file changed, 1 deletion(-)
diff --git a/pykdtree.egg-info/SOURCES.txt b/pykdtree.egg-info/SOURCES.txt
-index d391abd..1ca46b1 100644
+index 0598b63..0cb3b35 100644
--- a/pykdtree.egg-info/SOURCES.txt
+++ b/pykdtree.egg-info/SOURCES.txt
-@@ -1,5 +1,4 @@
+@@ -1,6 +1,5 @@
+ LICENSE.txt
MANIFEST.in
-README
setup.cfg
=====================================
pykdtree.egg-info/PKG-INFO
=====================================
--- a/pykdtree.egg-info/PKG-INFO
+++ b/pykdtree.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: pykdtree
-Version: 1.3.0
+Version: 1.3.1
Summary: Fast kd-tree implementation with OpenMP-enabled queries
Home-page: UNKNOWN
Author: Esben S. Nielsen
@@ -14,3 +14,4 @@ Classifier: Programming Language :: Python
Classifier: Operating System :: OS Independent
Classifier: Intended Audience :: Science/Research
Classifier: Topic :: Scientific/Engineering
+Requires-Python: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
=====================================
pykdtree.egg-info/SOURCES.txt
=====================================
--- a/pykdtree.egg-info/SOURCES.txt
+++ b/pykdtree.egg-info/SOURCES.txt
@@ -1,3 +1,4 @@
+LICENSE.txt
MANIFEST.in
README
setup.cfg
=====================================
pykdtree/_kdtree_core.c
=====================================
--- a/pykdtree/_kdtree_core.c
+++ b/pykdtree/_kdtree_core.c
@@ -607,7 +607,7 @@ void search_leaf_float_mask(float *restrict pa, uint32_t *restrict pidx, int8_t
for (i = 0; i < n; i++)
{
/* Is this point masked out? */
- if (mask[start_idx + i])
+ if (mask[pidx[start_idx + i]])
{
continue;
}
@@ -1251,7 +1251,7 @@ void search_leaf_double_mask(double *restrict pa, uint32_t *restrict pidx, int8_
for (i = 0; i < n; i++)
{
/* Is this point masked out? */
- if (mask[start_idx + i])
+ if (mask[pidx[start_idx + i]])
{
continue;
}
=====================================
pykdtree/test_tree.py
=====================================
--- a/pykdtree/test_tree.py
+++ b/pykdtree/test_tree.py
@@ -302,18 +302,27 @@ def test_scipy_comp():
def test1d_mask():
data_pts = np.arange(1000)
+ # put the input locations in random order
+ np.random.shuffle(data_pts)
+ bad_idx = np.nonzero(data_pts == 400)
+ nearest_idx_1 = np.nonzero(data_pts == 399)
+ nearest_idx_2 = np.nonzero(data_pts == 390)
kdtree = KDTree(data_pts, leafsize=15)
- query_pts = np.arange(400, 300, -10)
+ # shift the query points just a little bit for known neighbors
+ # we want 399 as a result, not 401, when we query for ~400
+ query_pts = np.arange(399.9, 299.9, -10)
query_mask = np.zeros(data_pts.shape[0]).astype(bool)
- query_mask[400] = True
+ query_mask[bad_idx] = True
dist, idx = kdtree.query(query_pts, mask=query_mask)
- assert idx[0] == 399 # would be 400 if no mask
- assert dist[0] == 1.
- assert idx[1] == 390
+ assert idx[0] == nearest_idx_1 # 399, would be 400 if no mask
+ assert np.isclose(dist[0], 0.9)
+ assert idx[1] == nearest_idx_2 # 390
+ assert np.isclose(dist[1], 0.1)
def test1d_all_masked():
data_pts = np.arange(1000)
+ np.random.shuffle(data_pts)
kdtree = KDTree(data_pts, leafsize=15)
query_pts = np.arange(400, 300, -10)
query_mask = np.ones(data_pts.shape[0]).astype(bool)
=====================================
setup.py
=====================================
--- a/setup.py
+++ b/setup.py
@@ -73,11 +73,12 @@ class build_ext_subclass(build_ext):
setup(
name='pykdtree',
- version='1.3.0',
+ version='1.3.1',
description='Fast kd-tree implementation with OpenMP-enabled queries',
author='Esben S. Nielsen',
author_email='storpipfugl at gmail.com',
packages = ['pykdtree'],
+ python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
install_requires=['numpy'],
setup_requires=['numpy'],
tests_require=['nose'],
@@ -95,6 +96,3 @@ setup(
'Topic :: Scientific/Engineering'
]
)
-
-
-
View it on GitLab: https://salsa.debian.org/debian-gis-team/pykdtree/compare/2bad0fea1659bfc197ce1e62d3c6a0ddc6c1e8db...990db35fb056805ad0b95c9ec730f421e757ce84
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pykdtree/compare/2bad0fea1659bfc197ce1e62d3c6a0ddc6c1e8db...990db35fb056805ad0b95c9ec730f421e757ce84
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/20180625/0908598e/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list