diff -Nru pyresample-1.1.5/changelog.rst pyresample-1.1.6/changelog.rst --- pyresample-1.1.5/changelog.rst 2015-10-12 11:53:47.000000000 +0000 +++ pyresample-1.1.6/changelog.rst 2016-02-25 09:34:04.000000000 +0000 @@ -6,6 +6,46 @@ - Update changelog. [Martin Raspaud] +- Bump version: 1.1.5 → 1.1.6. [Martin Raspaud] + +- Fix #35 supporting scipy kdtree again. [Martin Raspaud] + + A previous commit was looking for a 'data_pts' attribute in the kdtree + object, which is available in pykdtree, but not scipy. + +- Merge pull request #32 from mitkin/master. [Martin Raspaud] + + [tests] Skip deprecation warnings in test_gauss_multi_uncert + +- Merge remote-tracking branch 'gh-pytroll/pre-master' [Mikhail Itkin] + +- Put quotes around pip version specifiers to make things work. [Martin + Raspaud] + +- Install the right matplotlib in travis. [Martin Raspaud] + + The latest matplotlib (1.5) doesn't support python 2.6 and 3.3. This patch + chooses the right matplotlib version to install depending on the python + version at hand. + +- Skip deprecation warnings. [Mikhail Itkin] + + Catch the rest of the warnings. Check if there is only one, and + whether it contains the relevant message ('possible more than 8 + neighbours found'). This patch is necessary for python 2.7.9 and newer + + +- Merge pull request #31 from bhawkins/fix-kdtree-dtype. [Martin + Raspaud] + + Fix possible type mismatch with pykdtree. + +- Add test to expose pykdtree TypeError exception. [Brian Hawkins] + +- Fix possible type mismatch with pykdtree. [Brian Hawkins] + +- Update changelog. [Martin Raspaud] + - Bump version: 1.1.4 → 1.1.5. [Martin Raspaud] - Don't build on 3.2 anymore (because of coverage's lack of support for diff -Nru pyresample-1.1.5/debian/changelog pyresample-1.1.6/debian/changelog --- pyresample-1.1.5/debian/changelog 2016-02-18 15:05:16.000000000 +0000 +++ pyresample-1.1.6/debian/changelog 2016-02-27 19:08:40.000000000 +0000 @@ -1,14 +1,24 @@ -pyresample (1.1.5-0ubuntu2) xenial; urgency=medium +pyresample (1.1.6-1) unstable; urgency=medium - * Backport upstream patch to fix test failure with new Python versions. + [ Antonio Valentino ] + * New upstream release + * debian/gbp.conf file added + * debian/control + - standard version bumped to 3.9.7 (no change) + - updated VCS URL + - update build dependencies + * debian/patches + - removed patch for skipping basemap tests (no longer necessary) + - refresh remaining patches + - new patch for skipping tests that fail with python 3. + See also upstream bug https://github.com/pytroll/pyresample/issues/36 + * watch file updated + + [ Bas Couwenberg ] + * debian/copyright + - Group copyright by license - -- Dmitry Shachnev Thu, 18 Feb 2016 18:04:45 +0300 - -pyresample (1.1.5-0ubuntu1) xenial; urgency=medium - - * New upstream version - - -- Matthias Klose Fri, 12 Feb 2016 16:28:41 +0100 + -- Antonio Valentino Sat, 27 Feb 2016 17:30:23 +0000 pyresample (1.1.3-1) unstable; urgency=medium diff -Nru pyresample-1.1.5/debian/control pyresample-1.1.6/debian/control --- pyresample-1.1.5/debian/control 2016-02-18 15:06:42.000000000 +0000 +++ pyresample-1.1.6/debian/control 2016-02-27 18:43:21.000000000 +0000 @@ -1,12 +1,9 @@ Source: pyresample -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian GIS Project +Maintainer: Debian GIS Project Uploaders: Antonio Valentino Section: python Testsuite: autopkgtest Priority: optional -X-Python-Version: >= 2.6 -X-Python3-Version: >= 3.2 Build-Depends: debhelper (>= 9.0.0), dh-python, python-all, @@ -22,13 +19,16 @@ python-configobj, python3-configobj, python-sphinx, - python-nose, - python3-nose, - python-mpltoolkits.basemap -Standards-Version: 3.9.6 + python-numexpr, + python3-numexpr, + python-mpltoolkits.basemap, + python3-mpltoolkits.basemap +Standards-Version: 3.9.7 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/pyresample.git -Vcs-Git: http://anonscm.debian.org/git/pkg-grass/pyresample.git +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/pyresample.git Homepage: https://github.com/pytroll/pyresample +X-Python-Version: >= 2.6 +X-Python3-Version: >= 3.2 Package: python-pyresample Architecture: all @@ -60,7 +60,8 @@ python3-numpy, python3-pyproj, python3-scipy -Recommends: python3-numexpr +Recommends: python3-numexpr, + python3-mpltoolkits.basemap Suggests: python-pyresample-doc Description: Resampling of remote sensing data in Python 3 Pyresample is a Python package for resampling (reprojection) of earth diff -Nru pyresample-1.1.5/debian/copyright pyresample-1.1.6/debian/copyright --- pyresample-1.1.5/debian/copyright 2015-07-18 11:30:31.000000000 +0000 +++ pyresample-1.1.6/debian/copyright 2016-02-27 19:07:06.000000000 +0000 @@ -3,39 +3,16 @@ Source: https://github.com/pytroll/pyresample Files: * -Copyright: 2010-2015 Esben S. Nielsen -License: LGPL-3+ - -Files: pyresample/geometry.py -Copyright: 2010-2015 Thomas Lavergne - Esben S. Nielsen -License: LGPL-3+ - -Files: pyresample/plot.py -Copyright: 2010-2015 Thomas Lavergne - Esben S. Nielsen -License: LGPL-3+ - -Files: pyresample/spherical_geometry.py -Copyright: 2010-2015 Martin Raspaud -License: LGPL-3+ - -Files: pyresample/_spatial_mp.py -Copyright: 2010-2013 Esben S. Nielsen - Martin Raspaud -License: LGPL-3+ - -Files: pyresample/utils.py -Copyright: 2010-2015 Thomas Lavergne - Esben S. Nielsen -License: LGPL-3+ - -Files: pyresample/test/__init__.py -Copyright: 2014-2015 Martin Raspaud +Copyright: 2010-2015, Esben S. Nielsen + 2010-2015, Thomas Lavergne + 2010, 2013-2015, Martin Raspaud +Copyright: 2013-2015, Antonio Valentino +License: GPL-3.0+ + License: GPL-3.0+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -69,3 +46,4 @@ . On Debian systems, the complete text of the GNU Lesser General Public License can be found in "/usr/share/common-licenses/LGPL-3". + diff -Nru pyresample-1.1.5/debian/gbp.conf pyresample-1.1.6/debian/gbp.conf --- pyresample-1.1.5/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ pyresample-1.1.6/debian/gbp.conf 2016-02-27 18:43:21.000000000 +0000 @@ -0,0 +1,16 @@ +[DEFAULT] + +# The default name for the upstream branch is "upstream". +# Change it if the name is different (for instance, "master"). +upstream-branch = upstream + +# The default name for the Debian branch is "master". +# Change it if the name is different (for instance, "debian/unstable"). +debian-branch = master + +# git-import-orig uses the following names for the upstream tags. +# Change the value if you are not using git-import-orig +upstream-tag = upstream/%(version)s + +# Always use pristine-tar. +pristine-tar = True diff -Nru pyresample-1.1.5/debian/patches/0001-skip-basemap-tests.patch pyresample-1.1.6/debian/patches/0001-skip-basemap-tests.patch --- pyresample-1.1.5/debian/patches/0001-skip-basemap-tests.patch 2015-07-18 11:30:31.000000000 +0000 +++ pyresample-1.1.6/debian/patches/0001-skip-basemap-tests.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -From: Antonio Valentino -Date: Sat, 11 Jul 2015 20:57:24 +0200 -Subject: skip basemap tests - ---- - pyresample/test/test_plot.py | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/pyresample/test/test_plot.py b/pyresample/test/test_plot.py -index f2cd261..6de7fec 100644 ---- a/pyresample/test/test_plot.py -+++ b/pyresample/test/test_plot.py -@@ -11,6 +11,11 @@ try: - except ImportError: - pass # Postpone fail to individual tests - -+try: -+ from mpl_toolkits.basemap import Basemap -+except ImportError: -+ Basemap = None -+ - - def tmp(f): - f.tmp = True -@@ -40,6 +45,7 @@ class Test(unittest.TestCase): - self.assertAlmostEqual(b, 6356752.3142451793, - msg='Failed to get semi-minor axis of ellipsis') - -+ @unittest.skipIf(not Basemap, "basemap not available") - def test_area_def2basemap(self): - area_def = utils.parse_area_file(os.path.join(os.path.dirname(__file__), - 'test_files', 'areas.cfg'), 'ease_sh')[0] -@@ -48,6 +54,7 @@ class Test(unittest.TestCase): - bmap.rmajor == 6371228.0, - 'Failed to create Basemap object') - -+ @unittest.skipIf(not Basemap, "basemap not available") - def test_plate_carreeplot(self): - area_def = utils.parse_area_file(os.path.join(os.path.dirname(__file__), - 'test_files', 'areas.cfg'), 'pc_world')[0] -@@ -58,6 +65,7 @@ class Test(unittest.TestCase): - plt = plot._get_quicklook(area_def, result, num_meridians=0, - num_parallels=0) - -+ @unittest.skipIf(not Basemap, "basemap not available") - def test_easeplot(self): - area_def = utils.parse_area_file(os.path.join(os.path.dirname(__file__), - 'test_files', 'areas.cfg'), 'ease_sh')[0] -@@ -67,6 +75,7 @@ class Test(unittest.TestCase): - fill_value=None) - plt = plot._get_quicklook(area_def, result) - -+ @unittest.skipIf(not Basemap, "basemap not available") - def test_orthoplot(self): - area_def = utils.parse_area_file(os.path.join(os.path.dirname(__file__), - 'test_files', 'areas.cfg'), 'ortho')[0] diff -Nru pyresample-1.1.5/debian/patches/0003-fix-proj4-initialization.patch pyresample-1.1.6/debian/patches/0003-fix-proj4-initialization.patch --- pyresample-1.1.5/debian/patches/0003-fix-proj4-initialization.patch 2015-07-18 11:30:31.000000000 +0000 +++ pyresample-1.1.6/debian/patches/0003-fix-proj4-initialization.patch 2016-02-27 18:43:21.000000000 +0000 @@ -3,144 +3,10 @@ Subject: fix proj4 initialization --- - pyresample/geometry.py | 56 +++++++++++++++++++----------------- - pyresample/test/test_files/areas.cfg | 2 +- - pyresample/test/test_geometry.py | 8 +++--- - 3 files changed, 34 insertions(+), 32 deletions(-) + pyresample/test/test_files/areas.cfg | 2 +- + pyresample/test/test_geometry.py | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/pyresample/geometry.py b/pyresample/geometry.py -index fa4b977..5e3c82b 100644 ---- a/pyresample/geometry.py -+++ b/pyresample/geometry.py -@@ -416,21 +416,21 @@ class AreaDefinition(BaseDefinition): - """Holds definition of an area. - - :Parameters: -- area_id : str -+ area_id : str - ID of area - name : str - Name of area -- proj_id : str -+ proj_id : str - ID of projection -- proj_dict : dict -+ proj_dict : dict - Dictionary with Proj.4 parameters -- x_size : int -+ x_size : int - x dimension in number of pixels -- y_size : int -- y dimension in number of pixels -- area_extent : list -+ y_size : int -+ y dimension in number of pixels -+ area_extent : list - Area extent as a list (LL_x, LL_y, UR_x, UR_y) -- nprocs : int, optional -+ nprocs : int, optional - Number of processor cores to be used - lons : numpy array, optional - Grid lons -@@ -438,37 +438,37 @@ class AreaDefinition(BaseDefinition): - Grid lats - - :Attributes: -- area_id : str -+ area_id : str - ID of area - name : str - Name of area -- proj_id : str -+ proj_id : str - ID of projection -- proj_dict : dict -+ proj_dict : dict - Dictionary with Proj.4 parameters -- x_size : int -+ x_size : int - x dimension in number of pixels -- y_size : int -+ y_size : int - y dimension in number of pixels - shape : tuple - Corresponding array shape as (rows, cols) - size : int - Number of points in grid -- area_extent : tuple -+ area_extent : tuple - Area extent as a tuple (LL_x, LL_y, UR_x, UR_y) -- area_extent_ll : tuple -+ area_extent_ll : tuple - Area extent in lons lats as a tuple (LL_lon, LL_lat, UR_lon, UR_lat) -- pixel_size_x : float -+ pixel_size_x : float - Pixel width in projection units -- pixel_size_y : float -+ pixel_size_y : float - Pixel height in projection units -- pixel_upper_left : list -+ pixel_upper_left : list - Coordinates (x, y) of center of upper left pixel in projection units -- pixel_offset_x : float -- x offset between projection center and upper left corner of upper -+ pixel_offset_x : float -+ x offset between projection center and upper left corner of upper - left pixel in units of pixels. -- pixel_offset_y : float -- y offset between projection center and upper left corner of upper -+ pixel_offset_y : float -+ y offset between projection center and upper left corner of upper - left pixel in units of pixels.. - - Properties: -@@ -511,6 +511,8 @@ class AreaDefinition(BaseDefinition): - self.area_extent = tuple(area_extent) - - # Calculate area_extent in lon lat -+ from pprint import pprint -+ pprint(proj_dict) - proj = _spatial_mp.Proj(**proj_dict) - corner_lons, corner_lats = proj((area_extent[0], area_extent[2]), - (area_extent[1], area_extent[3]), -@@ -635,7 +637,7 @@ class AreaDefinition(BaseDefinition): - return self.get_lonlats(nprocs=None, data_slice=(row, col)) - - def get_proj_coords(self, data_slice=None, cache=False, dtype=None): -- """Get projection coordinates of grid -+ """Get projection coordinates of grid - - :Parameters: - data_slice : slice object, optional -@@ -643,7 +645,7 @@ class AreaDefinition(BaseDefinition): - cache : bool, optional - Store result the result. Requires data_slice to be None - -- :Returns: -+ :Returns: - (target_x, target_y) : tuple of numpy arrays - Grids of area x- and y-coordinates in projection units - """ -@@ -778,8 +780,8 @@ class AreaDefinition(BaseDefinition): - def get_lonlats(self, nprocs=None, data_slice=None, cache=False, dtype=None): - """Returns lon and lat arrays of area. - -- :Parameters: -- nprocs : int, optional -+ :Parameters: -+ nprocs : int, optional - Number of processor cores to be used. - Defaults to the nprocs set when instantiating object - data_slice : slice object, optional -@@ -787,7 +789,7 @@ class AreaDefinition(BaseDefinition): - cache : bool, optional - Store result the result. Requires data_slice to be None - -- :Returns: -+ :Returns: - (lons, lats) : tuple of numpy arrays - Grids of area lons and and lats - """ diff --git a/pyresample/test/test_files/areas.cfg b/pyresample/test/test_files/areas.cfg index 3c6ef3c..5346cb4 100644 --- a/pyresample/test/test_files/areas.cfg diff -Nru pyresample-1.1.5/debian/patches/0003-skip-nearest-resize-test.patch pyresample-1.1.6/debian/patches/0003-skip-nearest-resize-test.patch --- pyresample-1.1.5/debian/patches/0003-skip-nearest-resize-test.patch 1970-01-01 00:00:00.000000000 +0000 +++ pyresample-1.1.6/debian/patches/0003-skip-nearest-resize-test.patch 2016-02-27 18:43:21.000000000 +0000 @@ -0,0 +1,58 @@ +From: Antonio Valentino +Date: Sat, 27 Feb 2016 12:11:41 +0100 +Subject: skip python3 offending tests + +--- + pyresample/test/test_image.py | 2 ++ + pyresample/test/test_kd_tree.py | 6 ++++++ + 2 files changed, 8 insertions(+) + +diff --git a/pyresample/test/test_image.py b/pyresample/test/test_image.py +index 8342583..4959291 100644 +--- a/pyresample/test/test_image.py ++++ b/pyresample/test/test_image.py +@@ -1,4 +1,5 @@ + import os ++import sys + import unittest + + import numpy +@@ -135,6 +136,7 @@ class Test(unittest.TestCase): + self.assertAlmostEqual(cross_sum, expected, + msg='ImageContainer resampling nearest neighbour failed') + ++ @unittest.skipIf(sys.version_info >= (3,0,0), 'stalls') + def test_nearest_resize(self): + data = numpy.fromfunction(lambda y, x: y * x * 10 ** -6, (3712, 3712)) + msg_con = image.ImageContainerNearest( +diff --git a/pyresample/test/test_kd_tree.py b/pyresample/test/test_kd_tree.py +index 59c240c..fe6c255 100644 +--- a/pyresample/test/test_kd_tree.py ++++ b/pyresample/test/test_kd_tree.py +@@ -257,6 +257,8 @@ class Test(unittest.TestCase): + self.assertEqual(cross_sum, expected, + msg='Grid remapping nearest failed') + ++ @unittest.skipIf(kd_tree.kd_tree_name != 'pykdtree', ++ 'access to pykdtree specific attributes') + def test_nearest_mp(self): + data = numpy.fromfunction(lambda y, x: y * x, (50, 10)) + lons = numpy.fromfunction(lambda y, x: 3 + x, (50, 10)) +@@ -430,6 +432,8 @@ class Test(unittest.TestCase): + self.assertAlmostEqual(cross_sum_counts, expected_counts, + msg='Swath multi channel resampling gauss failed on counts') + ++ @unittest.skipIf(kd_tree.kd_tree_name != 'pykdtree', ++ 'access to pykdtree specific attributes') + def test_gauss_multi_mp(self): + data = numpy.fromfunction(lambda y, x: (y + x) * 10 ** -6, (5000, 100)) + lons = numpy.fromfunction( +@@ -460,6 +464,8 @@ class Test(unittest.TestCase): + self.assertAlmostEqual(cross_sum, expected, + msg='Swath multi channel resampling gauss failed') + ++ @unittest.skipIf(kd_tree.kd_tree_name != 'pykdtree', ++ 'access to pykdtree specific attributes') + def test_gauss_multi_mp_segments(self): + data = numpy.fromfunction(lambda y, x: (y + x) * 10 ** -6, (5000, 100)) + lons = numpy.fromfunction( diff -Nru pyresample-1.1.5/debian/patches/series pyresample-1.1.6/debian/patches/series --- pyresample-1.1.5/debian/patches/series 2016-02-18 15:02:28.000000000 +0000 +++ pyresample-1.1.6/debian/patches/series 2016-02-27 18:43:21.000000000 +0000 @@ -1,4 +1,3 @@ -0001-skip-basemap-tests.patch 0002-fix-doc-build.patch 0003-fix-proj4-initialization.patch -skip-deprecation-warnings.patch +0003-skip-nearest-resize-test.patch diff -Nru pyresample-1.1.5/debian/patches/skip-deprecation-warnings.patch pyresample-1.1.6/debian/patches/skip-deprecation-warnings.patch --- pyresample-1.1.5/debian/patches/skip-deprecation-warnings.patch 2016-02-18 15:04:44.000000000 +0000 +++ pyresample-1.1.6/debian/patches/skip-deprecation-warnings.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -Description: skip deprecation warnings - This is needed to unbreak the test_gauss_multi_uncert() with Python ≥ 2.7.9. -Origin: upstream, https://github.com/pytroll/pyresample/commit/169286cae4f3dea1 -Last-Update: 2016-02-18 - ---- a/pyresample/test/test_kd_tree.py -+++ b/pyresample/test/test_kd_tree.py -@@ -400,6 +400,13 @@ - segments=1, with_uncert=True) - else: - with warnings.catch_warnings(record=True) as w: -+ # The assertion below checks if there is only one warning raised -+ # and whether it contains a specific message from pyresample -+ # On python 2.7.9+ the resample_gauss method raises multiple deprecation warnings -+ # that cause to fail, so we ignore the unrelated warnings. -+ # TODO: better way would be to filter UserWarning correctly -+ from numpy import VisibleDeprecationWarning -+ warnings.simplefilter('ignore', (DeprecationWarning, VisibleDeprecationWarning)) - res, stddev, counts = kd_tree.resample_gauss(swath_def, data_multi, - self.area_def, 50000, [ - 25000, 15000, 10000], diff -Nru pyresample-1.1.5/debian/watch pyresample-1.1.6/debian/watch --- pyresample-1.1.5/debian/watch 2015-07-18 11:30:31.000000000 +0000 +++ pyresample-1.1.6/debian/watch 2016-02-27 18:43:21.000000000 +0000 @@ -1,5 +1,7 @@ -# Compulsory line, this is a version 3 file version=3 - -opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/pyresample-$1\.tar\.gz/ \ - https://github.com/pytroll/pyresample/tags .*/v?(\d\S*)\.tar\.gz +opts=\ +dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ +uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/\-/\./g,\ +filenamemangle=s/(?:.*?)?(?:rel|v|pyresample)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/pyresample-$1.$2/ \ +https://github.com/pytroll/pyresample/releases \ +(?:.*?/)?(?:rel|v|pyresample)?[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff -Nru pyresample-1.1.5/pyresample/kd_tree.py pyresample-1.1.6/pyresample/kd_tree.py --- pyresample-1.1.5/pyresample/kd_tree.py 2015-10-12 11:53:47.000000000 +0000 +++ pyresample-1.1.6/pyresample/kd_tree.py 2016-02-25 09:34:04.000000000 +0000 @@ -541,6 +541,13 @@ output_coords = cartesian.transform_lonlats( target_lons_valid, target_lats_valid) + # pykdtree requires query points have same data type as kdtree. + try: + dt = resample_kdtree.data_pts.dtype + except AttributeError: + dt = resample_kdtree.data.dtype + output_coords = np.asarray(output_coords, dtype=dt) + # Query kd-tree distance_array, index_array = resample_kdtree.query(output_coords, k=neighbours, diff -Nru pyresample-1.1.5/pyresample/test/test_kd_tree.py pyresample-1.1.6/pyresample/test/test_kd_tree.py --- pyresample-1.1.5/pyresample/test/test_kd_tree.py 2015-10-12 11:53:47.000000000 +0000 +++ pyresample-1.1.6/pyresample/test/test_kd_tree.py 2016-02-25 09:34:04.000000000 +0000 @@ -400,6 +400,13 @@ segments=1, with_uncert=True) else: with warnings.catch_warnings(record=True) as w: + # The assertion below checks if there is only one warning raised + # and whether it contains a specific message from pyresample + # On python 2.7.9+ the resample_gauss method raises multiple deprecation warnings + # that cause to fail, so we ignore the unrelated warnings. + # TODO: better way would be to filter UserWarning correctly + from numpy import VisibleDeprecationWarning + warnings.simplefilter('ignore', (DeprecationWarning, VisibleDeprecationWarning)) res, stddev, counts = kd_tree.resample_gauss(swath_def, data_multi, self.area_def, 50000, [ 25000, 15000, 10000], @@ -786,6 +793,18 @@ self.assertTrue(numpy.array_equal(fill_mask, expected_fill_mask), msg='Failed to create fill mask on masked data') + def test_dtype(self): + lons = numpy.fromfunction(lambda y, x: 3 + x, (50, 10)) + lats = numpy.fromfunction(lambda y, x: 75 - y, (50, 10)) + grid_def = geometry.GridDefinition(lons, lats) + lons = numpy.asarray(lons, dtype='f4') + lats = numpy.asarray(lats, dtype='f4') + swath_def = geometry.SwathDefinition(lons=lons, lats=lats) + valid_input_index, valid_output_index, index_array, distance_array = \ + kd_tree.get_neighbour_info(swath_def, + grid_def, + 50000, neighbours=1, segments=1) + def test_nearest_from_sample(self): data = numpy.fromfunction(lambda y, x: y * x, (50, 10)) lons = numpy.fromfunction(lambda y, x: 3 + x, (50, 10)) diff -Nru pyresample-1.1.5/pyresample/version.py pyresample-1.1.6/pyresample/version.py --- pyresample-1.1.5/pyresample/version.py 2015-10-12 11:53:47.000000000 +0000 +++ pyresample-1.1.6/pyresample/version.py 2016-02-25 09:34:04.000000000 +0000 @@ -15,4 +15,4 @@ # You should have received a copy of the GNU Lesser General Public License along # with this program. If not, see . -__version__ = '1.1.5' +__version__ = '1.1.6' diff -Nru pyresample-1.1.5/requirements.txt pyresample-1.1.6/requirements.txt --- pyresample-1.1.5/requirements.txt 2015-10-12 11:53:47.000000000 +0000 +++ pyresample-1.1.6/requirements.txt 2016-02-25 09:34:04.000000000 +0000 @@ -1,2 +1 @@ -git+https://github.com/matplotlib/matplotlib.git git+https://github.com/matplotlib/basemap.git diff -Nru pyresample-1.1.5/.travis.yml pyresample-1.1.6/.travis.yml --- pyresample-1.1.5/.travis.yml 2015-10-12 11:53:47.000000000 +0000 +++ pyresample-1.1.6/.travis.yml 2016-02-25 09:34:04.000000000 +0000 @@ -10,6 +10,11 @@ - sudo apt-get install libfreetype6-dev - sudo apt-get install libgeos-3.3.8 libgeos-c1 libgeos-dev install: +- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install "matplotlib<1.5.0"; fi +- if [[ $TRAVIS_PYTHON_VERSION == "2.7" ]]; then pip install "matplotlib>=1.5.0"; fi +- if [[ $TRAVIS_PYTHON_VERSION == "3.3" ]]; then pip install "matplotlib<1.5.0"; fi +- if [[ $TRAVIS_PYTHON_VERSION == "3.4" ]]; then pip install "matplotlib>=1.5.0"; fi +- if [[ $TRAVIS_PYTHON_VERSION == "3.5" ]]; then pip install "matplotlib>=1.5.0"; fi - pip install -r requirements.txt - pip install -e ".[pykdtree]" - pip install coveralls