Bug#962232: vanguards indirectly build-depends on cruft package.

2020-06-12 Thread peter green

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/changelog2019-07-26 16:30:09.0 +
+++ vanguards-0.3.1/debian/changelog2020-06-13 01:49:35.0 +
@@ -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   Sat, 13 Jun 2020 01:49:35 +
+
 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.0 +
+++ vanguards-0.3.1/debian/control  2020-06-04 19:31:34.0 +
@@ -8,8 +8,9 @@
dh-python,
pypy,
pypy-setuptools,
+   python3-pytest ,
+   python3-stem (>= 1.6.0-3.1) ,
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/rules2019-07-26 16:30:09.0 +
+++ vanguards-0.3.1/debian/rules2020-06-04 19:30:41.0 +
@@ -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


Bug#962232: vanguards indirectly build-depends on cruft package.

2020-06-07 Thread Scott Kitterman
On Thu, 4 Jun 2020 21:21:53 +0100 peter green  wrote:
> Package: vanguards
> Version: 0.3.1-2
> Severity: serious
> 
> vanguards build-depends on pypy-pytest which depends on pypy-funcsigs which 
is no longer built by the python-funcsigs source package. The pytest 
maintainer has also said they would like to get rid of pypy support from 
pytest. Afaict vanguards is the only application that build-depends on pypy-
pytest (there are also some module packages but they all look like they could 
drop pypy support at the same time pytest does).
> 
> The ideal fix would be to move to pypy3, but I understand that is currently 
blocked on tooling (see https://bugs.debian.org/cgi-bin/bugreport.cgi?
bug=932820 ). Over in bug 937769 Chris Lamb proposed a patch to run the 
testsuite with python 3. Obviously running the testsuite with a different 
python version from that used to actually run the program is suboptimal but I 
think it's the lesser evil here.
> 
> I manually applied the patch, cleaning up some formatting and making the 
dependency versioning for the python3-stem build-dependency match that for the 
pypy-stem build-dependency. While testing I also noticed some clean target 
issues so I fixed them.
> 
> A debdiff is attatched, if I get no objections (and the maintainer doesn't 
upload this first) I will likely NMU this in a week or so.
> 
pypy-pytest is a cruft package now, so it's no longer indirect.

Scott K

signature.asc
Description: This is a digitally signed message part.


Bug#962232: vanguards indirectly build-depends on cruft package.

2020-06-04 Thread peter green

Package: vanguards
Version: 0.3.1-2
Severity: serious

vanguards build-depends on pypy-pytest which depends on pypy-funcsigs which is 
no longer built by the python-funcsigs source package. The pytest maintainer 
has also said they would like to get rid of pypy support from pytest. Afaict 
vanguards is the only application that build-depends on pypy-pytest (there are 
also some module packages but they all look like they could drop pypy support 
at the same time pytest does).

The ideal fix would be to move to pypy3, but I understand that is currently 
blocked on tooling (see 
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=932820 ). Over in bug 937769 
Chris Lamb proposed a patch to run the testsuite with python 3. Obviously 
running the testsuite with a different python version from that used to 
actually run the program is suboptimal but I think it's the lesser evil here.

I manually applied the patch, cleaning up some formatting and making the 
dependency versioning for the python3-stem build-dependency match that for the 
pypy-stem build-dependency. While testing I also noticed some clean target 
issues so I fixed them.

A debdiff is attatched, if I get no objections (and the maintainer doesn't 
upload this first) I will likely NMU this in a week or so.

diff -Nru vanguards-0.3.1/debian/changelog vanguards-0.3.1/debian/changelog
--- vanguards-0.3.1/debian/changelog2019-07-26 16:30:09.0 +
+++ vanguards-0.3.1/debian/changelog2020-06-04 19:21:14.0 +
@@ -1,3 +1,12 @@
+vanguards (0.3.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Clean up pytest cache and egg info in clean target.
+  * Run testsuite with python 3 to get rid of build-depends on pypy-pytest
+(thanks to Chris Lamb for the initial patch)
+
+ -- Peter Michael Green   Thu, 04 Jun 2020 19:21:14 +
+
 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.0 +
+++ vanguards-0.3.1/debian/control  2020-06-04 19:21:14.0 +
@@ -8,8 +8,9 @@
dh-python,
pypy,
pypy-setuptools,
+   python3-pytest ,
+   python3-stem (>= 1.6.0-3.1) ,
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/rules2019-07-26 16:30:09.0 +
+++ vanguards-0.3.1/debian/rules2020-06-04 19:21:14.0 +
@@ -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