summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Koltsov <maksbotan@gentoo.org>2019-04-27 22:27:04 +0300
committerMaxim Koltsov <maksbotan@gentoo.org>2019-04-28 11:01:52 +0300
commit64dad89900c7b185a01a2b64f14a57188fa4ed74 (patch)
tree044ae05d63824d42d209e24a25f322d2b77f38e2 /dev-python/pip/files
parentsys-apps/elfix: stable 0.9.5 for ppc, bug #684380 (diff)
downloadgentoo-64dad89900c7b185a01a2b64f14a57188fa4ed74.tar.gz
gentoo-64dad89900c7b185a01a2b64f14a57188fa4ed74.tar.bz2
gentoo-64dad89900c7b185a01a2b64f14a57188fa4ed74.zip
dev-python/pip: bump to 19.1
- Bump EAPI to 7 - Fix completion file installation Closes: https://bugs.gentoo.org/671286 Package-Manager: Portage-2.3.63, Repoman-2.3.12 Signed-off-by: Maxim Koltsov <maksbotan@gentoo.org>
Diffstat (limited to 'dev-python/pip/files')
-rw-r--r--dev-python/pip/files/pip-19.1-disable-system-install.patch17
-rw-r--r--dev-python/pip/files/pip-19.1-disable-version-check.patch19
2 files changed, 36 insertions, 0 deletions
diff --git a/dev-python/pip/files/pip-19.1-disable-system-install.patch b/dev-python/pip/files/pip-19.1-disable-system-install.patch
new file mode 100644
index 000000000000..bc88ef715a2e
--- /dev/null
+++ b/dev-python/pip/files/pip-19.1-disable-system-install.patch
@@ -0,0 +1,17 @@
+install: Raise an error to avoid breaking python-exec
+
+Running pip without --target, --root, or --user will result in packages
+being installed systemwide. This has a tendency to break python-exec if
+setuptools gets installed or upgraded.
+
+--- pip-19.1/src/pip/_internal/commands/install.py
++++ pip-19.1/src/pip/_internal/commands/install.py
+@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
+ if options.upgrade:
+ upgrade_strategy = options.upgrade_strategy
+
++ if not options.use_user_site and not options.target_dir and not options.root_path:
++ raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
++
+ if options.build_dir:
+ options.build_dir = os.path.abspath(options.build_dir)
diff --git a/dev-python/pip/files/pip-19.1-disable-version-check.patch b/dev-python/pip/files/pip-19.1-disable-version-check.patch
new file mode 100644
index 000000000000..a46a47f0fc68
--- /dev/null
+++ b/dev-python/pip/files/pip-19.1-disable-version-check.patch
@@ -0,0 +1,19 @@
+Don't check for new versions of pip.
+
+--- pip-19.1/src/pip/_internal/cli/base_command.py
++++ pip-19.1/src/pip/_internal/cli/base_command.py
+@@ -213,12 +213,8 @@ class Command(object):
+
+ return UNKNOWN_ERROR
+ finally:
+- allow_version_check = (
+- # Does this command have the index_group options?
+- hasattr(options, "no_index") and
+- # Is this command allowed to perform this check?
+- not (options.disable_pip_version_check or options.no_index)
+- )
++ # Disabled on Gentoo
++ allow_version_check = False
+ # Check if we're using the latest version of pip available
+ if allow_version_check:
+ session = self._build_session(