Update to 20.4.0 (#1915682)

python-virtualenv.spec

@@ -1,5 +1,5 @@
 Name:           python-virtualenv
-Version:        20.3.0
+Version:        20.4.0
 Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
@@ -154,6 +154,9 @@ rm -r tmp_path
 
 
 %changelog
+* Tue Jan 19 2021 Lumír Balhar <lbalhar@redhat.com> - 20.4.0-1
+- Update to 20.4.0 (#1915682)
+
 * Tue Jan 12 2021 Lumír Balhar <lbalhar@redhat.com> - 20.3.0-1
 - Update to 20.3.0 (#1914641)
 

rpm-wheels.patch

@@ -1,6 +1,6 @@
-From 1fd2cb13860a9111c98a0151e1951fdbac49ee16 Mon Sep 17 00:00:00 2001
+From a5a31b5d5c4969c8148fd44d45379140b1273f87 Mon Sep 17 00:00:00 2001
 From: Lumir Balhar <lbalhar@redhat.com>
-Date: Tue, 23 Jun 2020 09:02:20 +0200
+Date: Tue, 19 Jan 2021 13:51:49 +0100
 Subject: [PATCH] rpm wheels
 
 ---
@@ -14,23 +14,23 @@ Subject: [PATCH] rpm wheels
  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
+index e8e7ab1..617cf67 100644
 --- a/src/virtualenv/run/__init__.py
 +++ b/src/virtualenv/run/__init__.py
-@@ -74,8 +74,9 @@ def build_parser_only(args=None):
+@@ -89,8 +89,9 @@ def build_parser_only(args=None):
  
  def handle_extra_commands(options):
      if options.upgrade_embed_wheels:
--        result = manual_upgrade(options.app_data)
+-        result = manual_upgrade(options.app_data, options.env)
 -        raise SystemExit(result)
-+        # result = manual_upgrade(options.app_data)
++        # result = manual_upgrade(options.app_data, options.env)
 +        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 f41b5fc..1b8e8fc 100644
+index c794e83..0867e9c 100644
 --- a/src/virtualenv/seed/embed/base_embed.py
 +++ b/src/virtualenv/seed/embed/base_embed.py
 @@ -6,11 +6,12 @@ from six import add_metaclass
@@ -47,7 +47,7 @@ index f41b5fc..1b8e8fc 100644
  
  
  @add_metaclass(ABCMeta)
-@@ -115,3 +116,7 @@ class BaseEmbed(Seeder):
+@@ -116,3 +117,7 @@ class BaseEmbed(Seeder):
  
      def __repr__(self):
          return ensure_str(self.__unicode__())
@@ -56,7 +56,7 @@ index f41b5fc..1b8e8fc 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 372e140..9bedb00 100644
+index c935c02..2d9d80d 100644
 --- a/src/virtualenv/seed/embed/pip_invoke.py
 +++ b/src/virtualenv/seed/embed/pip_invoke.py
 @@ -17,6 +17,7 @@ class PipInvoke(BaseEmbed):
@@ -66,9 +66,9 @@ index 372e140..9bedb00 100644
 +        self.insert_system_wheels_paths(creator)
          for_py_version = creator.interpreter.version_release_str
          with self.get_pip_install_cmd(creator.exe, for_py_version) as cmd:
-             env = pip_wheel_env_run(self.extra_search_dir, self.app_data)
+             env = pip_wheel_env_run(self.extra_search_dir, self.app_data, self.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
+index 9a98a70..a0ecadf 100644
 --- a/src/virtualenv/seed/embed/via_app_data/via_app_data.py
 +++ b/src/virtualenv/seed/embed/via_app_data/via_app_data.py
 @@ -39,6 +39,7 @@ class FromAppData(BaseEmbed):
@@ -80,7 +80,7 @@ index 779ee18..d6f2157 100644
              pip_version = name_to_whl["pip"].version_tuple if "pip" in name_to_whl else None
              installer_class = self.installer_class(pip_version)
 diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py
-index d118754..bc747d5 100644
+index 672d67b..bdd8864 100644
 --- a/src/virtualenv/seed/wheels/embed/__init__.py
 +++ b/src/virtualenv/seed/wheels/embed/__init__.py
 @@ -48,8 +48,11 @@ BUNDLE_SUPPORT = {
@@ -124,5 +124,5 @@ index 0000000..a968dee
 +    if wheels_dir.exists():
 +        yield wheels_dir
 -- 
-2.26.2
+2.29.2
 

sources

@@ -1 +1 @@
-SHA512 (virtualenv-20.3.0.tar.gz) = 5703a934d373d88670092febf26782f65303c65de93cffdd1a2ca06d6f2de4868378421f3ad96e3857eb99d0b60e7a77b0a2dbcf10561918efcbadb29a4ebf3b
+SHA512 (virtualenv-20.4.0.tar.gz) = 4dcc141441626ca2a565c1b51453ef0b7a05016037c44ae1017269e5b2ea98fb7fb29fb9cf3f8909a377824b5e52c5b40d2592e40931d8ad63ad850b8e5f23ac