I have now gone ahead with the NMU, the final debdiff is attatched (same as
previous debdiff apart from changelog tweaks)
diff -Nru vanguards-0.3.1/debian/changelog vanguards-0.3.1/debian/changelog
--- vanguards-0.3.1/debian/changelog 2019-07-26 16:30:09.000000000 +0000
+++ vanguards-0.3.1/debian/changelog 2020-06-13 01:49:35.000000000 +0000
@@ -1,3 +1,13 @@
+vanguards (0.3.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Clean up pytest cache and egg info in clean target.
+ * Run testsuite with python 3 and adjust build-depends accordingly
+ to get rid of build-depends on pypy-pytest (Closes: 962232)
+ (thanks to Chris Lamb for the initial patch)
+
+ -- Peter Michael Green <plugw...@debian.org> Sat, 13 Jun 2020 01:49:35 +0000
+
vanguards (0.3.1-2) unstable; urgency=medium
[ Nicolas Braud-Santoni ]
diff -Nru vanguards-0.3.1/debian/control vanguards-0.3.1/debian/control
--- vanguards-0.3.1/debian/control 2019-07-26 16:30:09.000000000 +0000
+++ vanguards-0.3.1/debian/control 2020-06-04 19:31:34.000000000 +0000
@@ -8,8 +8,9 @@
dh-python,
pypy,
pypy-setuptools,
+ python3-pytest <!nocheck>,
+ python3-stem (>= 1.6.0-3.1) <!nocheck>,
pypy-stem (>= 1.6.0-3.1),
- pypy-pytest,
pypy-ipaddress
Standards-Version: 4.1.5
Vcs-Browser: https://salsa.debian.org/pkg-privacy-team/vanguards
diff -Nru vanguards-0.3.1/debian/rules vanguards-0.3.1/debian/rules
--- vanguards-0.3.1/debian/rules 2019-07-26 16:30:09.000000000 +0000
+++ vanguards-0.3.1/debian/rules 2020-06-04 19:30:41.000000000 +0000
@@ -5,3 +5,10 @@
override_dh_installsystemd:
dh_installsystemd --no-enable --no-start
+
+override_dh_auto_test:
+ dh_auto_test -- --system=custom --test-args='cd {build_dir}; python3 -m
pytest $(CURDIR)/tests'
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf .pytest_cache src/vanguards.egg-info
