summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2018-06-25 22:28:04 -0400
committerTim Harder <radhermit@gentoo.org>2018-06-25 23:38:32 -0400
commitd9c8635bc6ee81573cbdd50a4bc212cd6244062b (patch)
tree70edb1e0c40ee88abb06ff2b2167f7429a5864eb /dev-python/pip/files
parentunpacker.eclass: disable path expansion while parsing SRC_URI #654960 (diff)
downloadgentoo-d9c8635bc6ee81573cbdd50a4bc212cd6244062b.tar.gz
gentoo-d9c8635bc6ee81573cbdd50a4bc212cd6244062b.tar.bz2
gentoo-d9c8635bc6ee81573cbdd50a4bc212cd6244062b.zip
dev-python/pip: version bump to 10.0.1
Closes: https://bugs.gentoo.org/578988 Closes: https://bugs.gentoo.org/621584
Diffstat (limited to 'dev-python/pip/files')
-rw-r--r--dev-python/pip/files/pip-10.0.1-disable-system-install.patch18
-rw-r--r--dev-python/pip/files/pip-10.0.1-disable-version-check.patch19
2 files changed, 37 insertions, 0 deletions
diff --git a/dev-python/pip/files/pip-10.0.1-disable-system-install.patch b/dev-python/pip/files/pip-10.0.1-disable-system-install.patch
new file mode 100644
index 000000000000..776d395b7b94
--- /dev/null
+++ b/dev-python/pip/files/pip-10.0.1-disable-system-install.patch
@@ -0,0 +1,18 @@
+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-10.0.1/src/pip/_internal/commands/install.py
++++ pip-10.0.1/src/pip/_internal/commands/install.py
+@@ -202,6 +202,9 @@
+ 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-10.0.1-disable-version-check.patch b/dev-python/pip/files/pip-10.0.1-disable-version-check.patch
new file mode 100644
index 000000000000..ad146dc1507f
--- /dev/null
+++ b/dev-python/pip/files/pip-10.0.1-disable-version-check.patch
@@ -0,0 +1,19 @@
+Don't check for new versions of pip.
+
+--- pip-10.0.1/src/pip/_internal/basecommand.py
++++ pip-10.0.1/src/pip/_internal/basecommand.py
+@@ -255,14 +255,6 @@
+
+ return UNKNOWN_ERROR
+ finally:
+- # Check if we're using the latest version of pip available
+- if (not options.disable_pip_version_check and not
+- getattr(options, "no_index", False)):
+- with self._build_session(
+- options,
+- retries=0,
+- timeout=min(5, options.timeout)) as session:
+- pip_version_check(session, options)
+ # Avoid leaking loggers
+ for handler in set(logging.root.handlers) - original_root_handlers:
+ # this method benefit from the Logger class internal lock