Antonio Valentino pushed to branch master at Debian GIS Project / pyorbital
Commits: a2219d28 by Antonio Valentino at 2020-07-20T18:42:47+02:00 Fix unittests on i386 platforms - - - - - aafeca84 by Antonio Valentino at 2020-07-20T18:42:47+02:00 Update test dependencies - - - - - 66d3c7ec by Antonio Valentino at 2020-07-20T18:42:47+02:00 Drop 0001-Skip-tests-using-on-xarray-or-dask-if-they-are-not-a.patch - - - - - 05cf61ff by Antonio Valentino at 2020-07-20T18:42:47+02:00 Patches have been forwarded to upstream - - - - - 2dfd86af by Antonio Valentino at 2020-07-20T18:42:47+02:00 Set distribution to unstable - - - - - 6 changed files: - debian/changelog - debian/patches/0002-Skip-tests-if-data-are-not-available.patch → debian/patches/0001-Skip-tests-if-data-are-not-available.patch - − debian/patches/0001-Skip-tests-using-on-xarray-or-dask-if-they-are-not-a.patch - + debian/patches/0002-Fix-tests.patch - debian/patches/series - debian/tests/control Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,16 @@ +pyorbital (1.6.0-3) unstable; urgency=medium + + * debian/tests/control: + - update test dependencies (also depend on xarray and dask) + * debian/patches: + - drop 0001-Skip-tests-using-on-xarray-or-dask-if-they-are-not-a.patch, + no longer necessary. + Now the presence of xarray and dask is ensured during tests. + - refresh and renumber all patches + - new 0002-Fix-tests.patch, fix unittests on i386 platforms + + -- Antonio Valentino <[email protected]> Mon, 20 Jul 2020 16:23:25 +0000 + pyorbital (1.6.0-2) unstable; urgency=medium * Team upload. ===================================== debian/patches/0002-Skip-tests-if-data-are-not-available.patch → debian/patches/0001-Skip-tests-if-data-are-not-available.patch ===================================== @@ -2,6 +2,7 @@ From: Antonio Valentino <[email protected]> Date: Sun, 23 Dec 2018 07:20:42 +0000 Subject: Skip tests if data are not available +Forwarded to upstream: https://github.com/pytroll/pyorbital/pull/60 --- pyorbital/tests/test_aiaa.py | 5 +++++ 1 file changed, 5 insertions(+) ===================================== debian/patches/0001-Skip-tests-using-on-xarray-or-dask-if-they-are-not-a.patch deleted ===================================== @@ -1,37 +0,0 @@ -From: Antonio Valentino <[email protected]> -Date: Sun, 11 Nov 2018 11:06:11 +0100 -Subject: Skip tests using on xarray or dask if they are not available - ---- - pyorbital/tests/test_orbital.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/pyorbital/tests/test_orbital.py b/pyorbital/tests/test_orbital.py -index 80db2ba..db7cd7f 100644 ---- a/pyorbital/tests/test_orbital.py -+++ b/pyorbital/tests/test_orbital.py -@@ -227,6 +227,7 @@ class TestGetObserverLook(unittest.TestCase): - np.testing.assert_allclose(azi, self.exp_azi) - np.testing.assert_allclose(elev, self.exp_elev) - -+ @unittest.skipIf(not orbital.has_dask, 'dask not available') - def test_basic_dask(self): - """Test with dask array inputs""" - from pyorbital import orbital -@@ -243,6 +244,7 @@ class TestGetObserverLook(unittest.TestCase): - np.testing.assert_allclose(azi.compute(), self.exp_azi) - np.testing.assert_allclose(elev.compute(), self.exp_elev) - -+ @unittest.skipIf(not orbital.has_xarray, 'xarray not available') - def test_xarray_with_numpy(self): - """Test with xarray DataArray with numpy array as inputs""" - from pyorbital import orbital -@@ -262,6 +264,8 @@ class TestGetObserverLook(unittest.TestCase): - np.testing.assert_allclose(azi.data, self.exp_azi) - np.testing.assert_allclose(elev.data, self.exp_elev) - -+ @unittest.skipIf(not orbital.has_xarray or not orbital.has_dask, -+ 'xarray and/or dask not available') - def test_xarray_with_dask(self): - """Test with xarray DataArray with dask array as inputs""" - from pyorbital import orbital ===================================== debian/patches/0002-Fix-tests.patch ===================================== @@ -0,0 +1,24 @@ +From: Antonio Valentino <[email protected]> +Date: Mon, 20 Jul 2020 15:17:45 +0000 +Subject: Fix tests + +Forwarded to upstream: https://github.com/pytroll/pyorbital/pull/59 +--- + pyorbital/orbital.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyorbital/orbital.py b/pyorbital/orbital.py +index 85c504d..eccc464 100644 +--- a/pyorbital/orbital.py ++++ b/pyorbital/orbital.py +@@ -544,8 +544,8 @@ class Orbital(object): + + try: + tcross = optimize.bisect(_nprime, +- a=np.datetime64(tstart, time_unit).astype(int), +- b=np.datetime64(tend, time_unit).astype(int), ++ a=np.datetime64(tstart, time_unit).astype(np.int64), ++ b=np.datetime64(tend, time_unit).astype(np.int64), + rtol=rtol) + except ValueError: + # Bisection did not converge ===================================== debian/patches/series ===================================== @@ -1,2 +1,2 @@ -0001-Skip-tests-using-on-xarray-or-dask-if-they-are-not-a.patch -0002-Skip-tests-if-data-are-not-available.patch +0001-Skip-tests-if-data-are-not-available.patch +0002-Fix-tests.patch ===================================== debian/tests/control ===================================== @@ -1,3 +1,3 @@ Tests: python3 -Depends: python3-pyorbital, python3-all +Depends: python3-pyorbital, python3-all, python3-xarray, python3-dask View it on GitLab: https://salsa.debian.org/debian-gis-team/pyorbital/-/compare/387cef809e3a3b2808d0c569860572c08ffc92a5...2dfd86afd818f41429dc108bbb1626e6a21d5161 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/pyorbital/-/compare/387cef809e3a3b2808d0c569860572c08ffc92a5...2dfd86afd818f41429dc108bbb1626e6a21d5161 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
