Update to 21.2.3

The bundled toml was replaced by tomli, same license (MIT).

Related: rhbz#1932713

no-version-warning.patch

@@ -1,7 +1,8 @@
-diff -rU3 pip-20.3-orig/src/pip/_vendor/packaging/version.py pip-20.3/src/pip/_vendor/packaging/version.py
---- pip-20.3-orig/src/pip/_vendor/packaging/version.py	2020-11-30 12:58:32.000000000 +0100
-+++ pip-20.3/src/pip/_vendor/packaging/version.py	2020-12-16 21:25:15.818221608 +0100
-@@ -124,11 +124,6 @@
+diff --git a/src/pip/_vendor/packaging/version.py b/src/pip/_vendor/packaging/version.py
+index de9a09a..154e94d 100644
+--- a/src/pip/_vendor/packaging/version.py
++++ b/src/pip/_vendor/packaging/version.py
+@@ -108,11 +108,6 @@ class LegacyVersion(_BaseVersion):
          self._version = str(version)
          self._key = _legacy_cmpkey(self._version)
  
@@ -11,5 +12,5 @@ diff -rU3 pip-20.3-orig/src/pip/_vendor/packaging/version.py pip-20.3/src/pip/_v
 -            DeprecationWarning,
 -        )
  
-     def __str__(self):
-         # type: () -> str
+     def __str__(self) -> str:
+         return self._version

nowarn-pip._internal.main.patch

@@ -1,4 +1,4 @@
-From 8519679166122b7482a70f6c10d303520e5f83c9 Mon Sep 17 00:00:00 2001
+From 619782ad2d181fe2933ddf4edc7127fdc13dd0df Mon Sep 17 00:00:00 2001
 From: Karolina Surma <ksurma@redhat.com>
 Date: Mon, 10 May 2021 16:48:49 +0200
 Subject: [PATCH] Don't warn the user about pip._internal.main() entrypoint
@@ -14,29 +14,29 @@ Co-Authored-By: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
  3 files changed, 13 insertions(+), 11 deletions(-)
 
 diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py
-index 41071cd..c7b4e65 100755
+index 6afb5c6..faf25af 100755
 --- a/src/pip/_internal/__init__.py
 +++ b/src/pip/_internal/__init__.py
-@@ -12,4 +12,4 @@ def main(args=None):
+@@ -16,4 +16,4 @@ def main(args: (Optional[List[str]]) = None) -> int:
      """
      from pip._internal.utils.entrypoints import _wrapper
-
+ 
 -    return _wrapper(args)
 +    return _wrapper(args, _nowarn=True)
 diff --git a/src/pip/_internal/utils/entrypoints.py b/src/pip/_internal/utils/entrypoints.py
-index 879bf21..584e8b5 100644
+index 1504a12..07d941b 100644
 --- a/src/pip/_internal/utils/entrypoints.py
 +++ b/src/pip/_internal/utils/entrypoints.py
 @@ -4,7 +4,7 @@ from typing import List, Optional
  from pip._internal.cli.main import main
-
-
--def _wrapper(args=None):
-+def _wrapper(args=None, _nowarn=False):
-     # type: (Optional[List[str]]) -> int
+ 
+ 
+-def _wrapper(args: Optional[List[str]] = None) -> int:
++def _wrapper(args: Optional[List[str]] = None, _nowarn: bool = False) -> int:
      """Central wrapper for all old entrypoints.
