Package: python-setuptools
Version: 44.1.1-1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for python-setuptools (versioned as 44.1.1-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
SR
diff -Nru python-setuptools-44.1.1/debian/changelog python-setuptools-44.1.1/debian/changelog
--- python-setuptools-44.1.1/debian/changelog 2020-08-02 08:20:55.000000000 -0400
+++ python-setuptools-44.1.1/debian/changelog 2022-01-12 13:33:15.000000000 -0400
@@ -1,3 +1,12 @@
+python-setuptools (44.1.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build a python2-setuptools-whl package. Closes: #1003573.
+ * Patch: Handle the removal of bdist_wininst from distutils.
+ Closes: #1002444
+
+ -- Stefano Rivera <stefa...@debian.org> Wed, 12 Jan 2022 13:33:15 -0400
+
python-setuptools (44.1.1-1) unstable; urgency=medium
* New upstream version.
diff -Nru python-setuptools-44.1.1/debian/control python-setuptools-44.1.1/debian/control
--- python-setuptools-44.1.1/debian/control 2020-08-02 08:20:55.000000000 -0400
+++ python-setuptools-44.1.1/debian/control 2022-01-12 13:33:15.000000000 -0400
@@ -65,10 +65,13 @@
Description: PyPy Distutils Enhancements
Extensions to the python-distutils for large or complex distributions.
-#Package: python-setuptools-whl
-#Architecture: all
-#Depends: ${misc:Depends}
-#Description: Python Distutils Enhancements (wheel package)
-# Extensions to the python-distutils for large or complex distributions.
-# .
-# This package provides setuptools in PEP 427 wheel format.
+Package: python2-setuptools-whl
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: python-pip-whl (<< 21)
+Replaces: python-pip-whl (<< 21)
+Description: Python Distutils Enhancements (python 2.7 wheel package)
+ Extensions to the python-distutils for large or complex distributions.
+ .
+ This is the support package for the PEP 427 wheel version of the package,
+ required for using setuptools inside a Python 2.7 virtual environment.
diff -Nru python-setuptools-44.1.1/debian/patches/removed-bdist_wininst.patch python-setuptools-44.1.1/debian/patches/removed-bdist_wininst.patch
--- python-setuptools-44.1.1/debian/patches/removed-bdist_wininst.patch 1969-12-31 20:00:00.000000000 -0400
+++ python-setuptools-44.1.1/debian/patches/removed-bdist_wininst.patch 2022-01-12 13:33:15.000000000 -0400
@@ -0,0 +1,28 @@
+From: "Jason R. Coombs" <jar...@jaraco.com>
+Date: Tue, 11 Jan 2022 18:04:05 -0400
+Subject: Fix install_scripts() if bdist_wininst is missing
+
+Bug-Debian: https://bugs.debian.org/1002444
+Origin: upstream, https://github.com/pypa/setuptools/pull/1986
+---
+ setuptools/command/install_scripts.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
+index 1623427..8c9a15e 100644
+--- a/setuptools/command/install_scripts.py
++++ b/setuptools/command/install_scripts.py
+@@ -32,8 +32,11 @@ class install_scripts(orig.install_scripts):
+ )
+ bs_cmd = self.get_finalized_command('build_scripts')
+ exec_param = getattr(bs_cmd, 'executable', None)
+- bw_cmd = self.get_finalized_command("bdist_wininst")
+- is_wininst = getattr(bw_cmd, '_is_running', False)
++ try:
++ bw_cmd = self.get_finalized_command("bdist_wininst")
++ is_wininst = getattr(bw_cmd, '_is_running', False)
++ except ImportError:
++ is_wininst = False
+ writer = ei.ScriptWriter
+ if is_wininst:
+ exec_param = "python.exe"
diff -Nru python-setuptools-44.1.1/debian/patches/series python-setuptools-44.1.1/debian/patches/series
--- python-setuptools-44.1.1/debian/patches/series 2018-08-31 06:14:53.000000000 -0400
+++ python-setuptools-44.1.1/debian/patches/series 2022-01-12 13:33:15.000000000 -0400
@@ -7,3 +7,4 @@
reproducible.diff
sorted-requires.diff
PKG-INFO-output-reproducible.diff
+removed-bdist_wininst.patch
diff -Nru python-setuptools-44.1.1/debian/rules python-setuptools-44.1.1/debian/rules
--- python-setuptools-44.1.1/debian/rules 2020-02-25 08:47:07.000000000 -0400
+++ python-setuptools-44.1.1/debian/rules 2022-01-12 13:33:15.000000000 -0400
@@ -16,9 +16,9 @@
PYTHONPATH=$(CURDIR) $(MAKE) -C docs html
-# mkdir -p debian/python-setuptools-whl/usr/share/python-wheels
-# python3 setup.py bdist_wheel --universal \
-# -d debian/python-setuptools-whl/usr/share/python-wheels
+ mkdir -p debian/python2-setuptools-whl/usr/share/python-wheels
+ python3 setup.py bdist_wheel --universal \
+ -d debian/python2-setuptools-whl/usr/share/python-wheels
# dh_pypy from dh-python < 1.20150705-1 falls over requires.txt
# and our requires.txt aren't useful
