PR#38: Update the ensurepip module to work with setuptools >= 45 - rpms/python36

rpms / python36

#38 Update the ensurepip module to work with setuptools >= 45

Merged 4 years ago by churchyard. Opened 4 years ago by churchyard.

rpms/ churchyard/python36 setuptools45 into master

Update the ensurepip module to work with setuptools >= 45

Miro Hrončok • 4 years ago

da29037

00189-use-rpm-wheels.patch

file modified

+11 -6

		`@@ -2,7 +2,7 @@`
		`index 4748ba4..fc02255 100644`
		`--- a/Lib/ensurepip/__init__.py`
		`+++ b/Lib/ensurepip/__init__.py`
		`- @@ -1,16 +1,27 @@`
		`+ @@ -1,16 +1,31 @@`
		`+import distutils.version`
		`+import glob`
		`import os`
		`@@ -17,14 +17,18 @@`
		`+_WHEEL_DIR = "/usr/share/python-wheels/"`

		`-_SETUPTOOLS_VERSION = "40.6.2"`
		`+ +_wheels = {}`

		`-_PIP_VERSION = "18.1"`
		`+def _get_most_recent_wheel_version(pkg):`
		`+ prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))`
		`- + suffix = "-py2.py3-none-any.whl"`
		`- + pattern = "{}*{}".format(prefix, suffix)`
		`- + versions = (p[len(prefix):-len(suffix)] for p in glob.glob(pattern))`
		`- + return str(max(versions, key=distutils.version.LooseVersion))`
		`+ + _wheels[pkg] = {}`
		`+ + for suffix in "-py2.py3-none-any.whl", "-py3-none-any.whl":`
		`+ + pattern = "{}*{}".format(prefix, suffix)`
		`+ + for path in glob.glob(pattern):`
		`+ + version_str = path[len(prefix):-len(suffix)]`
		`+ + _wheels[pkg][version_str] = os.path.basename(path)`
		`+ + return str(max(_wheels[pkg], key=distutils.version.LooseVersion))`
		`+`
		`+`
		`+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")`
		`@@ -36,13 +40,14 @@`
		`@@ -94,12 +105,9 @@ def _bootstrap(*, root=None, upgrade=False, user=False,`
		`additional_paths = []`
		`for project, version in _PROJECTS:`
		`- wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)`
		`+ - wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)`
		`- whl = pkgutil.get_data(`
		`- "ensurepip",`
		`- "_bundled/{}".format(wheel_name),`
		`- )`
		`- with open(os.path.join(tmpdir, wheel_name), "wb") as fp:`
		`- fp.write(whl)`
		`+ + wheel_name = _wheels[project][version]`
		`+ with open(os.path.join(_WHEEL_DIR, wheel_name), "rb") as sfp:`
		`+ with open(os.path.join(tmpdir, wheel_name), "wb") as fp:`
		`+ fp.write(sfp.read())`

python36.spec

file modified

+4 -1

		`@@ -17,7 +17,7 @@`
		`#global prerel ...`
		`%global upstream_version %{general_version}%{?prerel}`
		`Version: %{general_version}%{?prerel:~%{prerel}}`
		`- Release: 2%{?dist}`
		`+ Release: 3%{?dist}`
		`License: Python`


		`@@ -1535,6 +1535,9 @@`
		`# ======================================================`

		`%changelog`
		`+ * Wed Feb 12 2020 Miro Hrončok <mhroncok@redhat.com> - 3.6.10-3`
		`+ - Update the ensurepip module to work with setuptools >= 45`
		`+`
		`* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.10-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild`

churchyard commented 4 years ago

setuptools 45.x is Python 3 only and changed the name of the wheel

This is an untested naive backport from https://src.fedoraproject.org/rpms/python37/pull-request/40

zuul commented 4 years ago

Build failed.

rpm-scratch-build : TIMED_OUT in 1h 30m 45s
rpm-linter : SKIPPED
rpm-rpminspect : SKIPPED (non-voting)
rpm-test : SKIPPED

churchyard commented 4 years ago

Unrelated blocking failures:

armv7hl, x86_64, s390x all hang in %check (same place). aarch64 segfaults.

rebased onto da29037

4 years ago

zuul commented 4 years ago

Build succeeded.

rpm-scratch-build : SUCCESS in 1h 02m 29s
rpm-linter : SUCCESS in 2m 27s
rpm-rpminspect : POST_FAILURE in 4m 05s (non-voting)
rpm-test : SUCCESS in 4m 03s

churchyard commented 4 years ago

There is a random ConnectionResetError: [Errno 104] Connection reset by peer flakiness in tests, but generally, it builds.

pviktori commented 4 years ago

Smoke-tested in Mock: ensurepip installs the setuptools 45 wheel if it's on the system.
+1

Pull-Request has been merged by churchyard

4 years ago

churchyard commented 4 years ago

I got 3 i686 fialures in a row:

======================================================================
ERROR: test_pha_required_nocert (test.test_ssl.TestPostHandshakeAuth)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/builddir/build/BUILD/Python-3.6.10/Lib/test/test_ssl.py", line 3823, in test_pha_required_nocert
    s.write(b'HASCERT')
  File "/builddir/build/BUILD/Python-3.6.10/Lib/ssl.py", line 847, in write
    return self._sslobj.write(data)
  File "/builddir/build/BUILD/Python-3.6.10/Lib/ssl.py", line 598, in write
    return self._sslobj.write(data)
ConnectionResetError: [Errno 104] Connection reset by peer
----------------------------------------------------------------------

Will shotgun scratchbuild to see if it is permanent.

churchyard commented 4 years ago

Ok, it's really just flaky.