[Git][debian-gis-team/flox][master] Add upstream patches to fix test failure on i386.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Tue Jan 17 04:17:10 GMT 2023
Bas Couwenberg pushed to branch master at Debian GIS Project / flox
Commits:
0cbfa087 by Bas Couwenberg at 2023-01-17T05:16:58+01:00
Add upstream patches to fix test failure on i386.
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/pr202-32bit-More-intp-fixes.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -2,7 +2,7 @@ flox (0.6.5-4) UNRELEASED; urgency=medium
* Team upload.
* Add gbp.conf to use pristine-tar & --source-only-changes by default.
- * Add upstream patch to fix test failure on i386.
+ * Add upstream patches to fix test failure on i386.
-- Bas Couwenberg <sebastic at debian.org> Tue, 10 Jan 2023 08:30:58 +0100
=====================================
debian/patches/pr202-32bit-More-intp-fixes.patch
=====================================
@@ -0,0 +1,54 @@
+Description: 32bit: More intp fixes
+Author: dcherian <deepak at cherian.net>
+Origin: https://github.com/xarray-contrib/flox/pull/202
+Bug: https://github.com/xarray-contrib/flox/issues/200
+
+--- a/tests/test_core.py
++++ b/tests/test_core.py
+@@ -393,12 +393,12 @@ def test_groupby_agg_dask(func, shape, a
+ kwargs["expected_groups"] = [0, 2, 1]
+ with raise_if_dask_computes():
+ actual, groups = groupby_reduce(array, by, engine=engine, **kwargs, sort=False)
+- assert_equal(groups, np.array([0, 2, 1], dtype=np.intp))
++ assert_equal(groups, np.array([0, 2, 1], dtype=np.int64))
+ assert_equal(expected, actual[..., [0, 2, 1]])
+
+ with raise_if_dask_computes():
+ actual, groups = groupby_reduce(array, by, engine=engine, **kwargs, sort=True)
+- assert_equal(groups, np.array([0, 1, 2], np.intp))
++ assert_equal(groups, np.array([0, 1, 2], np.int64))
+ assert_equal(expected, actual)
+
+
+@@ -447,11 +447,11 @@ def test_dask_reduce_axis_subset():
+ axis=1,
+ expected_groups=[0, 2],
+ )
+- assert_equal(result, np.array([[2, 3], [2, 3]], dtype=np.int64))
++ assert_equal(result, np.array([[2, 3], [2, 3]], dtype=np.intp))
+
+ by = np.broadcast_to(labels2d, (3, *labels2d.shape))
+ array = np.ones_like(by)
+- subarr = np.array([[1, 1], [1, 1], [123, 2], [1, 1], [1, 1]], dtype=np.int64)
++ subarr = np.array([[1, 1], [1, 1], [123, 2], [1, 1], [1, 1]], dtype=np.intp)
+ expected = np.tile(subarr, (3, 1, 1))
+ with raise_if_dask_computes():
+ result, _ = groupby_reduce(
+@@ -464,7 +464,7 @@ def test_dask_reduce_axis_subset():
+ )
+ assert_equal(result, expected)
+
+- subarr = np.array([[2, 3], [2, 3]], dtype=np.int64)
++ subarr = np.array([[2, 3], [2, 3]], dtype=np.intp)
+ expected = np.tile(subarr, (3, 1, 1))
+ with raise_if_dask_computes():
+ result, _ = groupby_reduce(
+@@ -801,7 +801,7 @@ def test_cohorts_map_reduce_consistent_d
+
+ actual, actual_groups = groupby_reduce(array, labels, func="count", method=method)
+ assert_equal(actual_groups, np.arange(6, dtype=labels.dtype))
+- assert_equal(actual, repeats.astype(np.int64))
++ assert_equal(actual, repeats.astype(np.intp))
+
+ actual, actual_groups = groupby_reduce(array, labels, func="sum", method=method)
+ assert_equal(actual_groups, np.arange(6, dtype=labels.dtype))
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
0001-Compatibility-with-Pandas-older-than-1.4.patch
pr201-32bit-support-int64-to-intp-for-count.patch
+pr202-32bit-More-intp-fixes.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/flox/-/commit/0cbfa0875d6959a43b27e4332f7465335ff66c95
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/flox/-/commit/0cbfa0875d6959a43b27e4332f7465335ff66c95
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/20230117/23ea8401/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list