Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/python-pip.git#e8f355153384f41e2f5ff11081ab93b08625b825

python-pip.spec

@@ -13,7 +13,7 @@
 %endif
 
 %global srcname pip
-%global base_version 21.0
+%global base_version 21.0.1
 %global upstream_version %{base_version}%{?prerel}
 %global python_wheelname %{srcname}-%{upstream_version}-py3-none-any.whl
 %global python_wheeldir %{_datadir}/python-wheels
@@ -139,7 +139,7 @@ Provides: bundled(python%{1}dist(distro)) = 1.5
 Provides: bundled(python%{1}dist(html5lib)) = 1.1
 Provides: bundled(python%{1}dist(idna)) = 2.10
 Provides: bundled(python%{1}dist(msgpack)) = 1.0.2
-Provides: bundled(python%{1}dist(packaging)) = 20.8
+Provides: bundled(python%{1}dist(packaging)) = 20.9
 Provides: bundled(python%{1}dist(pep517)) = 0.9.1
 Provides: bundled(python%{1}dist(progress)) = 1.5
 Provides: bundled(python%{1}dist(pyparsing)) = 2.4.7
@@ -398,6 +398,10 @@ pytest_k='not completion and
 %{python_wheeldir}/%{python_wheelname}
 
 %changelog
+* Wed Feb 17 2021 Lumír Balhar <lbalhar@redhat.com> - 21.0.1-1
+- Update to 21.0.1
+Resolves: rhbz#1922592
+
 * Tue Jan 26 2021 Lumír Balhar <lbalhar@redhat.com> - 21.0-1
 - Update to 21.0 (#1919530)
 

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

@@ -1,7 +1,7 @@
-From 0c41df7c4161de2453d5161382a3bbfc7178bec6 Mon Sep 17 00:00:00 2001
+From f83eacf40f1506418e74d747906b8f108401f91d Mon Sep 17 00:00:00 2001
 From: Lumir Balhar <lbalhar@redhat.com>
 Date: Tue, 26 Jan 2021 09:05:07 +0100
-Subject: [PATCH] Prevent removing of the system packages installed under 
+Subject: [PATCH] Prevent removing of the system packages installed under
  /usr/lib
 
 when pip install -U is executed.
@@ -63,16 +63,17 @@ index 665dba1..a219e63 100644
          req.satisfied_by = None
  
 diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
-index bfaa052..68915aa 100644
+index be0729e..bc2912b 100644
 --- a/src/pip/_internal/resolution/resolvelib/factory.py
 +++ b/src/pip/_internal/resolution/resolvelib/factory.py
-@@ -1,4 +1,5 @@
+@@ -1,5 +1,6 @@
+ import functools
  import logging
 +import sys
  
  from pip._vendor.packaging.utils import canonicalize_name
  
-@@ -18,7 +19,9 @@ from pip._internal.utils.misc import (
+@@ -19,7 +20,9 @@ from pip._internal.utils.misc import (
      dist_in_site_packages,
      dist_in_usersite,
      get_installed_distributions,
@@ -82,7 +83,7 @@ index bfaa052..68915aa 100644
  from pip._internal.utils.typing import MYPY_CHECK_RUNNING
  from pip._internal.utils.virtualenv import running_under_virtualenv
  
-@@ -365,6 +368,13 @@ class Factory:
+@@ -362,6 +365,13 @@ class Factory:
          if dist is None:  # Not installed, no uninstallation required.
              return None
  

sources

@@ -1 +1 @@
-SHA512 (pip-21.0.tar.gz) = ac77a7204423f1fdc3a4d328dab1860258efccde0123cff3217f357637c4ce3d85772ab81a230122ff813be2cfa40f2862e5d499390289efe1dcde3a31a42264
+SHA512 (pip-21.0.1.tar.gz) = 2db5397f4ca3a3f56f5add3f827bf1f0a4296019703438d68498266b9d2559b6baa3132061c5ad4c2a08bec6e76a2768763fdca02d86cf32aadd4640afbf3664