Fix autopkgtest calling (closes: #1059334); this requires moving away from...

Fix autopkgtest calling (closes: #1059334); this requires moving away from pybuild-autopkgtest to manually calling pytest (see #1059529).

debian/changelog

+python-bytecode (0.15.1-3) unstable; urgency=medium
+
+  * Fix autopkgtest calling (closes: #1059334); this requires moving away
+    from pybuild-autopkgtest to manually calling pytest (see #1059529).
+
+ -- Julian Gilbey <jdg@debian.org>  Wed, 27 Dec 2023 19:04:12 +0000
+
 python-bytecode (0.15.1-2) unstable; urgency=medium
 
   * No longer exclude test_version from tests as it is removed upstream

debian/control

@@ -8,7 +8,7 @@ Build-Depends: debhelper-compat (= 13),
                dh-sequence-sphinxdoc <!nodoc>,
                pybuild-plugin-pyproject,
                python3-all,
-               python3-pytest,
+               python3-pytest <!nocheck>,
                python3-setuptools,
                python3-setuptools-scm,
                python3-sphinx <!nodoc>,
@@ -19,7 +19,6 @@ Homepage: https://github.com/MatthieuDartiailh/bytecode
 Vcs-Git: https://salsa.debian.org/python-team/packages/python-bytecode.git
 Vcs-Browser: https://salsa.debian.org/python-team/packages/python-bytecode
 Rules-Requires-Root: no
-Testsuite: autopkgtest-pkg-pybuild
 Description: Python module to generate, modify and optimize Python bytecode
  The bytecode module can be used to write Python bytecode directly and
  then convert it into an executable Python code object.  It also provides a

debian/rules

@@ -35,21 +35,5 @@ execute_after_dh_auto_test:
 endif
 endif
 
-# Need to hide the conditionals inside the targets, otherwise
-# pybuild-autopkgtest is likely to break on non-armhf architectures
-before-pybuild-autopkgtest:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-ifeq ($(DEB_BUILD_ARCH),armhf)
-	patch -p1 < debian/armhf.patch
-endif
-endif
-
-after-pybuild-autopkgtest:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-ifeq ($(DEB_BUILD_ARCH),armhf)
-	patch -p1 -R < debian/armhf.patch
-endif
-endif
-
 override_dh_compress:
 	dh_compress -O--buildsystem=pybuild -Xchangelog.html

debian/tests/control

+Tests: pytest
+Depends: python3-all,
+         python3-pytest,
+         @
+Restrictions: allow-stderr

debian/tests/pytest

+#! /bin/sh
+
+set -e
+
+# armhf fails strangely; see https://bugs.debian.org/1056460
+DEB_BUILD_ARCH=$(dpkg-architecture -q DEB_BUILD_ARCH)
+
+if [ "$DEB_BUILD_ARCH" = armhf ]
+then
+   HOMEDIR=$(pwd)
+   patch -p1 < debian/armhf.patch
+fi
+
+cp -a tests "$AUTOPKGTEST_TMP"
+for py in $(py3versions -s) ; do
+    cd "$AUTOPKGTEST_TMP"
+    echo "Testing with $py:"
+    $py -m pytest tests
+done
+
+if [ "$DEB_BUILD_ARCH" = armhf ]
+then
+   cd $HOMEDIR
+   patch -p1 -R < debian/armhf.patch
+fi