diff options
Diffstat (limited to 'dev-python/pip/files')
5 files changed, 24 insertions, 94 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 deleted file mode 100644 index 776d395b7b94..000000000000 --- a/dev-python/pip/files/pip-10.0.1-disable-system-install.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index ad146dc1507f..000000000000 --- a/dev-python/pip/files/pip-10.0.1-disable-version-check.patch +++ /dev/null @@ -1,19 +0,0 @@ -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
diff --git a/dev-python/pip/files/pip-19.3-disable-version-check.patch b/dev-python/pip/files/pip-19.3-disable-version-check.patch new file mode 100644 index 000000000000..e8fe868431d1 --- /dev/null +++ b/dev-python/pip/files/pip-19.3-disable-version-check.patch @@ -0,0 +1,24 @@ +diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py +index 203e86a4..a2183f10 100644 +--- a/src/pip/_internal/cli/req_command.py ++++ b/src/pip/_internal/cli/req_command.py +@@ -129,17 +129,8 @@ class IndexGroupCommand(Command, SessionCommandMixin): + # Make sure the index_group options are present. + assert hasattr(options, 'no_index') + +- if options.disable_pip_version_check or options.no_index: +- return +- +- # Otherwise, check if we're using the latest version of pip available. +- session = self._build_session( +- options, +- retries=0, +- timeout=min(5, options.timeout) +- ) +- with session: +- pip_self_version_check(session, options) ++ # Disabled on Gentoo ++ return + + + class RequirementCommand(IndexGroupCommand): diff --git a/dev-python/pip/files/pip-6.0.2-disable-version-check.patch b/dev-python/pip/files/pip-6.0.2-disable-version-check.patch deleted file mode 100644 index a192c228a997..000000000000 --- a/dev-python/pip/files/pip-6.0.2-disable-version-check.patch +++ /dev/null @@ -1,14 +0,0 @@ -Don't check PyPI for new versions of pip by default, updates will occur when -new releases are added to the tree. - ---- pip-6.0.2/pip/cmdoptions.py -+++ pip-6.0.2/pip/cmdoptions.py -@@ -404,7 +404,7 @@ - "--disable-pip-version-check", - dest="disable_pip_version_check", - action="store_true", -- default=False, -+ default=True, - help="Don't periodically check PyPI to determine whether a new version " - "of pip is available for download.") - diff --git a/dev-python/pip/files/pip-8.0.0-unbundle.patch b/dev-python/pip/files/pip-8.0.0-unbundle.patch deleted file mode 100644 index d508d51ab4fc..000000000000 --- a/dev-python/pip/files/pip-8.0.0-unbundle.patch +++ /dev/null @@ -1,43 +0,0 @@ - pip/_vendor/__init__.py | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) - -diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py -index b09a7c3..b9fe6ee 100644 ---- a/pip/_vendor/__init__.py -+++ b/pip/_vendor/__init__.py -@@ -14,7 +14,7 @@ import sys - # Downstream redistributors which have debundled our dependencies should also - # patch this value to be true. This will trigger the additional patching - # to cause things like "six" to be available as pip. --DEBUNDLED = False -+DEBUNDLED = True - - # By default, look in this directory for a bunch of .whl files which we will - # add to the beginning of sys.path before attempting to import anything. This -@@ -29,13 +29,10 @@ WHEEL_DIR = os.path.abspath(os.path.dirname(__file__)) - def vendored(modulename): - vendored_name = "{0}.{1}".format(__name__, modulename) - -- try: -- __import__(vendored_name, globals(), locals(), level=0) -- except ImportError: -- __import__(modulename, globals(), locals(), level=0) -- sys.modules[vendored_name] = sys.modules[modulename] -- base, head = vendored_name.rsplit(".", 1) -- setattr(sys.modules[base], head, sys.modules[modulename]) -+ __import__(modulename, globals(), locals(), level=0) -+ sys.modules[vendored_name] = sys.modules[modulename] -+ base, head = vendored_name.rsplit(".", 1) -+ setattr(sys.modules[base], head, sys.modules[modulename]) - - - # If we're operating in a debundled setup, then we want to go ahead and trigger -@@ -85,8 +82,6 @@ if DEBUNDLED: - vendored("requests.packages.urllib3.packages.ordered_dict") - vendored("requests.packages.urllib3.packages.six") - vendored("requests.packages.urllib3.packages.ssl_match_hostname") -- vendored("requests.packages.urllib3.packages.ssl_match_hostname." -- "_implementation") - vendored("requests.packages.urllib3.poolmanager") - vendored("requests.packages.urllib3.request") - vendored("requests.packages.urllib3.response") |