-
-@@ -17,12 +17,13 @@ def _wrapper(args=None):
+ 
+     Historically pip has had several entrypoints defined. Because of issues
+@@ -16,12 +16,13 @@ def _wrapper(args: Optional[List[str]] = None) -> int:
      directing them to an appropriate place for help, we now define all of
      our old entrypoints as wrappers for the current one.
      """
@@ -69,6 +69,6 @@ index e416315..7f57f67 100644
 -    assert "old script wrapper" in result2.stderr
 +    if entrypoint[0] != "fake_pip = pip._internal:main":
 +        assert "old script wrapper" in result2.stderr
---
-2.30.2
+-- 
+2.32.0
 

python-pip.spec

@@ -13,7 +13,7 @@
 %endif
 
 %global srcname pip
-%global base_version 21.1.3
+%global base_version 21.2.3
 %global upstream_version %{base_version}%{?prerel}
 %global python_wheelname %{srcname}-%{upstream_version}-py3-none-any.whl
 %global python_wheeldir %{_datadir}/python-wheels
@@ -48,7 +48,7 @@ Summary:        A tool for installing and managing Python packages
 # setuptools: MIT
 # six: MIT
 # tenacity: ASL 2.0
-# toml: MIT
+# tomli: MIT
 # urllib3: MIT
 # webencodings: BSD
 
@@ -123,25 +123,25 @@ Packages" or "Pip Installs Python".
 %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)) = 2020.12.5
+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.1
+Provides: bundled(python%{1}dist(distlib)) = 0.3.2
 Provides: bundled(python%{1}dist(distro)) = 1.5
 Provides: bundled(python%{1}dist(html5lib)) = 1.1
-Provides: bundled(python%{1}dist(idna)) = 3.1
+Provides: bundled(python%{1}dist(idna)) = 3.2
 Provides: bundled(python%{1}dist(msgpack)) = 1.0.2
-Provides: bundled(python%{1}dist(packaging)) = 20.9
-Provides: bundled(python%{1}dist(pep517)) = 0.10
+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(pyparsing)) = 2.4.7
-Provides: bundled(python%{1}dist(requests)) = 2.25.1
-Provides: bundled(python%{1}dist(resolvelib)) = 0.7
+Provides: bundled(python%{1}dist(requests)) = 2.26
+Provides: bundled(python%{1}dist(resolvelib)) = 0.7.1
 Provides: bundled(python%{1}dist(setuptools)) = 44
-Provides: bundled(python%{1}dist(six)) = 1.15
-Provides: bundled(python%{1}dist(tenacity)) = 7
-Provides: bundled(python%{1}dist(toml)) = 0.10.2
-Provides: bundled(python%{1}dist(urllib3)) = 1.26.4
+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(webencodings)) = 0.5.1
 }
 
@@ -393,6 +393,10 @@ pytest_k='not completion and
 %{python_wheeldir}/%{python_wheelname}
 
 %changelog
+* Mon Sep 13 2021 Miro Hrončok <mhroncok@redhat.com> - 21.2.3-1
+- Update to 21.2.3
+- Resolves: rhbz#1985635
+
 * Mon Sep 13 2021 Lumír Balhar <lbalhar@redhat.com> - 21.1.3-1
 - Update to 21.1.3
 Resolves: rhbz#1976449

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

@@ -1,4 +1,4 @@
-From d8df1b9010bc69bfdb606cb51aa3a8a5c6ae6d4c Mon Sep 17 00:00:00 2001
+From a722cbefa5e1a4bf5357f13852fa927a46fcd624 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
@@ -20,7 +20,7 @@ Co-Authored-By: Lumir Balhar <lbalhar@redhat.com>
  4 files changed, 27 insertions(+), 2 deletions(-)
 
 diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
-index 55c17ac..9f6ba44 100644
+index 4c58cdb..3570e17 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 (
@@ -31,7 +31,7 @@ index 55c17ac..9f6ba44 100644
      dist_in_site_packages,
      dist_in_usersite,
      get_distribution,
-@@ -440,7 +441,7 @@ class InstallRequirement:
+@@ -426,7 +427,7 @@ class InstallRequirement:
                          "lack sys.path precedence to {} in {}".format(
                              existing_dist.project_name, existing_dist.location)
                      )
@@ -41,7 +41,7 @@ index 55c17ac..9f6ba44 100644
          else:
              if self.editable:
 diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
-index 17de7f0..3dd872d 100644
+index 4df8f7e..dda2292 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
@@ -50,9 +50,9 @@ index 17de7f0..3dd872d 100644
  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
-
+ 
  logger = logging.getLogger(__name__)
-@@ -199,7 +200,9 @@ class Resolver(BaseResolver):
+@@ -194,7 +195,9 @@ class Resolver(BaseResolver):
          """
          # Don't uninstall the conflict if doing a user install and the
          # conflict is not a user install.
@@ -62,9 +62,9 @@ index 17de7f0..3dd872d 100644
 +                and dist_in_install_path(req.satisfied_by)):
              req.should_reinstall = True
          req.satisfied_by = None
-
+ 
 diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
-index 6e3f195..bf07c1b 100644
+index e7fd344..e36f025 100644
 --- a/src/pip/_internal/resolution/resolvelib/factory.py
 +++ b/src/pip/_internal/resolution/resolvelib/factory.py
 @@ -1,6 +1,7 @@
@@ -75,20 +75,26 @@ index 6e3f195..bf07c1b 100644
  from typing import (
      TYPE_CHECKING,
      Dict,
-@@ -46,7 +47,9 @@ from pip._internal.utils.misc import (
-     dist_in_site_packages,
-     dist_in_usersite,
-     get_installed_distributions,
-+    dist_location,
+@@ -34,6 +35,7 @@ from pip._internal.exceptions import (
+     UnsupportedWheel,
  )
+ from pip._internal.index.package_finder import PackageFinder
 +from pip._internal.locations import get_scheme
+ 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 (
+ 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.virtualenv import running_under_virtualenv
-
+ 
  from .base import Candidate, CandidateVersion, Constraint, Requirement
-@@ -479,6 +482,13 @@ class Factory:
+@@ -525,6 +528,13 @@ class Factory:
          if dist is None:  # Not installed, no uninstallation required.
              return None
-
+ 
 +        # Prevent uninstalling packages from /usr
 +        if dist_location(dist) in (
 +                get_scheme('', prefix=sys.base_prefix).purelib,
@@ -100,7 +106,7 @@ index 6e3f195..bf07c1b 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 26037db..11b918d 100644
+index 99ebea3..5901687 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
@@ -111,10 +117,10 @@ index 26037db..11b918d 100644
  from pip._internal.utils.compat import WINDOWS, stdlib_pkgs
  from pip._internal.utils.virtualenv import (
      running_under_virtualenv,
-@@ -379,6 +380,16 @@ def dist_in_site_packages(dist):
+@@ -382,6 +383,16 @@ def dist_in_site_packages(dist):
      return dist_location(dist).startswith(normalize_path(site_packages))
-
-
+ 
+ 
 +def dist_in_install_path(dist):
 +    """
 +    Return True if given Distribution is installed in
@@ -128,6 +134,6 @@ index 26037db..11b918d 100644
  def dist_is_editable(dist):
      # type: (Distribution) -> bool
      """
---
-2.30.2
+-- 
+2.32.0
 

sources

@@ -1 +1 @@
-SHA512 (pip-21.1.3.tar.gz) = 21bdc78f24751981ae49c9fda0430fc92b8d33eb7a546bc344e8cea4aa85dcd42191ef8eb3fdfb4f3d1cb5921698f819d73e6e190d8745cf7ddfa52732d95999
+SHA512 (pip-21.2.3.tar.gz) = 9df888c871040d3812a2bf358013e3af976ede1e6aebf6747527be470674bb55ca1312d54021a7913630c04b09981cf481202c8405faf08b1b37e29272adf547