Bug#1004869: python-xarray autopkgtest fail on i386

[Peter Michael Green]

> This patch was dropped in the next upload (probably by accident), and
> hence this bug has reappeared.
I have prepared a NMU reinstating Jochen's changes and uploaded
it to delayed/5, please tell me if you have any objections.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-science-maintainers/attachments/20230219/67060e6e/attachment-0001.htm>
-------------- next part --------------
diff -Nru python-xarray-2023.01.0/debian/changelog python-xarray-2023.01.0/debian/changelog
--- python-xarray-2023.01.0/debian/changelog	2023-01-22 11:21:51.000000000 +0000
+++ python-xarray-2023.01.0/debian/changelog	2023-02-19 00:50:57.000000000 +0000
@@ -1,3 +1,15 @@
+python-xarray (2023.01.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Jochen Sprickerhof ]
+  * Add patch to fix FTBFS on i386.
+    Thanks to Adrian Bunk (Closes: 1004869)
+  * Use execute_after_ in d/rules
+  * Set R³ in d/control
+
+ -- Peter Michael Green <plugwash at debian.org>  Sun, 19 Feb 2023 00:50:57 +0000
+
 python-xarray (2023.01.0-1) unstable; urgency=medium
 
   * Mew upstream release
diff -Nru python-xarray-2023.01.0/debian/control python-xarray-2023.01.0/debian/control
--- python-xarray-2023.01.0/debian/control	2023-01-22 11:21:51.000000000 +0000
+++ python-xarray-2023.01.0/debian/control	2023-02-19 00:50:21.000000000 +0000
@@ -48,6 +48,7 @@
 Vcs-Browser: https://salsa.debian.org/science-team/python-xarray
 Vcs-Git: https://salsa.debian.org/science-team/python-xarray.git
 Homepage: http://xarray.pydata.org/
+Rules-Requires-Root: no
 
 Package: python3-xarray
 Architecture: all
diff -Nru python-xarray-2023.01.0/debian/patches/0015-Mark-failing-test-on-i386-as-xfail.patch python-xarray-2023.01.0/debian/patches/0015-Mark-failing-test-on-i386-as-xfail.patch
--- python-xarray-2023.01.0/debian/patches/0015-Mark-failing-test-on-i386-as-xfail.patch	1970-01-01 00:00:00.000000000 +0000
+++ python-xarray-2023.01.0/debian/patches/0015-Mark-failing-test-on-i386-as-xfail.patch	2023-02-19 00:50:21.000000000 +0000
@@ -0,0 +1,20 @@
+From: Adrian Bunk <bunk at debian.org>
+Date: Thu, 29 Dec 2022 09:05:39 +0100
+Subject: Mark failing test on i386 as xfail
+
+---
+ xarray/tests/test_interp.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/xarray/tests/test_interp.py b/xarray/tests/test_interp.py
+index b3c94e3..1dc8aff 100644
+--- a/xarray/tests/test_interp.py
++++ b/xarray/tests/test_interp.py
+@@ -854,6 +854,7 @@ def test_interpolate_chunk_1d(
+ @requires_dask
+ @pytest.mark.parametrize("method", ["linear", "nearest"])
+ @pytest.mark.filterwarnings("ignore:Increasing number of chunks")
++ at pytest.mark.xfail
+ def test_interpolate_chunk_advanced(method: InterpOptions) -> None:
+     """Interpolate nd array with an nd indexer sharing coordinates."""
+     # Create original array
diff -Nru python-xarray-2023.01.0/debian/patches/series python-xarray-2023.01.0/debian/patches/series
--- python-xarray-2023.01.0/debian/patches/series	2023-01-22 11:21:51.000000000 +0000
+++ python-xarray-2023.01.0/debian/patches/series	2023-02-19 00:50:21.000000000 +0000
@@ -12,3 +12,4 @@
 xfail-pad-constant.patch
 no-sphinx-design.patch
 xfail-on-random-patch
+0015-Mark-failing-test-on-i386-as-xfail.patch
diff -Nru python-xarray-2023.01.0/debian/rules python-xarray-2023.01.0/debian/rules
--- python-xarray-2023.01.0/debian/rules	2023-01-22 11:21:51.000000000 +0000
+++ python-xarray-2023.01.0/debian/rules	2023-02-19 00:50:21.000000000 +0000
@@ -4,7 +4,7 @@
 export DH_VERBOSE=1
 
 export PYBUILD_NAME=xarray
-PY3VERS:= $(shell py3versions -s)
+export http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9
 
 # Disable checking for this release:
 DEB_BUILD_OPTIONS += nocheck
@@ -12,30 +12,19 @@
 %:
 	dh $@  --buildsystem=pybuild
 
-override_dh_auto_clean:
-	dh_auto_clean
+execute_after_dh_auto_clean:
 ifeq (,$(findstring nodoc,$(DEB_BUILD_PROFILES)))
 	$(MAKE) -C doc clean
 endif
 
-override_dh_auto_install: $(PYTHON3:%=install-python%)
-	dh_auto_install
+execute_after_dh_auto_install: $(PYTHON3:%=install-python%)
 	find debian/python3-xarray -name '*.idx' -exec chmod -x {} \;
 
-override_dh_auto_build:
-	http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 dh_auto_build
+execute_after_dh_auto_build:
 ifeq (,$(findstring nodoc,$(DEB_BUILD_PROFILES)))
 	PYTHONPATH=$(CURDIR) $(MAKE) -C doc html
 endif
 
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	for p in $(PY3VERS); do \
-		PY3VERNUM=`echo $$p | sed -e 's/python//' `; \
-		pybuild --test --test-pytest -i $$p -p $$PY3VERNUM  ;  \
-		done
-endif
-
 override_dh_sphinxdoc:
 	dh_sphinxdoc --exclude=MathJax.js
 	find debian/python-xarray-doc -name '*.html' \