开源软件构建与测试

_service:extract_file:python-pip.spec Deleted

@@ -1,187 +0,0 @@
-%global srcname pip
-%global python_wheelname %{srcname}-%{version}-py3-none-any.whl
-%global python_wheeldir %{_datadir}/python-wheels
-%global _description \
-pip is the package installer for Python. You can use pip to install packages from the Python Package Index and other indexes.
-%global bashcompdir %(b=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null); echo ${b:-%{_sysconfdir}/bash_completion.d})
-Name:           python-%{srcname}
-Version:        21.3.1
-Release:        1
-Summary:        A tool for installing and managing Python packages
-License:        MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD)
-URL:            http://www.pip-installer.org
-Source0:        %{pypi_source} 
-BuildArch:      noarch
-Patch1:         allow-stripping-given-prefix-from-wheel-RECORD-files.patch
-Patch2:         emit-a-warning-when-running-with-root-privileges.patch
-Patch6000:      dummy-certifi.patch
-
-Source10: 	pip-allow-older-versions.patch
-
-%description %{_description}
-
-%package -n python%{python3_pkgversion}-%{srcname}
-Summary:        %{summary}
-BuildRequires:  python%{python3_pkgversion}-devel python%{python3_pkgversion}-setuptools bash-completion ca-certificates
-Requires:       python%{python3_pkgversion}-setuptools ca-certificates
-BuildRequires:  python%{python3_pkgversion}-wheel
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
-%description -n python%{python3_pkgversion}-%{srcname} %{_description}
-
-%package_help
-
-%package wheel
-Summary:        The pip wheel
-Requires:       ca-certificates
-
-%description wheel
-A Python wheel of pip to use with venv
-
-%prep
-%autosetup -n %{srcname}-%{version} -p1
-
-# this goes together with Patch6000
-rm src/pip/_vendor/certifi/*.pem
-sed -i '/\.pem$/d' src/pip.egg-info/SOURCES.txt
-
-%build
-%py3_build_wheel
-
-%install
-%{__python3} dist/%{python_wheelname}/pip install \
-    --root %{buildroot} \
-    --no-deps \
-    --no-cache-dir \
-    --no-index \
-    --ignore-installed \
-    --find-links dist \
-    'pip==%{version}'
-
-%if %{with doc}
-pushd docs/build/man
-install -d %{buildroot}%{_mandir}/man1
-for MAN in *1; do
-install -pm0644 $MAN %{buildroot}%{_mandir}/man1/$MAN
-for pip in "pip3" "pip-3" "pip%{python3_version}" "pip-%{python3_version}"; do
-echo ".so $MAN" > %{buildroot}%{_mandir}/man1/${MAN/pip/$pip}
-done
-done
-popd
-%endif
- 
-# before we ln -s anything, we apply Source10 patch to all pips:
-for PIP in %{buildroot}%{_bindir}/pip*; do
-  patch -p1 --no-backup-if-mismatch $PIP < %{SOURCE10}
-done
- 
-mkdir -p %{buildroot}%{bashcompdir}
-PYTHONPATH=%{buildroot}%{python3_sitelib} \
-    %{buildroot}%{_bindir}/pip completion --bash \
-    > %{buildroot}%{bashcompdir}/pip3
- 
-# Make bash completion apply to all the 5 symlinks we install
-sed -i -e "s/^\$complete.*\$ pip\$/\\1 pip pip{,-}{3,%{python3_version}}/" \
-    -e s/_pip_completion/_pip3_completion/ \
-    %{buildroot}%{bashcompdir}/pip3
-  
-# Provide symlinks to executables to comply with Fedora guidelines for Python
-ln -s ./pip%{python3_version} %{buildroot}%{_bindir}/pip-%{python3_version}
-ln -s ./pip-%{python3_version} %{buildroot}%{_bindir}/pip-3
- 
-# Make sure the INSTALLER is not pip and remove RECORD, otherwise Patch2 won't work
-# %%pyproject macros do this for all packages
-echo rpm > %{buildroot}%{python3_sitelib}/pip-%{version}.dist-info/INSTALLER
-rm %{buildroot}%{python3_sitelib}/pip-%{version}.dist-info/RECORD
- 
-mkdir -p %{buildroot}%{python_wheeldir}
-install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
-
-
-%files -n python%{python3_pkgversion}-%{srcname}
-%license LICENSE.txt
-%{_bindir}/pip
-%{_bindir}/pip3
-%{_bindir}/pip-3*
-%{_bindir}/pip%{python3_version}
-%{python3_sitelib}/pip*
-%dir %{bashcompdir}
-%{bashcompdir}/pip3*
-%dir %(dirname %{bashcompdir})
-
-%files help
-%doc README.rst
-
-%files wheel
-%license LICENSE.txt
-%dir %{python_wheeldir}/
-%{python_wheeldir}/%{python_wheelname}
-
-%changelog
-* Mon Dec 20 2021 renhongxun<renhongxun@huawei.com> - 21.3.1-1
-- upgrade version to 21.3.1
-
-* Fri Nov 26 2021 shixuantong<shixuantong@huawei.com> - 20.3.3-5
-- remove python3-pip from BuildRequires
-
-* Sat Aug 23 2021 shixuantong<shixuantong@huawei.com> - 20.3.3-4
-- delete bounded certificate
-
-* Thu Aug 19 2021 shixuantong<shixuantong@huawei.com> - 20.3.3-3
-- update dummy-certifi.patch
-
-* Sat Jul 24 2021 shixuantong<shixuantong@huawei.com> - 20.3.3-2
-- fix CVE-2021-3572
-
-* Tue Feb 02 2021 shixuantong<shixuantong@huawei.com> - 20.3.3-1
-- upgrade version to 20.3.3
-
-* Wed Nov 4 2020 wangjie<wangjie294@huawei.com> -20.2.2-3
-- Type:NA
-- ID:NA
-- SUG:NA
-- DESC:remove python2
-
-* Tue Sep 1 2020 wenzhanli<wenzhanli2@huawei.com> - 20.2.2-2
-- add pip-allow-older-versions.patch
-
-* Tue Aug 25 2020 wenzhanli<wenzhanli2@huawei.com> - 20.2.2-1
-- update to 20.2.2 and add python2 require
-
-* Tue Jul 28 2020 jinzhimin<jinzhimin2@huawei.com> - 20.1.1-1
-- update to 20.1.1
-
-* Thu Feb 20 2020 chengquan3<chengquan3@huawei.com> - 18.0-12
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC: Remove incorrect provision of python-wheel
-
-* Sat Nov 16 2019 huzhiyu <huzhiyu1@huawei.com> - 18.0-11
-- fix ca-certificate bad requires
-
-* Fri Oct 15 2019 lvying<lvying6@huawei.com> - 18.0-10
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: split same wheel file from python2-pip and python3-pip
-
-* Sun Sep 29 2019 yefei <yefei25@huawei.com> - 18.0-9
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:  Synchronize  patches
-
-* Sat Sep 28 2019 yefei <yefei25@huawei.com> - 18.0-8
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:  add bash completion and repair python2 interpreter path
-
-* Wed Sep 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 18.0-7
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:  Synchronize a patch
-
-* Mon Sep 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 18.0-6
-- Package init

_service:tar_scm:python-pip.spec Added

@@ -0,0 +1,196 @@
+%global srcname pip
+%global python_wheelname %{srcname}-%{version}-py3-none-any.whl
+%global python_wheeldir %{_datadir}/python-wheels
+%global _description \
+pip is the package installer for Python. You can use pip to install packages from the Python Package Index and other indexes.
+%global bashcompdir %(b=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null); echo ${b:-%{_sysconfdir}/bash_completion.d})
+Name:           python-%{srcname}
+Version:        21.3.1
+Release:        3
+Summary:        A tool for installing and managing Python packages
+License:        MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD)
+URL:            http://www.pip-installer.org
+Source0:        %{pypi_source} 
+BuildArch:      noarch
+Patch1:         allow-stripping-given-prefix-from-wheel-RECORD-files.patch
+Patch2:         emit-a-warning-when-running-with-root-privileges.patch
+Patch3:         remove-existing-dist-only-if-path-conflicts.patch
+Patch6000:      dummy-certifi.patch
+
+Source10: 	pip-allow-older-versions.patch
+
+%description %{_description}
+
+%package -n python%{python3_pkgversion}-%{srcname}
+Summary:        %{summary}
+BuildRequires:  python%{python3_pkgversion}-devel python%{python3_pkgversion}-setuptools bash-completion ca-certificates
+Requires:       python%{python3_pkgversion}-setuptools ca-certificates
+BuildRequires:  python%{python3_pkgversion}-wheel
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
+Provides:       python%{python3_pkgversion}dist(pip) = %{version}
+Provides:       python%{python3_version}dist(pip) = %{version}
+%description -n python%{python3_pkgversion}-%{srcname} %{_description}
+
+%package_help
+
+%package wheel
+Summary:        The pip wheel
+Requires:       ca-certificates
+
+%description wheel
+A Python wheel of pip to use with venv
+
+%prep
+%autosetup -n %{srcname}-%{version} -p1
+
+# this goes together with Patch6000
+rm src/pip/_vendor/certifi/*.pem
+sed -i '/\.pem$/d' src/pip.egg-info/SOURCES.txt
+
+%build
+%py3_build_wheel
+
+%install
+%{__python3} dist/%{python_wheelname}/pip install \
+    --root %{buildroot} \
+    --no-deps \
+    --no-cache-dir \
+    --no-index \
+    --ignore-installed \
+    --find-links dist \
+    'pip==%{version}'
+
+%if %{with doc}
+pushd docs/build/man
+install -d %{buildroot}%{_mandir}/man1
+for MAN in *1; do
+install -pm0644 $MAN %{buildroot}%{_mandir}/man1/$MAN
+for pip in "pip3" "pip-3" "pip%{python3_version}" "pip-%{python3_version}"; do
+echo ".so $MAN" > %{buildroot}%{_mandir}/man1/${MAN/pip/$pip}
+done
+done
+popd
+%endif
+ 
+# before we ln -s anything, we apply Source10 patch to all pips:
+for PIP in %{buildroot}%{_bindir}/pip*; do
+  patch -p1 --no-backup-if-mismatch $PIP < %{SOURCE10}
+done
+ 
+mkdir -p %{buildroot}%{bashcompdir}
+PYTHONPATH=%{buildroot}%{python3_sitelib} \
+    %{buildroot}%{_bindir}/pip completion --bash \
+    > %{buildroot}%{bashcompdir}/pip3
+ 
+# Make bash completion apply to all the 5 symlinks we install
+sed -i -e "s/^\$complete.*\$ pip\$/\\1 pip pip{,-}{3,%{python3_version}}/" \
+    -e s/_pip_completion/_pip3_completion/ \
+    %{buildroot}%{bashcompdir}/pip3
+  
+# Provide symlinks to executables to comply with Fedora guidelines for Python
+ln -s ./pip%{python3_version} %{buildroot}%{_bindir}/pip-%{python3_version}
+ln -s ./pip-%{python3_version} %{buildroot}%{_bindir}/pip-3
+ 
+# Make sure the INSTALLER is not pip and remove RECORD, otherwise Patch2 won't work
+# %%pyproject macros do this for all packages
+echo rpm > %{buildroot}%{python3_sitelib}/pip-%{version}.dist-info/INSTALLER
+rm %{buildroot}%{python3_sitelib}/pip-%{version}.dist-info/RECORD
+ 
+mkdir -p %{buildroot}%{python_wheeldir}
+install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
+
+
+%files -n python%{python3_pkgversion}-%{srcname}
+%license LICENSE.txt
+%{_bindir}/pip
+%{_bindir}/pip3
+%{_bindir}/pip-3*
+%{_bindir}/pip%{python3_version}
+%{python3_sitelib}/pip*
+%dir %{bashcompdir}
+%{bashcompdir}/pip3*
+%dir %(dirname %{bashcompdir})
+
+%files help
+%doc README.rst
+
+%files wheel
+%license LICENSE.txt
+%dir %{python_wheeldir}/
+%{python_wheeldir}/%{python_wheelname}
+
+%changelog
+* Wed Aug 03 2022 renhongxun <renhongxun@h-partners.com> - 21.3.1-3
+- provides python3.10dist(pip) and python3dist(pip)
+
+* Fri Jul 01 2022 dongyuzhen <dongyuzhen@h-partners.com> - 21.3.1-2
+- Add patches that are deleted during the upgrade
+
+* Mon Dec 20 2021 renhongxun<renhongxun@huawei.com> - 21.3.1-1
+- upgrade version to 21.3.1
+
+* Fri Nov 26 2021 shixuantong<shixuantong@huawei.com> - 20.3.3-5
+- remove python3-pip from BuildRequires
+
+* Mon Aug 23 2021 shixuantong<shixuantong@huawei.com> - 20.3.3-4
+- delete bounded certificate
+
+* Thu Aug 19 2021 shixuantong<shixuantong@huawei.com> - 20.3.3-3
+- update dummy-certifi.patch
+
+* Sat Jul 24 2021 shixuantong<shixuantong@huawei.com> - 20.3.3-2
+- fix CVE-2021-3572
+
+* Tue Feb 02 2021 shixuantong<shixuantong@huawei.com> - 20.3.3-1
+- upgrade version to 20.3.3
+
+* Wed Nov 4 2020 wangjie<wangjie294@huawei.com> -20.2.2-3
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC:remove python2
+
+* Tue Sep 1 2020 wenzhanli<wenzhanli2@huawei.com> - 20.2.2-2
+- add pip-allow-older-versions.patch
+
+* Tue Aug 25 2020 wenzhanli<wenzhanli2@huawei.com> - 20.2.2-1
+- update to 20.2.2 and add python2 require
+
+* Tue Jul 28 2020 jinzhimin<jinzhimin2@huawei.com> - 20.1.1-1
+- update to 20.1.1
+
+* Thu Feb 20 2020 chengquan3<chengquan3@huawei.com> - 18.0-12
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: Remove incorrect provision of python-wheel
+
+* Sat Nov 16 2019 huzhiyu <huzhiyu1@huawei.com> - 18.0-11
+- fix ca-certificate bad requires
+
+* Fri Oct 15 2019 lvying<lvying6@huawei.com> - 18.0-10
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC: split same wheel file from python2-pip and python3-pip
+
+* Sun Sep 29 2019 yefei <yefei25@huawei.com> - 18.0-9
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:  Synchronize  patches
+
+* Sat Sep 28 2019 yefei <yefei25@huawei.com> - 18.0-8
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:  add bash completion and repair python2 interpreter path
+
+* Wed Sep 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 18.0-7
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:  Synchronize a patch
+
+* Mon Sep 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 18.0-6
+- Package init

_service:extract_file:allow-stripping-given-prefix-from-wheel-RECORD-files.patch Deleted

@@ -1,31 +0,0 @@
-From e2126b5d4efdbddb15a3c354110055f40d78f4cc Mon Sep 17 00:00:00 2001
-From: wwx930846 <wuchaochao4@huawei.com>
-Date: Mon, 24 Aug 2020 22:01:50 +0800
-Subject: PATCH allow-stripping-given-prefix-from-wheel-RECORD-files
-
----
- src/pip/_internal/commands/install.py | 8 ++++++++
- src/pip/_internal/req/req_install.py  | 4 +++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
-index 8c2c32f..674d30c 100644
---- a/src/pip/_internal/commands/install.py
-+++ b/src/pip/_internal/commands/install.py
-@@ -134,6 +134,13 @@ class InstallCommand(RequirementCommand):
-                 "folders are placed"
-             ),
-         )
-+        self.cmd_opts.add_option(
-+            '--strip-file-prefix',
-+            dest='strip_file_prefix',
-+            metavar='prefix',
-+            default=None,
-+            help="Strip given prefix from script paths in wheel RECORD."
-+        )
- 
-         self.cmd_opts.add_option(cmdoptions.src())
- 
---
-2.23.0
-

_service:extract_file:dummy-certifi.patch Deleted

@@ -1,35 +0,0 @@
-From 09bf87d33141a5c06a1d410839d162262baa16c4 Mon Sep 17 00:00:00 2001
-From: Tomas Hrnciar <thrnciar@redhat.com>
-Date: Sun, 26 Apr 2020 21:38:44 +0200
-Subject: PATCH Dummy certifi patch
-
----
- src/pip/_vendor/certifi/core.py | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py
-index 8987449..568d078 100644
---- a/src/pip/_vendor/certifi/core.py
-+++ b/src/pip/_vendor/certifi/core.py
-@@ -23,6 +23,7 @@ try:
-             return _PIP_STANDALONE_CERT
-         raise _PipPatchedCertificate()
- 
-+    raise ImportError # force fallback
-     from importlib.resources import path as get_path, read_text
- 
-     _CACERT_CTX = None
-@@ -67,9 +68,7 @@ except ImportError:
-     # If we don't have importlib.resources, then we will just do the old logic
-     # of assuming we're on the filesystem and munge the path directly.
-     def where():
--        f = os.path.dirname(__file__)
--
--        return os.path.join(f, "cacert.pem")
-+        return '/etc/pki/tls/certs/ca-bundle.crt'
- 
- 
- def contents():
--- 
-1.8.3.1
-

_service:extract_file:emit-a-warning-when-running-with-root-privileges.patch Deleted

@@ -1,51 +0,0 @@
-From 74bb5d26e232493de43adfa1f4b42b66fd701294 Mon Sep 17 00:00:00 2001
-From: Tomas Hrnciar <thrnciar@redhat.com>
-Date: Sun, 26 Apr 2020 13:52:24 +0200
-Subject: PATCH Downstream only patch
-
-Emit a warning to the user if pip install is run with root privileges
-Issue upstream: https://github.com/pypa/pip/issues/4288
----
- src/pip/_internal/commands/install.py | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
-index 70bda2e2..1e750ae1 100644
---- a/src/pip/_internal/commands/install.py
-+++ b/src/pip/_internal/commands/install.py
-@@ -13,6 +13,8 @@ import operator
- import os
- import shutil
- import site
-+import sys
-+from os import path
- from optparse import SUPPRESS_HELP, Values
- from typing import Iterable, List, Optional
- 
-@@ -241,6 +243,23 @@ class InstallCommand(RequirementCommand):
-             raise CommandError("Can not combine '--user' and '--target'")
- 
-         cmdoptions.check_install_build_global(options)
-+
-+        def is_venv():
-+            return (hasattr(sys, 'real_prefix') or
-+                    (hasattr(sys, 'base_prefix') and
-+                     sys.base_prefix != sys.prefix))
-+
-+        # Check whether we have root privileges and aren't in venv/virtualenv
-+        if os.getuid() == 0 and not is_venv() and not options.root_path:
-+            command = path.basename(sys.argv0)
-+            if command == "__main__.py":
-+                command = path.basename(sys.executable) + " -m pip"
-+            logger.warning(
-+                "Running pip install with root privileges is "
-+                "generally not a good idea. Try `%s install --user` instead."
-+                % command
-+            )
-+
-         upgrade_strategy = "to-satisfy-only"
-         if options.upgrade:
-             upgrade_strategy = options.upgrade_strategy
--- 
-2.23.0
-

_service:extract_file:pip-allow-older-versions.patch Deleted

_service:tar_scm:allow-stripping-given-prefix-from-wheel-RECORD-files.patch Added

@@ -0,0 +1,31 @@
+From e2126b5d4efdbddb15a3c354110055f40d78f4cc Mon Sep 17 00:00:00 2001
+From: wwx930846 <wuchaochao4@huawei.com>
+Date: Mon, 24 Aug 2020 22:01:50 +0800
+Subject: PATCH allow-stripping-given-prefix-from-wheel-RECORD-files
+
+---
+ src/pip/_internal/commands/install.py | 8 ++++++++
+ src/pip/_internal/req/req_install.py  | 4 +++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
+index 8c2c32f..674d30c 100644
+--- a/src/pip/_internal/commands/install.py
++++ b/src/pip/_internal/commands/install.py
+@@ -134,6 +134,13 @@ class InstallCommand(RequirementCommand):
+                 "folders are placed"
+             ),
+         )
++        self.cmd_opts.add_option(
++            '--strip-file-prefix',
++            dest='strip_file_prefix',
++            metavar='prefix',
++            default=None,
++            help="Strip given prefix from script paths in wheel RECORD."
++        )
+ 
+         self.cmd_opts.add_option(cmdoptions.src())
+ 
+--
+2.23.0
+

_service:tar_scm:dummy-certifi.patch Added

@@ -0,0 +1,35 @@
+From 09bf87d33141a5c06a1d410839d162262baa16c4 Mon Sep 17 00:00:00 2001
+From: Tomas Hrnciar <thrnciar@redhat.com>
+Date: Sun, 26 Apr 2020 21:38:44 +0200
+Subject: PATCH Dummy certifi patch
+
+---
+ src/pip/_vendor/certifi/core.py | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py
+index 8987449..568d078 100644
+--- a/src/pip/_vendor/certifi/core.py
++++ b/src/pip/_vendor/certifi/core.py
+@@ -23,6 +23,7 @@ try:
+             return _PIP_STANDALONE_CERT
+         raise _PipPatchedCertificate()
+ 
++    raise ImportError # force fallback
+     from importlib.resources import path as get_path, read_text
+ 
+     _CACERT_CTX = None
+@@ -67,9 +68,7 @@ except ImportError:
+     # If we don't have importlib.resources, then we will just do the old logic
+     # of assuming we're on the filesystem and munge the path directly.
+     def where():
+-        f = os.path.dirname(__file__)
+-
+-        return os.path.join(f, "cacert.pem")
++        return '/etc/pki/tls/certs/ca-bundle.crt'
+ 
+ 
+ def contents():
+-- 
+1.8.3.1
+

_service:tar_scm:emit-a-warning-when-running-with-root-privileges.patch Added

@@ -0,0 +1,51 @@
+From 74bb5d26e232493de43adfa1f4b42b66fd701294 Mon Sep 17 00:00:00 2001
+From: Tomas Hrnciar <thrnciar@redhat.com>
+Date: Sun, 26 Apr 2020 13:52:24 +0200
+Subject: PATCH Downstream only patch
+
+Emit a warning to the user if pip install is run with root privileges
+Issue upstream: https://github.com/pypa/pip/issues/4288
+---
+ src/pip/_internal/commands/install.py | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
+index 70bda2e2..1e750ae1 100644
+--- a/src/pip/_internal/commands/install.py
++++ b/src/pip/_internal/commands/install.py
+@@ -13,6 +13,8 @@ import operator
+ import os
+ import shutil
+ import site
++import sys
++from os import path
+ from optparse import SUPPRESS_HELP, Values
+ from typing import Iterable, List, Optional
+ 
+@@ -241,6 +243,23 @@ class InstallCommand(RequirementCommand):
+             raise CommandError("Can not combine '--user' and '--target'")
+ 
+         cmdoptions.check_install_build_global(options)
++
++        def is_venv():
++            return (hasattr(sys, 'real_prefix') or
++                    (hasattr(sys, 'base_prefix') and
++                     sys.base_prefix != sys.prefix))
++
++        # Check whether we have root privileges and aren't in venv/virtualenv
++        if os.getuid() == 0 and not is_venv() and not options.root_path:
++            command = path.basename(sys.argv0)
++            if command == "__main__.py":
++                command = path.basename(sys.executable) + " -m pip"
++            logger.warning(
++                "Running pip install with root privileges is "
++                "generally not a good idea. Try `%s install --user` instead."
++                % command
++            )
++
+         upgrade_strategy = "to-satisfy-only"
+         if options.upgrade:
+             upgrade_strategy = options.upgrade_strategy
+-- 
+2.23.0
+

_service:tar_scm:pip-allow-older-versions.patch Added

_service:tar_scm:remove-existing-dist-only-if-path-conflicts.patch Added

@@ -0,0 +1,147 @@
+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
+ /usr/lib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+when pip install --upgrade is executed.
+
+Resolves: rhbz#1550368
+
+Co-Authored-By: Michal Cyprian <m.cyprian@gmail.com>
+Co-Authored-By: Victor Stinner <vstinner@redhat.com>
+Co-Authored-By: Petr Viktorin <pviktori@redhat.com>
+Co-Authored-By: Lumir Balhar <lbalhar@redhat.com>
+Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
+---
+ src/pip/_internal/req/req_install.py               |  3 ++-
+ src/pip/_internal/resolution/legacy/resolver.py    |  5 ++++-
+ src/pip/_internal/resolution/resolvelib/factory.py | 13 +++++++++++++
+ src/pip/_internal/utils/misc.py                    | 11 +++++++++++
+ 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 ff0dd2f..a72aec8 100644
+--- a/src/pip/_internal/req/req_install.py
++++ b/src/pip/_internal/req/req_install.py
+@@ -46,6 +46,7 @@ from pip._internal.utils.misc import (
+     ask_path_exists,
+     backup_dir,
+     display_path,
++    dist_in_install_path,
+     dist_in_site_packages,
+     dist_in_usersite,
+     get_distribution,
+@@ -433,7 +434,7 @@ class InstallRequirement:
+                             existing_dist.project_name, existing_dist.location
+                         )
+                     )
+-            else:
++            elif dist_in_install_path(existing_dist):
+                 self.should_reinstall = True
+         else:
+             if self.editable:
+diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
+index 09caaa6..c1542ec 100644
+--- a/src/pip/_internal/resolution/legacy/resolver.py
++++ b/src/pip/_internal/resolution/legacy/resolver.py
+@@ -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
+ 
+ logger = logging.getLogger(__name__)
+@@ -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.
+-        if not self.use_user_site or dist_in_usersite(req.satisfied_by):
++        if ((not self.use_user_site
++                or dist_in_usersite(req.satisfied_by))
++                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 766dc26..c8c1cd8 100644
+--- a/src/pip/_internal/resolution/resolvelib/factory.py
++++ b/src/pip/_internal/resolution/resolvelib/factory.py
+@@ -1,6 +1,8 @@
+ import contextlib
+ import functools
+ import logging
++import sys
++import sysconfig
+ from typing import (
+     TYPE_CHECKING,
+     Dict,
+@@ -33,6 +34,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
+@@ -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
+ 
+@@ -526,6 +529,16 @@ class Factory:
+         if dist is None:  # Not installed, no uninstallation required.
+             return None
+ 
++        # Prevent uninstalling packages from /usr
++        try:
++            if dist_location(dist._dist) in (
++                    sysconfig.get_path('purelib', scheme='rpm_prefix', vars={'base': sys.base_prefix}),
++                    sysconfig.get_path('platlib', scheme='rpm_prefix', vars={'base': sys.base_prefix}),
++                ):
++                return None
++        except KeyError:  # this Python doesn't have 'rpm_prefix' scheme yet
++            pass
++
+         # We're installing into global site. The current installation must
+         # 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 d3e9053..d25d1c3 100644
+--- a/src/pip/_internal/utils/misc.py
++++ b/src/pip/_internal/utils/misc.py
+@@ -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
+ from pip._internal.utils.egg_link import egg_link_path_from_location
+ from pip._internal.utils.virtualenv import running_under_virtualenv
+@@ -354,6 +355,16 @@ def dist_in_site_packages(dist: Distribution) -> bool:
+     return dist_location(dist).startswith(normalize_path(site_packages))
+ 
+ 
++def dist_in_install_path(dist):
++    """
++    Return True if given Distribution is installed in
++    path matching distutils_scheme layout.
++    """
++    norm_path = normalize_path(dist_location(dist))
++    return norm_path.startswith(normalize_path(
++        get_scheme("").purelib.split('python')0))
++
++
+ def get_distribution(req_name: str) -> OptionalDistribution:
+     """Given a requirement name, return the installed Distribution object.
+ 
+-- 
+2.32.0
+

_service Changed

_service:extract_file:pip-21.3.1.tar.gz Deleted

_service:extract_file:python-pip.yaml Deleted

_service:tar_scm:pip-21.3.1.tar.gz Added

_service:tar_scm:python-pip-1640417502.70dc030.tar Deleted

_service:tar_scm:python-pip.yaml Added

Changes of Revision 3