Update to 20.0.25

python-virtualenv.spec

@@ -1,5 +1,5 @@
 Name:           python-virtualenv
-Version:        20.0.23
+Version:        20.0.25
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -97,9 +97,9 @@ Documentation for python virtualenv.
 %{__sed} -i -e "1s|#!/usr/bin/env python||" tasks/update_embedded.py
 
 # Remove the wheels provided by RPM packages
-rm src/virtualenv/seed/embed/wheels/pip-*
+rm src/virtualenv/seed/wheels/embed/pip-*
-rm src/virtualenv/seed/embed/wheels/setuptools-*
+rm src/virtualenv/seed/wheels/embed/setuptools-*
-rm src/virtualenv/seed/embed/wheels/wheel-*
+rm src/virtualenv/seed/wheels/embed/wheel-*
 
 test ! -f src/virtualenv/seed/embed/wheels/*.whl
 
@@ -125,17 +125,17 @@ unset SOURCE_DATE_EPOCH
 
 # Skip tests which requires internet or some extra dependencies
 # Requires internet:
-# - test_base_bootstrap_via_pip_invoke
+# - test_download_*
-# - test_seed_link_via_app_data
 # Detects system Python even it should not (problem with mock?):
 # - test_py_info_to_system_raises
 # Uses disabled functionalities around bundled wheels:
-# - test_wheel_support_no_python_requires
+# - test_wheel_*
-# Requires xonsh (FTBFS with Py 3.9)
+# - test_seed_link_via_app_data
-# - test_xonsh
+# - test_base_bootstrap_via_pip_invoke
-# Does not work with beta release of Python:
+# - test_acquire_find_wheel.py (whole file)
-# - test_version_satisfies_nok
+# Uses disabled functionalities around automatic updates:
-%pytest -vv -k "not test_base_bootstrap_via_pip_invoke and not test_seed_link_via_app_data and not test_py_info_to_system_raises and not test_wheel_support_no_python_requires and not test_xonsh and not test_version_satisfies_nok"
+# - test_periodic_update.py (whole file)
+%pytest -vv -k "not test_acquire_find_wheel and not test_periodic_update and not test_py_info_to_system_raises and not test_wheel_ and not test_download_ and not test_base_bootstrap_via_pip_invoke and not test_seed_link_via_app_data"
 
 rm -r tmp_path
 %endif
@@ -154,6 +154,9 @@ rm -r tmp_path
 
 
 %changelog
+* Tue Jun 23 2020 Lumír Balhar <lbalhar@redhat.com> - 20.0.25-1
+- Update to 20.0.25
+
 * Mon Jun 15 2020 Lumír Balhar <lbalhar@redhat.com> - 20.0.23-1
 - Update to 20.0.23 (#1742034)
 

rpm-wheels.patch

@@ -1,31 +1,53 @@
-From fd3e105dde6f4c14b4d85a325cd70c79d7b452cc Mon Sep 17 00:00:00 2001
+From 1fd2cb13860a9111c98a0151e1951fdbac49ee16 Mon Sep 17 00:00:00 2001
 From: Lumir Balhar <lbalhar@redhat.com>
-Date: Fri, 22 May 2020 14:25:48 +0200
+Date: Tue, 23 Jun 2020 09:02:20 +0200
 Subject: [PATCH] rpm wheels
 
 ---
- src/virtualenv/seed/embed/base_embed.py       |  5 ++++
+ src/virtualenv/run/__init__.py                |  5 +++--
- src/virtualenv/seed/embed/pip_invoke.py       |  5 ++--
+ src/virtualenv/seed/embed/base_embed.py       |  7 +++++-
- src/virtualenv/seed/embed/wheels/__init__.py  |  3 +++
+ src/virtualenv/seed/embed/pip_invoke.py       |  1 +
- src/virtualenv/seed/embed/wheels/acquire.py   | 24 ++++++++++++-------
+ .../seed/embed/via_app_data/via_app_data.py   |  1 +
- .../seed/via_app_data/via_app_data.py         |  1 +
+ src/virtualenv/seed/wheels/embed/__init__.py  |  3 +++
- src/virtualenv/util/path/_system_wheels.py    | 22 +++++++++++++++++
+ src/virtualenv/util/path/_system_wheels.py    | 22 +++++++++++++++++++
- 6 files changed, 49 insertions(+), 11 deletions(-)
+ 6 files changed, 36 insertions(+), 3 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
+index 8de7962..3df28b6 100644
+--- a/src/virtualenv/run/__init__.py
++++ b/src/virtualenv/run/__init__.py
+@@ -74,8 +74,9 @@ def build_parser_only(args=None):
+ 
+ def handle_extra_commands(options):
+     if options.upgrade_embed_wheels:
+-        result = manual_upgrade(options.app_data)
+-        raise SystemExit(result)
++        # result = manual_upgrade(options.app_data)
++        logging.warning("virtualenv installed from the RPM package uses wheels from RPM packages as well. Updating them via virtualenv is not possible. The RPM packaged wheels are updated together with other RPM packages of the system.")
++        raise SystemExit(1)
+ 
+ 
+ def load_app_data(args, parser, options):
 diff --git a/src/virtualenv/seed/embed/base_embed.py b/src/virtualenv/seed/embed/base_embed.py
-index bffd494..349e5ff 100644
+index f41b5fc..1b8e8fc 100644
 --- a/src/virtualenv/seed/embed/base_embed.py
 +++ b/src/virtualenv/seed/embed/base_embed.py
-@@ -6,6 +6,7 @@ from six import add_metaclass
+@@ -6,11 +6,12 @@ from six import add_metaclass
  
  from virtualenv.util.path import Path
  from virtualenv.util.six import ensure_str, ensure_text
 +from virtualenv.util.path._system_wheels import get_system_wheels_paths
  
  from ..seeder import Seeder
+ from ..wheels import Version
  
-@@ -101,3 +102,7 @@ class BaseEmbed(Seeder):
+-PERIODIC_UPDATE_ON_BY_DEFAULT = True
++PERIODIC_UPDATE_ON_BY_DEFAULT = False
+ 
+ 
+ @add_metaclass(ABCMeta)
+@@ -115,3 +116,7 @@ class BaseEmbed(Seeder):
  
      def __repr__(self):
          return ensure_str(self.__unicode__())
@@ -34,126 +56,45 @@ index bffd494..349e5ff 100644
 +        system_wheels_paths = get_system_wheels_paths(creator.interpreter.executable)
 +        self.extra_search_dir = list(system_wheels_paths) + self.extra_search_dir
 diff --git a/src/virtualenv/seed/embed/pip_invoke.py b/src/virtualenv/seed/embed/pip_invoke.py
-index 25be493..f49a420 100644
+index 372e140..9bedb00 100644
 --- a/src/virtualenv/seed/embed/pip_invoke.py
 +++ b/src/virtualenv/seed/embed/pip_invoke.py
-@@ -23,8 +23,9 @@ class PipInvoke(BaseEmbed):
+@@ -17,6 +17,7 @@ class PipInvoke(BaseEmbed):
      def run(self, creator):
          if not self.enabled:
              return
 +        self.insert_system_wheels_paths(creator)
-         with self.get_pip_install_cmd(creator.exe, creator.interpreter.version_release_str) as cmd:
+         for_py_version = creator.interpreter.version_release_str
--            with pip_wheel_env_run(creator.interpreter.version_release_str, self.app_data) as env:
+         with self.get_pip_install_cmd(creator.exe, for_py_version) as cmd:
-+            with pip_wheel_env_run(creator.interpreter.version_release_str, creator.interpreter.executable, self.app_data) as env:
+             env = pip_wheel_env_run(self.extra_search_dir, self.app_data)
-                 self._execute(cmd, env)
+diff --git a/src/virtualenv/seed/embed/via_app_data/via_app_data.py b/src/virtualenv/seed/embed/via_app_data/via_app_data.py
- 
+index 779ee18..d6f2157 100644
-     @staticmethod
+--- a/src/virtualenv/seed/embed/via_app_data/via_app_data.py
-@@ -46,8 +47,6 @@ class PipInvoke(BaseEmbed):
++++ b/src/virtualenv/seed/embed/via_app_data/via_app_data.py
-             cmd.append("{}{}".format(key, "=={}".format(ver) if ver is not None else ""))
+@@ -39,6 +39,7 @@ class FromAppData(BaseEmbed):
-         with ExitStack() as stack:
+     def run(self, creator):
-             folders = set()
+         if not self.enabled:
--            for context in (ensure_file_on_disk(get_bundled_wheel(p, version), self.app_data) for p in pkg_versions):
+             return
--                folders.add(stack.enter_context(context).parent)
++        self.insert_system_wheels_paths(creator)
-             folders.update(set(self.extra_search_dir))
+         with self._get_seed_wheels(creator) as name_to_whl:
-             for folder in folders:
+             pip_version = name_to_whl["pip"].version_tuple if "pip" in name_to_whl else None
-                 cmd.extend(["--find-links", str(folder)])
+             installer_class = self.installer_class(pip_version)
-diff --git a/src/virtualenv/seed/embed/wheels/__init__.py b/src/virtualenv/seed/embed/wheels/__init__.py
+diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py
-index 90fea02..99cc251 100644
+index d118754..bc747d5 100644
---- a/src/virtualenv/seed/embed/wheels/__init__.py
+--- a/src/virtualenv/seed/wheels/embed/__init__.py
-+++ b/src/virtualenv/seed/embed/wheels/__init__.py
++++ b/src/virtualenv/seed/wheels/embed/__init__.py
-@@ -38,3 +38,6 @@ BUNDLE_SUPPORT = {
+@@ -48,8 +48,11 @@ BUNDLE_SUPPORT = {
-     },
  }
- MAX = "3.9"
+ MAX = "3.10"
-+
+ 
 +# Redefined here because bundled wheels are removed in RPM build
 +BUNDLE_SUPPORT = None
-diff --git a/src/virtualenv/seed/embed/wheels/acquire.py b/src/virtualenv/seed/embed/wheels/acquire.py
-index 91b630d..4067f0e 100644
---- a/src/virtualenv/seed/embed/wheels/acquire.py
-+++ b/src/virtualenv/seed/embed/wheels/acquire.py
-@@ -12,6 +12,7 @@ from zipfile import ZipFile
  
- from virtualenv.info import IS_ZIPAPP
+ def get_embed_wheel(distribution, for_py_version):
- from virtualenv.util.path import Path
++    return None  # BUNDLE_SUPPORT == None anyway
-+from virtualenv.util.path._system_wheels import get_system_wheels_paths
+     path = BUNDLE_FOLDER / (BUNDLE_SUPPORT.get(for_py_version, {}) or BUNDLE_SUPPORT[MAX]).get(distribution)
- from virtualenv.util.six import ensure_str, ensure_text
+     return Wheel.from_path(path)
- from virtualenv.util.subprocess import Popen, subprocess
- from virtualenv.util.zipapp import ensure_file_on_disk
-@@ -33,8 +34,9 @@ class WheelDownloadFail(ValueError):
- def get_wheels(for_py_version, wheel_cache_dir, extra_search_dir, packages, app_data, download):
-     # not all wheels are compatible with all python versions, so we need to py version qualify it
-     processed = copy(packages)
--    # 1. acquire from bundle
--    acquire_from_bundle(processed, for_py_version, wheel_cache_dir)
-+    # Do not use bundled wheels, they are removed in rpmbuild anyway
-+    # acquire_from_bundle(processed, for_py_version, wheel_cache_dir)
-+
-     # 2. acquire from extra search dir
-     acquire_from_dir(processed, for_py_version, wheel_cache_dir, extra_search_dir)
-     # 3. download from the internet
-@@ -47,6 +49,7 @@ def get_wheels(for_py_version, wheel_cache_dir, extra_search_dir, packages, app_
  
- 
- def acquire_from_bundle(packages, for_py_version, to_folder):
-+    raise NotImplementedError("Bundled wheels are not available")
-     for pkg, version in list(packages.items()):
-         bundle = get_bundled_wheel(pkg, for_py_version)
-         if bundle is not None:
-@@ -67,6 +70,7 @@ def acquire_from_bundle(packages, for_py_version, to_folder):
- 
- 
- def get_bundled_wheel(package, version_release):
-+    raise NotImplementedError("Bundled wheels are not available")  # and BUNDLE_SUPPORT == None anyway
-     return BUNDLE_FOLDER / (BUNDLE_SUPPORT.get(version_release, {}) or BUNDLE_SUPPORT[MAX]).get(package)
- 
- 
-@@ -156,7 +160,7 @@ def download_wheel(packages, for_py_version, to_folder, app_data):
-     cmd.extend(to_download)
-     # pip has no interface in python - must be a new sub-process
- 
--    with pip_wheel_env_run("{}.{}".format(*sys.version_info[0:2]), app_data) as env:
-+    with pip_wheel_env_run("{}.{}".format(*sys.version_info[0:2]), sys.executable, app_data) as env:
-         process = Popen(cmd, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
-         out, err = process.communicate()
-         if process.returncode != 0:
-@@ -164,7 +168,7 @@ def download_wheel(packages, for_py_version, to_folder, app_data):
- 
- 
- @contextmanager
--def pip_wheel_env_run(version, app_data):
-+def pip_wheel_env_run(version, executable, app_data):
-     env = os.environ.copy()
-     env.update(
-         {
-@@ -172,7 +176,11 @@ def pip_wheel_env_run(version, app_data):
-             for k, v in {"PIP_USE_WHEEL": "1", "PIP_USER": "0", "PIP_NO_INPUT": "1"}.items()
-         },
-     )
--    with ensure_file_on_disk(get_bundled_wheel("pip", version), app_data) as pip_wheel_path:
--        # put the bundled wheel onto the path, and use it to do the bootstrap operation
--        env[str("PYTHONPATH")] = str(pip_wheel_path)
--        yield env
-+
-+    paths = list(get_system_wheels_paths(executable))
-+    pip_wheels = []
-+    for path in paths:
-+        pip_wheels.extend([str(wheel) for wheel in path.glob("pip-*")])
-+    env[str("PYTHONPATH")] = pip_wheels[0]  # Use first pip in the list (ensurepip, if exists)
-+
-+    yield env
-diff --git a/src/virtualenv/seed/via_app_data/via_app_data.py b/src/virtualenv/seed/via_app_data/via_app_data.py
-index de3757d..db7c6d9 100644
---- a/src/virtualenv/seed/via_app_data/via_app_data.py
-+++ b/src/virtualenv/seed/via_app_data/via_app_data.py
-@@ -38,6 +38,7 @@ class FromAppData(BaseEmbed):
-     def run(self, creator):
-         if not self.enabled:
-             return
-+        self.insert_system_wheels_paths(creator)
-         base_cache = self.base_cache / creator.interpreter.version_release_str
-         with self._get_seed_wheels(creator, base_cache) as name_to_whl:
-             pip_version = name_to_whl["pip"].stem.split("-")[1] if "pip" in name_to_whl else None
 diff --git a/src/virtualenv/util/path/_system_wheels.py b/src/virtualenv/util/path/_system_wheels.py
 new file mode 100644
 index 0000000..a968dee

sources

@@ -1 +1 @@
-SHA512 (virtualenv-20.0.23.tar.gz) = 747ae0031ae587dc2bdc0743dcab7b1673273a5c79fc4bcb539eacd899ddc064b622e567b654fc40bdfdaa90e311d2621856085417b8fd344878546b19cdce84
+SHA512 (virtualenv-20.0.25.tar.gz) = c143a76ef37ad4b74d37c9dcb01711fe408b5971905fe9eb46183f47de5d99ef275859fec65b6b5edf1fdf3bb0a13c21b8d4bb9ee984b9a5b80e5a4dc8f1e712