[rpms/python-virtualenv] rawhide: Update to 21.5.1 (rhbz#2488711)

[rpms/python-virtualenv] rawhide: Update to 21.5.1 (rhbz#2488711)

[Lumir Balhar]

A new commit has been pushed.

Repo   : rpms/python-virtualenv
Branch : rawhide
Commit : d8f5dcf0a82e3bbe2129b2832263f016ee4b5f4b
Author : Lumir Balhar <lbalhar@redhat.com>
Date   : 2026-06-19T09:26:03+02:00
Stats  : +31/-21 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/python-virtualenv/c/d8f5dcf0a82e3bbe2129b2832263f016ee4b5f4b?branch=rawhide

Log:
Update to 21.5.1 (rhbz#2488711)

---
diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index 69aff8e..d0f5be8 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -2,7 +2,7 @@
 %bcond tests %{without bootstrap}
 
 Name:           python-virtualenv
-Version:        21.4.2
+Version:        21.5.1
 Release:        %autorelease
 Summary:        Tool to create isolated Python environments
 
@@ -83,7 +83,6 @@ Requires:       (%{python_wheel_pkg_prefix}-wheel0.37-wheel if python3.6)
 # Remove the wheels provided by RPM packages
 rm src/virtualenv/seed/wheels/embed/pip-*
 rm src/virtualenv/seed/wheels/embed/setuptools-*
-rm src/virtualenv/seed/wheels/embed/wheel-*
 
 test ! -f src/virtualenv/seed/embed/wheels/*.whl
 
@@ -117,6 +116,7 @@ sed -i 's/filelock>=3.24.2/filelock>=3.12.2/' pyproject.toml
 # - test_create_distutils_cfg
 # Uses disabled functionalities around bundled wheels:
 # - test_wheel_*
+# - test_embed_wheel_*
 # - test_seed_link_via_app_data
 # - test_base_bootstrap_via_pip_invoke
 # - test_acquire.py (whole file)
@@ -131,6 +131,8 @@ PIP_CERT=/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem \
                 not test_acquire and \
                 not test_periodic_update and \
                 not test_wheel_ and \
+                not test_embed_wheel_future_version_reuses_newest and \
+                not test_embed_wheel_oldest_supported_is_present and \
                 not test_download_ and \
                 not test_can_build_c_extensions and \
                 not test_base_bootstrap_via_pip_invoke and \

diff --git a/rpm-wheels.patch b/rpm-wheels.patch
index e629fb4..b7be811 100644
--- a/rpm-wheels.patch
+++ b/rpm-wheels.patch
@@ -1,4 +1,4 @@
-From 83d8fb54d8e86184b6aae22fee8b53095397b652 Mon Sep 17 00:00:00 2001
+From 2a9f956caddaba4c72ef45f86a8d2db395994c89 Mon Sep 17 00:00:00 2001
 From: Lumir Balhar <lbalhar@redhat.com>
 Date: Thu, 23 Apr 2026 07:38:31 +0200
 Subject: [PATCH] RPM wheels
@@ -15,7 +15,7 @@ Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
  src/virtualenv/seed/wheels/acquire.py         |  3 ++-
  src/virtualenv/seed/wheels/embed/__init__.py  |  4 ++++
  src/virtualenv/util/path/_system_wheels.py    | 22 +++++++++++++++++++
- 7 files changed, 48 insertions(+), 4 deletions(-)
+ 7 files changed, 49 insertions(+), 4 deletions(-)
  create mode 100644 src/virtualenv/util/path/_system_wheels.py
 
 diff --git a/src/virtualenv/run/__init__.py b/src/virtualenv/run/__init__.py
@@ -35,18 +35,18 @@ index 79ebc42..fa7eb91 100644
  
  def load_app_data(
 diff --git a/src/virtualenv/seed/embed/base_embed.py b/src/virtualenv/seed/embed/base_embed.py
-index cb344ce..af69b64 100644
+index 07f15d3..10a8b05 100644
 --- a/src/virtualenv/seed/embed/base_embed.py
 +++ b/src/virtualenv/seed/embed/base_embed.py
-@@ -8,6 +8,7 @@ from typing import TYPE_CHECKING
- 
+@@ -9,6 +9,7 @@ from typing import TYPE_CHECKING
  from virtualenv.seed.seeder import Seeder
  from virtualenv.seed.wheels import Version
+ from virtualenv.seed.wheels.embed import MIN, OLDEST_SUPPORTED
 +from virtualenv.util.path._system_wheels import get_system_wheels_paths
  
  if TYPE_CHECKING:
      from argparse import ArgumentParser
-@@ -18,7 +19,7 @@ if TYPE_CHECKING:
+@@ -19,7 +20,7 @@ if TYPE_CHECKING:
      from virtualenv.config.cli.parser import VirtualEnvOptions
  
  LOGGER = logging.getLogger(__name__)
@@ -55,7 +55,7 @@ index cb344ce..af69b64 100644
  
  
  class BaseEmbed(Seeder, ABC):
-@@ -53,6 +54,15 @@ class BaseEmbed(Seeder, ABC):
+@@ -50,6 +51,15 @@ class BaseEmbed(Seeder, ABC):
  
          if not self.distribution_to_versions():
              self.enabled = False
@@ -71,15 +71,23 @@ index cb344ce..af69b64 100644
  
      @classmethod
      def distributions(cls) -> dict[str, str]:
-@@ -144,6 +154,10 @@ class BaseEmbed(Seeder, ABC):
+@@ -79,6 +89,7 @@ class BaseEmbed(Seeder, ABC):
+             the remedies
+
+         """
++        return None  # RPM-provided wheels support any Python version
+         if interpreter.version_info[:2] >= OLDEST_SUPPORTED:
+             return None
+         target = f"{interpreter.version_info.major}.{interpreter.version_info.minor}"
+@@ -163,6 +174,10 @@ class BaseEmbed(Seeder, ABC):
              result += f" {distribution}{ver},"
          return result[:-1] + ")"
- 
+
 +    def insert_system_wheels_paths(self, creator):
 +        system_wheels_paths = get_system_wheels_paths(creator.interpreter)
 +        self.extra_search_dir = list(system_wheels_paths) + self.extra_search_dir
 +
- 
+
  __all__ = [
      "BaseEmbed",
 diff --git a/src/virtualenv/seed/embed/pip_invoke.py b/src/virtualenv/seed/embed/pip_invoke.py
@@ -125,12 +133,12 @@ index 63f5376..7a1a244 100644
              to_folder=app_data.house,
              env=env,
 diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py
-index 05b359e..92057ad 100644
+index ac9a85f..60f8745 100644
 --- a/src/virtualenv/seed/wheels/embed/__init__.py
 +++ b/src/virtualenv/seed/wheels/embed/__init__.py
-@@ -49,6 +49,9 @@ BUNDLE_SUPPORT = {
- }
- MAX = next(reversed(BUNDLE_SUPPORT))
+@@ -53,6 +53,9 @@ def _release_tuple(version: str) -> tuple[int, ...]:
+ # oldest target Python version virtualenv still bundles seed wheels for; anything below this has no embedded pip
+ OLDEST_SUPPORTED = _release_tuple(MIN)
  
 +# Redefined here because bundled wheels are removed in RPM build
 +BUNDLE_SUPPORT = None
@@ -138,14 +146,14 @@ index 05b359e..92057ad 100644
  # SHA-256 of every bundled wheel. Verified on load so a corrupted or tampered wheel on disk fails loud instead of
  # being handed to pip. Generated together with ``BUNDLE_SUPPORT`` by ``tasks/upgrade_wheels.py``.
  BUNDLE_SHA256 = {
-@@ -75,6 +78,7 @@ def get_embed_wheel(distribution: str, for_py_version: str) -> Wheel | None:
+@@ -77,6 +80,7 @@ def get_embed_wheel(distribution: str, for_py_version: str | None) -> Wheel | No
      :raises RuntimeError: if the bundled wheel on disk fails SHA-256 verification.
  
      """
 +    return None  # BUNDLE_SUPPORT == None anyway
-     mapping = BUNDLE_SUPPORT.get(for_py_version, {}) or BUNDLE_SUPPORT[MAX]
-     wheel_file = mapping.get(distribution)
-     if wheel_file is None:
+     if for_py_version is None or _release_tuple(for_py_version) > _release_tuple(MAX):
+         # no specific target, or a Python newer than anything bundled: reuse the newest bundle
+         mapping = BUNDLE_SUPPORT[MAX]
 diff --git a/src/virtualenv/util/path/_system_wheels.py b/src/virtualenv/util/path/_system_wheels.py
 new file mode 100644
 index 0000000..f3fd9b1

diff --git a/sources b/sources
index b7533c3..9bcf503 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (virtualenv-21.4.2.tar.gz) = 5e42f3a751b274284bf3885a964d3e855c0edc24a8a0d676c58645c91f54050202540273023e21d49f0fa25a0a195777296b3cb3e3e76202f2f6328846623897
+SHA512 (virtualenv-21.5.1.tar.gz) = c7d49b496ede5ffcd6bf10ba8bcf47acae3c98470c5bb1e41c2a074c9f128ee0a6d83f89a0e088c4ca1e237e27e6d73affe0adbaa884f5afd526ac6881d2dbb8