public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python3.12] rawhide: Remove the bundled wheel.whl unconditionally
@ 2026-10-26 16:21 
  0 siblings, 0 replies; only message in thread
From:  @ 2026-10-26 16:21 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/python3.12
            Branch : rawhide
            Commit : 7ee22defedd143e0d0c122aec34a267c94782217
            Author : Miro Hrončok <miro@hroncok.cz>
            Date   : 2026-10-15T13:58:08+02:00
            Stats  : +3/-11 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/python3.12/c/7ee22defedd143e0d0c122aec34a267c94782217?branch=rawhide

            Log:
            Remove the bundled wheel.whl unconditionally

With patch 460, it is newer used.

Note that the license of the test package (Python + setuptools) does not change,
as setuptools bundles (bits of) wheel and packaging anyway.

---
diff --git a/python3.12.spec b/python3.12.spec
index 488a2c9..b700769 100644
--- a/python3.12.spec
+++ b/python3.12.spec
@@ -73,7 +73,6 @@ License: Python-2.0.1
 # This needs to be manually updated when we update Python.
 %global pip_version 25.0.1
 %global setuptools_version 79.0.1
-%global wheel_version 0.40.0
 # All of those also include a list of indirect bundled libs:
 # pip
 #  $ %%{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/ensurepip/_bundled/pip-*.whl pip/_vendor/vendor.txt)
@@ -118,11 +117,6 @@ Provides: bundled(python3dist(typing-extensions)) = 4.12.2
 Provides: bundled(python3dist(wheel)) = 0.45.1
 Provides: bundled(python3dist(zipp)) = 3.19.2
 }
-# wheel
-#  $ %%{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/test/wheeldata/wheel-*.whl wheel/vendored/vendor.txt)
-%global wheel_bundled_provides %{expand:
-Provides: bundled(python3dist(packaging)) = 23
-}
 
 # Expensive optimizations (mainly, profile-guided optimizations)
 %bcond_without optimizations
@@ -694,9 +688,7 @@ Requires: %{python_wheel_pkg_prefix}-setuptools-wheel >= 71
 %else
 Provides: bundled(python3dist(setuptools)) = %{setuptools_version}
 %setuptools_bundled_provides
-Provides: bundled(python3dist(wheel)) = %{wheel_version}
-%wheel_bundled_provides
-# License manually combined from Python + setuptools + wheel
+# License manually combined from Python + setuptools
 License: Python-2.0.1 AND MIT AND Apache-2.0 AND (Apache-2.0 OR BSD-2-Clause)
 %endif
 
@@ -757,15 +749,15 @@ The debug runtime additionally supports debug builds of C-API extensions
 # setuptools.whl does not contain the vendored.txt files
 if [ -f %{_rpmconfigdir}/pythonbundles.py ]; then
   %{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/ensurepip/_bundled/pip-*.whl pip/_vendor/vendor.txt) --compare-with '%pip_bundled_provides'
-  %{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/test/wheeldata/wheel-*.whl wheel/vendored/vendor.txt) --compare-with '%wheel_bundled_provides'
   %{_rpmconfigdir}/pythonbundles.py <(unzip -l Lib/test/wheeldata/setuptools-*.whl | grep -E '_vendor/.+dist-info/RECORD' | sed -E 's@^.*/([^-]+)-([^-]+)\.dist-info/.*$@\1==\2@') --compare-with '%setuptools_bundled_provides'
 fi
 
 %if %{with rpmwheels}
 rm Lib/ensurepip/_bundled/pip-%{pip_version}-py3-none-any.whl
 rm Lib/test/wheeldata/setuptools-%{setuptools_version}-py3-none-any.whl
-rm Lib/test/wheeldata/wheel-%{wheel_version}-py3-none-any.whl
 %endif
+# We remove wheel.whl unconditionally, goes together with patch 460
+rm Lib/test/wheeldata/wheel-*-py3-none-any.whl
 
 # Remove all exe files to ensure we are not shipping prebuilt binaries
 # note that those are only used to create Microsoft Windows installers

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-10-26 16:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-26 16:21 [rpms/python3.12] rawhide: Remove the bundled wheel.whl unconditionally 

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox