Update to 21.3

python-pip.spec

@@ -13,7 +13,7 @@
 %endif
 
 %global srcname pip
-%global base_version 21.2.3
+%global base_version 21.3
 %global upstream_version %{base_version}%{?prerel}
 %global python_wheelname %{srcname}-%{upstream_version}-py3-none-any.whl
 %global python_wheeldir %{_datadir}/python-wheels
@@ -22,7 +22,7 @@
 
 Name:           python-%{srcname}
 Version:        %{base_version}%{?prerel:~%{prerel}}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        A tool for installing and managing Python packages
 
 # We bundle a lot of libraries with pip, which itself is under MIT license.
@@ -122,27 +122,27 @@ Packages" or "Pip Installs Python".
 # You can generate it with:
 # %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{1}dist' src/pip/_vendor/vendor.txt
 %global bundled() %{expand:
-Provides: bundled(python%{1}dist(appdirs)) = 1.4.4
 Provides: bundled(python%{1}dist(cachecontrol)) = 0.12.6
 Provides: bundled(python%{1}dist(certifi)) = 2021.5.30
 Provides: bundled(python%{1}dist(chardet)) = 4
 Provides: bundled(python%{1}dist(colorama)) = 0.4.4
-Provides: bundled(python%{1}dist(distlib)) = 0.3.2
+Provides: bundled(python%{1}dist(distlib)) = 0.3.3
-Provides: bundled(python%{1}dist(distro)) = 1.5
+Provides: bundled(python%{1}dist(distro)) = 1.6
 Provides: bundled(python%{1}dist(html5lib)) = 1.1
 Provides: bundled(python%{1}dist(idna)) = 3.2
 Provides: bundled(python%{1}dist(msgpack)) = 1.0.2
 Provides: bundled(python%{1}dist(packaging)) = 21
 Provides: bundled(python%{1}dist(pep517)) = 0.11
-Provides: bundled(python%{1}dist(progress)) = 1.5
+Provides: bundled(python%{1}dist(platformdirs)) = 2.4
+Provides: bundled(python%{1}dist(progress)) = 1.6
 Provides: bundled(python%{1}dist(pyparsing)) = 2.4.7
 Provides: bundled(python%{1}dist(requests)) = 2.26
-Provides: bundled(python%{1}dist(resolvelib)) = 0.7.1
+Provides: bundled(python%{1}dist(resolvelib)) = 0.8
 Provides: bundled(python%{1}dist(setuptools)) = 44
 Provides: bundled(python%{1}dist(six)) = 1.16
 Provides: bundled(python%{1}dist(tenacity)) = 8.0.1
 Provides: bundled(python%{1}dist(tomli)) = 1.0.3
-Provides: bundled(python%{1}dist(urllib3)) = 1.26.6
+Provides: bundled(python%{1}dist(urllib3)) = 1.26.7
 Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
 }
 
@@ -360,11 +360,13 @@ pytest_k='not completion and
           not test_from_link_vcs_without_source_dir and
           not test_should_cache_git_sha'
 
+# test_pep517 and test_pep660 are ignored entirely, as they import tomli_w and we don't have that packaged yet
 # --deselect'ed tests are not compatible with the latest virtualenv
 # These files contain almost 500 tests so we should enable them back
 # as soon as pip will be compatible upstream
 # https://github.com/pypa/pip/pull/8441
 %pytest -m 'not network' -k "$(echo $pytest_k)" \
+    --ignore tests/functional/test_pep660.py --ignore tests/functional/test_pep517.py \
     --deselect tests/functional --deselect tests/lib/test_lib.py --deselect tests/unit/test_build_env.py
 %endif
 
@@ -401,6 +403,10 @@ pytest_k='not completion and
 %{python_wheeldir}/%{python_wheelname}
 
 %changelog
+* Wed Oct 13 2021 Miro Hrončok <mhroncok@redhat.com> - 21.3-1
+- Update to 21.3
+- Resolves: rhbz#2013026
+
 * Wed Oct 06 2021 Charalampos Stratakis <cstratak@redhat.com> - 21.2.3-4
 - Remove bundled windows executables
 - Resolves: rhbz#2005453

remove-existing-dist-only-if-path-conflicts.patch

@@ -1,4 +1,4 @@
-From 03fe2f1a674d8a8dfbd7da5bef2a6ae123670092 Mon Sep 17 00:00:00 2001
+From 517656ed4520b09ac6365467e459778f94ca2f0c Mon Sep 17 00:00:00 2001
 From: Karolina Surma <ksurma@redhat.com>
 Date: Mon, 10 May 2021 18:16:20 +0200
 Subject: [PATCH] Prevent removing of the system packages installed under
@@ -24,10 +24,10 @@ Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
  4 files changed, 30 insertions(+), 2 deletions(-)
 
 diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
-index 4c58cdb..3570e17 100644
+index ff0dd2f..a72aec8 100644
 --- a/src/pip/_internal/req/req_install.py
 +++ b/src/pip/_internal/req/req_install.py
-@@ -43,6 +43,7 @@ from pip._internal.utils.misc import (
+@@ -46,6 +46,7 @@ from pip._internal.utils.misc import (
      ask_path_exists,
      backup_dir,
      display_path,
@@ -35,9 +35,9 @@ index 4c58cdb..3570e17 100644
      dist_in_site_packages,
      dist_in_usersite,
      get_distribution,
-@@ -426,7 +427,7 @@ class InstallRequirement:
+@@ -433,7 +434,7 @@ class InstallRequirement:
-                         "lack sys.path precedence to {} in {}".format(
+                             existing_dist.project_name, existing_dist.location
-                             existing_dist.project_name, existing_dist.location)
+                         )
                      )
 -            else:
 +            elif dist_in_install_path(existing_dist):
@@ -45,18 +45,18 @@ index 4c58cdb..3570e17 100644
          else:
              if self.editable:
 diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
-index 4df8f7e..dda2292 100644
+index 09caaa6..c1542ec 100644
 --- a/src/pip/_internal/resolution/legacy/resolver.py
 +++ b/src/pip/_internal/resolution/legacy/resolver.py
-@@ -42,6 +42,7 @@ from pip._internal.resolution.base import BaseResolver, InstallRequirementProvid
+@@ -44,6 +44,7 @@ from pip._internal.resolution.base import BaseResolver, InstallRequirementProvid
  from pip._internal.utils.compatibility_tags import get_supported
  from pip._internal.utils.logging import indent_log
  from pip._internal.utils.misc import dist_in_usersite, normalize_version_info
 +from pip._internal.utils.misc import dist_in_install_path
- from pip._internal.utils.packaging import check_requires_python, get_requires_python
+ from pip._internal.utils.packaging import check_requires_python
  
  logger = logging.getLogger(__name__)
-@@ -194,7 +195,9 @@ class Resolver(BaseResolver):
+@@ -203,7 +204,9 @@ class Resolver(BaseResolver):
          """
          # Don't uninstall the conflict if doing a user install and the
          # conflict is not a user install.
@@ -68,7 +68,7 @@ index 4df8f7e..dda2292 100644
          req.satisfied_by = None
  
 diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
-index e7fd344..73b83fb 100644
+index 766dc26..c8c1cd8 100644
 --- a/src/pip/_internal/resolution/resolvelib/factory.py
 +++ b/src/pip/_internal/resolution/resolvelib/factory.py
 @@ -1,6 +1,7 @@
@@ -79,7 +79,7 @@ index e7fd344..73b83fb 100644
  from typing import (
      TYPE_CHECKING,
      Dict,
-@@ -34,6 +35,7 @@ from pip._internal.exceptions import (
+@@ -33,6 +34,7 @@ from pip._internal.exceptions import (
      UnsupportedWheel,
  )
  from pip._internal.index.package_finder import PackageFinder
@@ -87,15 +87,15 @@ index e7fd344..73b83fb 100644
  from pip._internal.metadata import BaseDistribution, get_default_environment
  from pip._internal.models.link import Link
  from pip._internal.models.wheel import Wheel
-@@ -46,6 +48,7 @@ from pip._internal.req.req_install import (
+@@ -45,6 +47,7 @@ from pip._internal.req.req_install import (
  from pip._internal.resolution.base import InstallRequirementProvider
  from pip._internal.utils.compatibility_tags import get_supported
  from pip._internal.utils.hashes import Hashes
 +from pip._internal.utils.misc import dist_location
+ from pip._internal.utils.packaging import get_requirement
  from pip._internal.utils.virtualenv import running_under_virtualenv
  
- from .base import Candidate, CandidateVersion, Constraint, Requirement
+@@ -526,6 +529,16 @@ class Factory:
-@@ -525,6 +528,16 @@ class Factory:
          if dist is None:  # Not installed, no uninstallation required.
              return None
  
@@ -113,18 +113,18 @@ index e7fd344..73b83fb 100644
          # be uninstalled, no matter it's in global or user site, because the
          # user site installation has precedence over global.
 diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
-index 99ebea3..5901687 100644
+index d3e9053..d25d1c3 100644
 --- a/src/pip/_internal/utils/misc.py
 +++ b/src/pip/_internal/utils/misc.py
-@@ -40,6 +40,7 @@ from pip._vendor.tenacity import retry, stop_after_delay, wait_fixed
+@@ -38,6 +38,7 @@ from pip._vendor.tenacity import retry, stop_after_delay, wait_fixed
  from pip import __version__
  from pip._internal.exceptions import CommandError
  from pip._internal.locations import get_major_minor_version, site_packages, user_site
 +from pip._internal.locations import get_scheme
- from pip._internal.utils.compat import WINDOWS, stdlib_pkgs
+ from pip._internal.utils.compat import WINDOWS
- from pip._internal.utils.virtualenv import (
+ from pip._internal.utils.egg_link import egg_link_path_from_location
-     running_under_virtualenv,
+ from pip._internal.utils.virtualenv import running_under_virtualenv
-@@ -382,6 +383,16 @@ def dist_in_site_packages(dist):
+@@ -354,6 +355,16 @@ def dist_in_site_packages(dist: Distribution) -> bool:
      return dist_location(dist).startswith(normalize_path(site_packages))
  
  
@@ -138,9 +138,9 @@ index 99ebea3..5901687 100644
 +        get_scheme("").purelib.split('python')[0]))
 +
 +
- def dist_is_editable(dist):
+ def get_distribution(req_name: str) -> Optional[Distribution]:
-     # type: (Distribution) -> bool
+     """Given a requirement name, return the installed Distribution object.
-     """
+ 
 -- 
 2.32.0
 

sources

@@ -1 +1 @@
-SHA512 (pip-21.2.3.tar.gz) = 9df888c871040d3812a2bf358013e3af976ede1e6aebf6747527be470674bb55ca1312d54021a7913630c04b09981cf481202c8405faf08b1b37e29272adf547
+SHA512 (pip-21.3.tar.gz) = 7106bfdf5ea651c6c69823e8033825378c0f212513c23361f7d4b158ecf4b54752b45ff15a313a2426d38c9e16dbe4f8c3fd39fc7dbda77db1ab791702ddd6f8