On 21/04/2020 22:20, Thomas Goirand wrote:
Python 2 has never been removed from this
package. Though instead, we shall remove this source package entirely
from Debian.
# Broken Depends:
nipype: python-nipype
pytest: pypy-pytest
python-logfury: python3-logfury
python-oslo.utils: python3-oslo.utils
# Broken Build-Depends:
beaker: python3-funcsigs
kombu: python3-funcsigs
nipype: python-funcsigs
pagure: python3-funcsigs
pytest: pypy-funcsigs
python-oslo.log: python3-funcsigs
python-oslo.utils: python3-funcsigs (>= 0.4)
ripe-atlas-cousteau: python3-funcsigs
You can remove all of the python-oslo* from the list. The versions in
Experimental, which are the next version of OpenStack, are fixed. In 2
weeks of time, I'll upload all what I staged in Experimental to Sid
(maybe 150 packages?) and that's going to fix it all.
For the others, probably I should start filling bugs...
While I understand you would like to get rid of the python-funcsigs source
package completely, would you be ok with a NMU (debdiff attached) so we can get
the packages in testing back into a consistent state without waiting for all
the rdeps of funcsigs?
So, if I'm following correctly, what you seem to propose, is to remove
Python 2 from unittest2. If that's the case, then I agree with such a
plan. I just didn't dare to do it yet.
Though in fact, I already worked on that, but stopped, also because
unittest2 FTBFS when I try building it on my laptop. So I've pushed it
in its normal Git repo [1] under a py2-removal branch. If anyone has
some time available to look at it, that'd be nice (I currently don't...).
I got a failure too when I cloned that branch and tried to build it, but once I
added in the changes from the previous NMU it built fine. I would push that
addition back to the branch but i'm not currently a member of the python
modules team, I requested to join but no response yet.
I also prepped a NMU for numba and posted a debdiff to the bug report
diff -Nru python-funcsigs-1.0.2/debian/changelog
python-funcsigs-1.0.2/debian/changelog
--- python-funcsigs-1.0.2/debian/changelog 2018-02-27 12:49:28.000000000
+0000
+++ python-funcsigs-1.0.2/debian/changelog 2020-04-30 21:43:30.000000000
+0000
@@ -1,3 +1,12 @@
+python-funcsigs (1.0.2-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop python 2 support.
+ * Switch to pybuild, the old build system doesn't like building python3
+ only packages.
+
+ -- Peter Michael Green <plugw...@debian.org> Thu, 30 Apr 2020 21:43:30 +0000
+
python-funcsigs (1.0.2-4) unstable; urgency=medium
* Team upload.
diff -Nru python-funcsigs-1.0.2/debian/control
python-funcsigs-1.0.2/debian/control
--- python-funcsigs-1.0.2/debian/control 2018-02-27 12:49:28.000000000
+0000
+++ python-funcsigs-1.0.2/debian/control 2020-04-30 21:43:20.000000000
+0000
@@ -9,13 +9,10 @@
dh-python,
pypy,
pypy-setuptools (>= 17.1),
- python-all,
- python-setuptools (>= 17.1),
python3-all,
python3-setuptools (>= 17.1),
python3-sphinx,
Build-Depends-Indep:
- python-unittest2 (>= 1.1.0),
python3-unittest2 (>= 1.1.0),
Standards-Version: 4.1.3
Vcs-Browser: https://salsa.debian.org/openstack-team/python/python-funcsigs
@@ -37,20 +34,6 @@
.
This package contains the PyPy module.
-Package: python-funcsigs
-Architecture: all
-Depends:
- ${misc:Depends},
- ${python:Depends},
-Suggests:
- python-funcsigs-doc,
-Description: function signatures from PEP362 - Python 2.7
- funcsigs is a backport of the PEP 362 function signature features from Python
- 3.3's inspect module. The backport is compatible with Python 2.6, 2.7 as well
- as 3.2 and up.
- .
- This package contains the Python 2.7 module.
-
Package: python-funcsigs-doc
Section: doc
Architecture: all
diff -Nru python-funcsigs-1.0.2/debian/rules python-funcsigs-1.0.2/debian/rules
--- python-funcsigs-1.0.2/debian/rules 2018-02-27 12:43:35.000000000 +0000
+++ python-funcsigs-1.0.2/debian/rules 2020-04-30 21:43:30.000000000 +0000
@@ -1,19 +1,14 @@
#!/usr/bin/make -f
-PYTHONS:=$(shell pyversions -vr)
PYTHON3S:=$(shell py3versions -vr)
UPSTREAM_GIT := https://github.com/testing-cabal/funcsigs.git
-include /usr/share/openstack-pkg-tools/pkgos.make
%:
- dh $@ --buildsystem=python_distutils --with
python2,python3,pypy,sphinxdoc
+ dh $@ --buildsystem=pybuild --with python3,pypy,sphinxdoc
override_dh_auto_install:
- set -e ; for pyvers in $(PYTHONS); do \
- python$$pyvers setup.py install --install-layout=deb \
- --root $(CURDIR)/debian/python-funcsigs; \
- done
set -e ; for pyvers in $(PYTHON3S); do \
python$$pyvers setup.py install --install-layout=deb \
--root $(CURDIR)/debian/python3-funcsigs; \
@@ -24,7 +19,7 @@
override_dh_auto_test:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
- set -e ; for pyvers in $(PYTHONS) $(PYTHON3S); do \
+ set -e ; for pyvers in $(PYTHON3S); do \
python$$pyvers setup.py test ; \
done
endif
