diff --git a/allow-stripping-given-prefix-from-wheel-RECORD-files.patch b/allow-stripping-given-prefix-from-wheel-RECORD-files.patch deleted file mode 100644 index 00de3c5d75ccccdb4acd49488c9412f51cbcf198..0000000000000000000000000000000000000000 --- a/allow-stripping-given-prefix-from-wheel-RECORD-files.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -ru pip-18.0/src/pip/_internal/commands/install.py pip-18.0_patched/src/pip/_internal/commands/install.py ---- pip-18.0/src/pip/_internal/commands/install.py 2018-07-20 06:10:48.000000000 +0200 -+++ pip-18.0_patched/src/pip/_internal/commands/install.py 2018-07-23 16:49:39.085357813 +0200 -@@ -110,6 +110,14 @@ - default=None, - help="Installation prefix where lib, bin and other top-level " - "folders are placed") -+ 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." -+ ) -+ - - cmd_opts.add_option(cmdoptions.build_dir()) - -@@ -345,6 +353,7 @@ - pycompile=options.compile, - warn_script_location=warn_script_location, - use_user_site=options.use_user_site, -+ strip_file_prefix=options.strip_file_prefix, - ) - - lib_locations = get_lib_location_guesses( -diff -ru pip-18.0/src/pip/_internal/req/req_install.py pip-18.0_patched/src/pip/_internal/req/req_install.py ---- pip-18.0/src/pip/_internal/req/req_install.py 2018-07-22 07:14:20.000000000 +0200 -+++ pip-18.0_patched/src/pip/_internal/req/req_install.py 2018-07-23 16:51:51.115943214 +0200 -@@ -514,7 +514,7 @@ - - def move_wheel_files(self, wheeldir, root=None, home=None, prefix=None, - warn_script_location=True, use_user_site=False, -- pycompile=True): -+ pycompile=True, strip_file_prefix=None): - move_wheel_files( - self.name, self.req, wheeldir, - user=use_user_site, -@@ -524,6 +524,7 @@ - pycompile=pycompile, - isolated=self.isolated, - warn_script_location=warn_script_location, -+ strip_file_prefix=strip_file_prefix, - ) - - # Things valid for sdists -@@ -924,7 +925,7 @@ - - def install(self, install_options, global_options=None, root=None, - home=None, prefix=None, warn_script_location=True, -- use_user_site=False, pycompile=True): -+ use_user_site=False, pycompile=True, strip_file_prefix=None): - global_options = global_options if global_options is not None else [] - if self.editable: - self.install_editable( -@@ -939,6 +940,7 @@ - self.source_dir, root=root, prefix=prefix, home=home, - warn_script_location=warn_script_location, - use_user_site=use_user_site, pycompile=pycompile, -+ strip_file_prefix=strip_file_prefix, - ) - self.install_succeeded = True - return -diff -ru pip-18.0/src/pip/_internal/wheel.py pip-18.0_patched/src/pip/_internal/wheel.py ---- pip-18.0/src/pip/_internal/wheel.py 2018-07-17 10:26:00.000000000 +0200 -+++ pip-18.0_patched/src/pip/_internal/wheel.py 2018-07-23 16:52:57.749238655 +0200 -@@ -206,7 +206,7 @@ - - def move_wheel_files(name, req, wheeldir, user=False, home=None, root=None, - pycompile=True, scheme=None, isolated=False, prefix=None, -- warn_script_location=True): -+ warn_script_location=True, strip_file_prefix=None): - """Install a wheel""" - - if not scheme: -@@ -507,7 +507,12 @@ - writer.writerow(row) - for f in generated: - digest, length = rehash(f) -- writer.writerow((normpath(f, lib_dir), digest, length)) -+ final_path = normpath(f, lib_dir) -+ if strip_file_prefix and final_path.startswith(strip_file_prefix): -+ final_path = os.path.join(os.sep, -+ os.path.relpath(final_path, strip_file_prefix)) -+ writer.writerow((final_path, digest, length)) -+ - for f in installed: - writer.writerow((installed[f], '', '')) - shutil.move(temp_record, record) diff --git a/dummy-certifi.patch b/dummy-certifi.patch deleted file mode 100644 index 1178c7686426073a33e1a33a1bde45fec5200b46..0000000000000000000000000000000000000000 --- a/dummy-certifi.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py -index eab9d1d..30db215 100644 ---- a/src/pip/_vendor/certifi/core.py -+++ b/src/pip/_vendor/certifi/core.py -@@ -19,9 +19,7 @@ class DeprecatedBundleWarning(DeprecationWarning): - - - def where(): -- f = os.path.dirname(__file__) -- -- return os.path.join(f, 'cacert.pem') -+ return '/etc/pki/tls/certs/ca-bundle.crt' - - - def old_where(): diff --git a/emit-a-warning-when-running-with-root-privileges.patch b/emit-a-warning-when-running-with-root-privileges.patch deleted file mode 100644 index 3135fc37cf963ad7b603d4166559a9e4341cb44a..0000000000000000000000000000000000000000 --- a/emit-a-warning-when-running-with-root-privileges.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ru pip-18.0/src/pip/_internal/commands/install.py pip-18.0_patched/src/pip/_internal/commands/install.py ---- pip-18.0/src/pip/_internal/commands/install.py 2018-07-20 06:10:48.000000000 +0200 -+++ pip-18.0_patched/src/pip/_internal/commands/install.py 2018-07-31 12:15:43.777317780 +0200 -@@ -5,6 +5,8 @@ - import operator - import os - import shutil -+import sys -+from os import path - from optparse import SUPPRESS_HELP - - from pip._vendor import pkg_resources -@@ -205,6 +207,18 @@ - def run(self, options, args): - 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(): -+ logger.warning( -+ "WARNING: Running pip install with root privileges is " -+ "generally not a good idea. Try `%s install --user` instead." -+ % path.basename(sys.argv[0]) -+ ) -+ - upgrade_strategy = "to-satisfy-only" - if options.upgrade: - upgrade_strategy = options.upgrade_strategy diff --git a/pip-18.0.tar.gz b/pip-18.0.tar.gz deleted file mode 100644 index aa0550a41f8bf18faa5313b92b1705f6513c7a63..0000000000000000000000000000000000000000 Binary files a/pip-18.0.tar.gz and /dev/null differ diff --git a/pip-20.1.1.tar.gz b/pip-20.1.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f56c5dd54a54e7962dce4919ea7cb64af467bdc3 Binary files /dev/null and b/pip-20.1.1.tar.gz differ diff --git a/pip-allow-older-versions.patch b/pip-allow-older-versions.patch deleted file mode 100644 index 39a272b717bab26bdd800a5c15c4932d46d13403..0000000000000000000000000000000000000000 --- a/pip-allow-older-versions.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- /usr/bin/pip3 2018-03-29 15:22:13.000000000 +0200 -+++ pip3 2018-05-04 11:49:08.098821010 +0200 -@@ -4,7 +4,12 @@ - import re - import sys - --from pip._internal import main -+try: -+ from pip._internal import main -+except ImportError: -+ # user has most probably downgraded pip in their home -+ # so let them run it anyway until ~/.local/bin makes it in front of the PATH -+ from pip import main - - if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) diff --git a/python-pip.spec b/python-pip.spec index 797f39a54287542e2451ed8eb4d4286bcd6dfa70..4973ce9bdfb226d594ea42404c0d29be593eb0bc 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -6,18 +6,13 @@ 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: 18.0 -Release: 12 +Version: 20.1.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: https://files.pythonhosted.org/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.gz BuildArch: noarch -Patch0: allow-stripping-given-prefix-from-wheel-RECORD-files.patch -Patch1: remove-existing-dist-only-if-path-conflicts.patch -Patch2: emit-a-warning-when-running-with-root-privileges.patch -Patch6000: dummy-certifi.patch -Source1: pip-allow-older-versions.patch %description %{_description} @@ -49,7 +44,7 @@ Requires: ca-certificates A Python wheel of pip to use with venv %prep -%autosetup -n %{srcname}-%{version} -p1 +%autosetup -n %{srcname}-%{version} %build %if %{with python2} @@ -144,6 +139,12 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* Fri Jul 24 2020 tianwei - 20.1.1-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: update to release 20.1.1 + * Thu Feb 20 2020 chengquan3 - 18.0-12 - Type:bugfix - ID:NA diff --git a/remove-existing-dist-only-if-path-conflicts.patch b/remove-existing-dist-only-if-path-conflicts.patch deleted file mode 100644 index 85438de3a1c903d3fa17c3ce5969caf007ca9e88..0000000000000000000000000000000000000000 --- a/remove-existing-dist-only-if-path-conflicts.patch +++ /dev/null @@ -1,88 +0,0 @@ -commit b6d5da6796801862eb751a93d507c343af0604d6 -Author: Victor Stinner -Date: Tue Sep 18 17:13:51 2018 +0200 - - Subject: Prevent removing of the system packages installed under /usr/lib - - when pip install -U is executed. - - Resolves: rhbz#1550368 - - Co-Authored-By: Michal Cyprian - -diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py -index 8e91ecb..9beb100 100644 ---- a/src/pip/_internal/req/req_install.py -+++ b/src/pip/_internal/req/req_install.py -@@ -36,7 +36,7 @@ from pip._internal.utils.hashes import Hashes - from pip._internal.utils.logging import indent_log - from pip._internal.utils.misc import ( - _make_build_dir, ask_path_exists, backup_dir, call_subprocess, -- display_path, dist_in_site_packages, dist_in_usersite, ensure_dir, -+ display_path, dist_in_install_path, dist_in_site_packages, dist_in_usersite, ensure_dir, - get_installed_version, is_installable_dir, read_text_file, rmtree, - ) - from pip._internal.utils.setuptools_build import SETUPTOOLS_SHIM -@@ -503,7 +503,7 @@ class InstallRequirement(object): - "lack sys.path precedence to %s in %s" % - (existing_dist.project_name, existing_dist.location) - ) -- else: -+ elif dist_in_install_path(existing_dist): - self.conflicts_with = existing_dist - return True - -diff --git a/src/pip/_internal/resolve.py b/src/pip/_internal/resolve.py -index 8480e48..b118098 100644 ---- a/src/pip/_internal/resolve.py -+++ b/src/pip/_internal/resolve.py -@@ -20,7 +20,7 @@ from pip._internal.exceptions import ( - ) - from pip._internal.req.req_install import InstallRequirement - from pip._internal.utils.logging import indent_log --from pip._internal.utils.misc import dist_in_usersite, ensure_dir -+from pip._internal.utils.misc import dist_in_install_path, dist_in_usersite, ensure_dir - from pip._internal.utils.packaging import check_dist_requires_python - - logger = logging.getLogger(__name__) -@@ -123,7 +123,9 @@ class Resolver(object): - """ - # 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.conflicts_with = req.satisfied_by - req.satisfied_by = None - -diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py -index 3236af6..e60287b 100644 ---- a/src/pip/_internal/utils/misc.py -+++ b/src/pip/_internal/utils/misc.py -@@ -32,7 +32,7 @@ from pip._internal.compat import ( - from pip._internal.exceptions import CommandError, InstallationError - from pip._internal.locations import ( - running_under_virtualenv, site_packages, user_site, virtualenv_no_global, -- write_delete_marker_file, -+ write_delete_marker_file, distutils_scheme, - ) - - if PY2: -@@ -324,6 +324,16 @@ def dist_in_site_packages(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( -+ distutils_scheme("")['purelib'].split('python')[0])) -+ -+ - def dist_is_editable(dist): - """Is distribution an editable install?""" - for path_item in sys.path: