Hide Forgot
Currently, we apply patch 189 bconditionally: %if %{with rpmwheels} %patch189 -p1 rm Lib/ensurepip/_bundled/*.whl %endif Since 3.9 no longer has the %ifarched lib64 patch (102), it would really be convenient if we can finally get rid of this antipattern and adapt 189 to be applicable at any time, like this: %autosetup -p1 ... %if %{with rpmwheels} rm Lib/ensurepip/_bundled/*.whl %endif The necessary code change would be: ensurepip module "simply" prefers the bundled wheels when they are present, falls back to /usr/share/python-wheels if the bundled wheels are not there. That could also make the patch little bit more upstreamable. The idea to upstream this patch is as follows: 1. When Python is built, there is a configure option (e.g. --shared-wheels-directory=/usr/share/python-wheels) 2. The value is baked into sysconfig (e.g. sysconfig.get_config_var('SHARED_WHEELS_DIRECTORY') == '/usr/share/python-wheels' or None) 3. When ensurepip is called, it checks the SHARED_WHEELS_DIRECTORY value: 3a. If it is None, it takes wheels from _bundled 3b. If it is set to an existing directory, it takes wheels from that directory 3c. If it is set to anything else, it fails 4. The wheels' versions and filenames need to be figured out at runtime (as we do now in patch 189).
See also: https://fedoraproject.org/wiki/SIGs/Python/UpstreamPythonPatches#00189-use-rpm-wheels.patch Previously, the task was tracked at: https://github.com/fedora-python/cpython/issues/9
Victor, what's the status here?
> Victor, what's the status here? Last weeks, I focused on helping to fix https://bugzilla.redhat.com/show_bug.cgi?id=1890881 (Fedora Python 3.10 COPR) blocker issues. I didn't work on this issue.
Victor, is this still a priority for you?
I created https://bugs.python.org/issue42856 and I'm working on an upstream PR.
This is ready in 3.10 upstream, will be part of the next alpha release. We'll use it there and if it proves nicer than what we have, we can consider whether to replace our patch in previous releases with this one.
FEDORA-2021-851c6e4e2d has been submitted as an update to Fedora 33. https://bodhi.fedoraproject.org/updates/FEDORA-2021-851c6e4e2d
FEDORA-2021-d5cde50865 has been submitted as an update to Fedora 32. https://bodhi.fedoraproject.org/updates/FEDORA-2021-d5cde50865
FEDORA-2021-851c6e4e2d has been pushed to the Fedora 33 stable repository. If problem still persists, please make note of it in this bug report.
FEDORA-2021-d5cde50865 has been pushed to the Fedora 32 stable repository. If problem still persists, please make note of it in this bug report.