Compare commits
No commits in common. "c8-stream-3.8" and "stream-python39-3.9-rhel-8.9.0" have entirely different histories.
c8-stream-
...
stream-pyt
|
@ -1 +1,3 @@
|
||||||
SOURCES/pip-19.3.1.tar.gz
|
/2018.2.tar.gz
|
||||||
|
/d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz
|
||||||
|
/pip-20.2.4.tar.gz
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
bb825314632e0528aa93a19ab18e87f4cc36e998 SOURCES/pip-19.3.1.tar.gz
|
|
|
@ -1,6 +1,6 @@
|
||||||
From 4f0099156245ed2873d6945d5e58db741e15836d Mon Sep 17 00:00:00 2001
|
From d135e45152a88b896b1d3e8770d5d59f694c2419 Mon Sep 17 00:00:00 2001
|
||||||
From: Lumir Balhar <lbalhar@redhat.com>
|
From: Lumir Balhar <lbalhar@redhat.com>
|
||||||
Date: Tue, 8 Jun 2021 09:51:47 +0200
|
Date: Tue, 8 Jun 2021 10:08:49 +0200
|
||||||
Subject: [PATCH] CVE-2021-3572
|
Subject: [PATCH] CVE-2021-3572
|
||||||
|
|
||||||
---
|
---
|
||||||
|
@ -8,12 +8,12 @@ Subject: [PATCH] CVE-2021-3572
|
||||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/pip/_internal/vcs/git.py b/src/pip/_internal/vcs/git.py
|
diff --git a/src/pip/_internal/vcs/git.py b/src/pip/_internal/vcs/git.py
|
||||||
index 92b8457..7b3cc4a 100644
|
index a9c7fb6..b38625e 100644
|
||||||
--- a/src/pip/_internal/vcs/git.py
|
--- a/src/pip/_internal/vcs/git.py
|
||||||
+++ b/src/pip/_internal/vcs/git.py
|
+++ b/src/pip/_internal/vcs/git.py
|
||||||
@@ -120,9 +120,15 @@ class Git(VersionControl):
|
@@ -142,9 +142,15 @@ class Git(VersionControl):
|
||||||
output = cls.run_command(['show-ref', rev], cwd=dest,
|
pass
|
||||||
show_stdout=False, on_returncode='ignore')
|
|
||||||
refs = {}
|
refs = {}
|
||||||
- for line in output.strip().splitlines():
|
- for line in output.strip().splitlines():
|
||||||
+ # NOTE: We do not use splitlines here since that would split on other
|
+ # NOTE: We do not use splitlines here since that would split on other
|
|
@ -1,12 +0,0 @@
|
||||||
diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py
|
|
||||||
index 7271acf..9f0dc20 100644
|
|
||||||
--- a/src/pip/_vendor/certifi/core.py
|
|
||||||
+++ b/src/pip/_vendor/certifi/core.py
|
|
||||||
@@ -10,6 +10,4 @@ import os
|
|
||||||
|
|
||||||
|
|
||||||
def where():
|
|
||||||
- f = os.path.dirname(__file__)
|
|
||||||
-
|
|
||||||
- return os.path.join(f, 'cacert.pem')
|
|
||||||
+ return '/etc/pki/tls/certs/ca-bundle.crt'
|
|
|
@ -1,84 +0,0 @@
|
||||||
diff -up pip-19.3.1/news/7872.bugfix.pip7873 pip-19.3.1/news/7872.bugfix
|
|
||||||
--- pip-19.3.1/news/7872.bugfix.pip7873 2022-05-24 08:34:03.285054864 -0600
|
|
||||||
+++ pip-19.3.1/news/7872.bugfix 2022-05-24 08:34:03.285054864 -0600
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+Prevent an infinite recursion with ``pip wheel`` when ``$TMPDIR`` is within the source directory.
|
|
||||||
diff -up pip-19.3.1/src/pip/_internal/download.py.pip7873 pip-19.3.1/src/pip/_internal/download.py
|
|
||||||
--- pip-19.3.1/src/pip/_internal/download.py.pip7873 2019-10-17 13:32:34.000000000 -0600
|
|
||||||
+++ pip-19.3.1/src/pip/_internal/download.py 2022-05-24 08:35:17.013833331 -0600
|
|
||||||
@@ -350,12 +350,24 @@ def _copy2_ignoring_special_files(src, d
|
|
||||||
|
|
||||||
def _copy_source_tree(source, target):
|
|
||||||
# type: (str, str) -> None
|
|
||||||
+ target_abspath = os.path.abspath(target)
|
|
||||||
+ target_basename = os.path.basename(target_abspath)
|
|
||||||
+ target_dirname = os.path.dirname(target_abspath)
|
|
||||||
+
|
|
||||||
def ignore(d, names):
|
|
||||||
- # Pulling in those directories can potentially be very slow,
|
|
||||||
- # exclude the following directories if they appear in the top
|
|
||||||
- # level dir (and only it).
|
|
||||||
- # See discussion at https://github.com/pypa/pip/pull/6770
|
|
||||||
- return ['.tox', '.nox'] if d == source else []
|
|
||||||
+ skipped = [] # type: List[str]
|
|
||||||
+ if d == source:
|
|
||||||
+ # Pulling in those directories can potentially be very slow,
|
|
||||||
+ # exclude the following directories if they appear in the top
|
|
||||||
+ # level dir (and only it).
|
|
||||||
+ # See discussion at https://github.com/pypa/pip/pull/6770
|
|
||||||
+ skipped += ['.tox', '.nox']
|
|
||||||
+ if os.path.abspath(d) == target_dirname:
|
|
||||||
+ # Prevent an infinite recursion if the target is in source.
|
|
||||||
+ # This can happen when TMPDIR is set to ${PWD}/...
|
|
||||||
+ # and we copy PWD to TMPDIR.
|
|
||||||
+ skipped += [target_basename]
|
|
||||||
+ return skipped
|
|
||||||
|
|
||||||
kwargs = dict(ignore=ignore, symlinks=True) # type: CopytreeKwargs
|
|
||||||
|
|
||||||
diff -up pip-19.3.1/src/pip/_internal/operations/prepare.py.pip7873 pip-19.3.1/src/pip/_internal/operations/prepare.py
|
|
||||||
diff -up pip-19.3.1/tests/data/src/extension/extension.c.pip7873 pip-19.3.1/tests/data/src/extension/extension.c
|
|
||||||
diff -up pip-19.3.1/tests/data/src/extension/setup.py.pip7873 pip-19.3.1/tests/data/src/extension/setup.py
|
|
||||||
--- pip-19.3.1/tests/data/src/extension/setup.py.pip7873 2022-05-24 08:34:03.285054864 -0600
|
|
||||||
+++ pip-19.3.1/tests/data/src/extension/setup.py 2022-05-24 08:34:03.285054864 -0600
|
|
||||||
@@ -0,0 +1,4 @@
|
|
||||||
+from setuptools import Extension, setup
|
|
||||||
+
|
|
||||||
+module = Extension('extension', sources=['extension.c'])
|
|
||||||
+setup(name='extension', version='0.0.1', ext_modules = [module])
|
|
||||||
diff -up pip-19.3.1/tests/functional/test_wheel.py.pip7873 pip-19.3.1/tests/functional/test_wheel.py
|
|
||||||
--- pip-19.3.1/tests/functional/test_wheel.py.pip7873 2019-10-17 13:32:34.000000000 -0600
|
|
||||||
+++ pip-19.3.1/tests/functional/test_wheel.py 2022-05-24 08:34:03.285054864 -0600
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
"""'pip wheel' tests"""
|
|
||||||
import os
|
|
||||||
import re
|
|
||||||
+import sys
|
|
||||||
from os.path import exists
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
@@ -228,6 +229,24 @@ def test_pip_wheel_with_user_set_in_conf
|
|
||||||
assert "Successfully built withpyproject" in result.stdout, result.stdout
|
|
||||||
|
|
||||||
|
|
||||||
+@pytest.mark.skipif(sys.platform.startswith('win'),
|
|
||||||
+ reason='The empty extension module does not work on Win')
|
|
||||||
+def test_pip_wheel_ext_module_with_tmpdir_inside(script, data, common_wheels):
|
|
||||||
+ tmpdir = data.src / 'extension/tmp'
|
|
||||||
+ tmpdir.mkdir()
|
|
||||||
+ script.environ['TMPDIR'] = str(tmpdir)
|
|
||||||
+
|
|
||||||
+ # To avoid a test dependency on a C compiler, we set the env vars to "noop"
|
|
||||||
+ # The .c source is empty anyway
|
|
||||||
+ script.environ['CC'] = script.environ['LDSHARED'] = str('true')
|
|
||||||
+
|
|
||||||
+ result = script.pip(
|
|
||||||
+ 'wheel', data.src / 'extension',
|
|
||||||
+ '--no-index', '-f', common_wheels
|
|
||||||
+ )
|
|
||||||
+ assert "Successfully built extension" in result.stdout, result.stdout
|
|
||||||
+
|
|
||||||
+
|
|
||||||
@pytest.mark.network
|
|
||||||
def test_pep517_wheels_are_not_confused_with_other_files(script, tmpdir, data):
|
|
||||||
"""Check correct wheels are copied. (#6196)
|
|
|
@ -1,683 +0,0 @@
|
||||||
From 621800d5c65aea36c6a1d9b685ff88f35cfce476 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tomas Orsava <torsava@redhat.com>
|
|
||||||
Date: Fri, 15 Nov 2019 19:44:54 +0100
|
|
||||||
Subject: [PATCH] Mark 6 tests as network tests
|
|
||||||
|
|
||||||
=================================== FAILURES ===================================
|
|
||||||
_______________________________ test_freeze_path _______________________________
|
|
||||||
tmpdir = Path('/tmp/pytest-of-mockbuild/pytest-0/test_freeze_path0')
|
|
||||||
script = <tests.lib.PipTestEnvironment object at 0x7fe950a4caf0>
|
|
||||||
data = <tests.lib.TestData object at 0x7fe950a4cc10>
|
|
||||||
def test_freeze_path(tmpdir, script, data):
|
|
||||||
"""
|
|
||||||
Test freeze with --path.
|
|
||||||
"""
|
|
||||||
> script.pip('install', '--find-links', data.find_links,
|
|
||||||
'--target', tmpdir, 'simple==2.0')
|
|
||||||
tests/functional/test_freeze.py:712:
|
|
||||||
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
|
|
||||||
tests/lib/__init__.py:593: in run
|
|
||||||
_check_stderr(
|
|
||||||
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
|
|
||||||
stderr = "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'N...t at 0x7fe6435ef280>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/\n"
|
|
||||||
allow_stderr_warning = False, allow_stderr_error = False
|
|
||||||
def _check_stderr(
|
|
||||||
stderr, allow_stderr_warning, allow_stderr_error,
|
|
||||||
):
|
|
||||||
"""
|
|
||||||
Check the given stderr for logged warnings and errors.
|
|
||||||
|
|
||||||
:param stderr: stderr output as a string.
|
|
||||||
:param allow_stderr_warning: whether a logged warning (or deprecation
|
|
||||||
message) is allowed. Must be True if allow_stderr_error is True.
|
|
||||||
:param allow_stderr_error: whether a logged error is allowed.
|
|
||||||
"""
|
|
||||||
assert not (allow_stderr_error and not allow_stderr_warning)
|
|
||||||
|
|
||||||
lines = stderr.splitlines()
|
|
||||||
for line in lines:
|
|
||||||
# First check for logging errors, which we don't allow during
|
|
||||||
# tests even if allow_stderr_error=True (since a logging error
|
|
||||||
# would signal a bug in pip's code).
|
|
||||||
# Unlike errors logged with logger.error(), these errors are
|
|
||||||
# sent directly to stderr and so bypass any configured log formatter.
|
|
||||||
# The "--- Logging error ---" string is used in Python 3.4+, and
|
|
||||||
# "Logged from file " is used in Python 2.
|
|
||||||
if (line.startswith('--- Logging error ---') or
|
|
||||||
line.startswith('Logged from file ')):
|
|
||||||
reason = 'stderr has a logging error, which is never allowed'
|
|
||||||
msg = make_check_stderr_message(stderr, line=line, reason=reason)
|
|
||||||
raise RuntimeError(msg)
|
|
||||||
if allow_stderr_error:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if line.startswith('ERROR: '):
|
|
||||||
reason = (
|
|
||||||
'stderr has an unexpected error '
|
|
||||||
'(pass allow_stderr_error=True to permit this)'
|
|
||||||
)
|
|
||||||
msg = make_check_stderr_message(stderr, line=line, reason=reason)
|
|
||||||
raise RuntimeError(msg)
|
|
||||||
if allow_stderr_warning:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if (line.startswith('WARNING: ') or
|
|
||||||
line.startswith(DEPRECATION_MSG_PREFIX)):
|
|
||||||
reason = (
|
|
||||||
'stderr has an unexpected warning '
|
|
||||||
'(pass allow_stderr_warning=True to permit this)'
|
|
||||||
)
|
|
||||||
msg = make_check_stderr_message(stderr, line=line, reason=reason)
|
|
||||||
> raise RuntimeError(msg)
|
|
||||||
E RuntimeError: stderr has an unexpected warning (pass allow_stderr_warning=True to permit this):
|
|
||||||
E Caused by line: "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe64364c850>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/"
|
|
||||||
E Complete stderr: WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe64364c850>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe64364cdc0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe64364cf70>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe6435ef130>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe6435ef280>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
tests/lib/__init__.py:404: RuntimeError
|
|
||||||
________________________ test_freeze_path_exclude_user _________________________
|
|
||||||
tmpdir = Path('/tmp/pytest-of-mockbuild/pytest-0/test_freeze_path_exclude_user0')
|
|
||||||
script = <tests.lib.PipTestEnvironment object at 0x7fe950ec8fa0>
|
|
||||||
data = <tests.lib.TestData object at 0x7fe950ec8a30>
|
|
||||||
def test_freeze_path_exclude_user(tmpdir, script, data):
|
|
||||||
"""
|
|
||||||
Test freeze with --path and make sure packages from --user are not picked
|
|
||||||
up.
|
|
||||||
"""
|
|
||||||
script.pip_install_local('--find-links', data.find_links,
|
|
||||||
'--user', 'simple2')
|
|
||||||
> script.pip('install', '--find-links', data.find_links,
|
|
||||||
'--target', tmpdir, 'simple==1.0')
|
|
||||||
tests/functional/test_freeze.py:728:
|
|
||||||
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
|
|
||||||
tests/lib/__init__.py:593: in run
|
|
||||||
_check_stderr(
|
|
||||||
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
|
|
||||||
stderr = "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'N...t at 0x7f87ae751310>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/\n"
|
|
||||||
allow_stderr_warning = False, allow_stderr_error = False
|
|
||||||
def _check_stderr(
|
|
||||||
stderr, allow_stderr_warning, allow_stderr_error,
|
|
||||||
):
|
|
||||||
"""
|
|
||||||
Check the given stderr for logged warnings and errors.
|
|
||||||
|
|
||||||
:param stderr: stderr output as a string.
|
|
||||||
:param allow_stderr_warning: whether a logged warning (or deprecation
|
|
||||||
message) is allowed. Must be True if allow_stderr_error is True.
|
|
||||||
:param allow_stderr_error: whether a logged error is allowed.
|
|
||||||
"""
|
|
||||||
assert not (allow_stderr_error and not allow_stderr_warning)
|
|
||||||
|
|
||||||
lines = stderr.splitlines()
|
|
||||||
for line in lines:
|
|
||||||
# First check for logging errors, which we don't allow during
|
|
||||||
# tests even if allow_stderr_error=True (since a logging error
|
|
||||||
# would signal a bug in pip's code).
|
|
||||||
# Unlike errors logged with logger.error(), these errors are
|
|
||||||
# sent directly to stderr and so bypass any configured log formatter.
|
|
||||||
# The "--- Logging error ---" string is used in Python 3.4+, and
|
|
||||||
# "Logged from file " is used in Python 2.
|
|
||||||
if (line.startswith('--- Logging error ---') or
|
|
||||||
line.startswith('Logged from file ')):
|
|
||||||
reason = 'stderr has a logging error, which is never allowed'
|
|
||||||
msg = make_check_stderr_message(stderr, line=line, reason=reason)
|
|
||||||
raise RuntimeError(msg)
|
|
||||||
if allow_stderr_error:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if line.startswith('ERROR: '):
|
|
||||||
reason = (
|
|
||||||
'stderr has an unexpected error '
|
|
||||||
'(pass allow_stderr_error=True to permit this)'
|
|
||||||
)
|
|
||||||
msg = make_check_stderr_message(stderr, line=line, reason=reason)
|
|
||||||
raise RuntimeError(msg)
|
|
||||||
if allow_stderr_warning:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if (line.startswith('WARNING: ') or
|
|
||||||
line.startswith(DEPRECATION_MSG_PREFIX)):
|
|
||||||
reason = (
|
|
||||||
'stderr has an unexpected warning '
|
|
||||||
'(pass allow_stderr_warning=True to permit this)'
|
|
||||||
)
|
|
||||||
msg = make_check_stderr_message(stderr, line=line, reason=reason)
|
|
||||||
> raise RuntimeError(msg)
|
|
||||||
E RuntimeError: stderr has an unexpected warning (pass allow_stderr_warning=True to permit this):
|
|
||||||
E Caused by line: "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae7aa8e0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/"
|
|
||||||
E Complete stderr: WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae7aa8e0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae7aae50>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae751040>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae7511c0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae751310>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
tests/lib/__init__.py:404: RuntimeError
|
|
||||||
__________________________ test_freeze_path_multiple ___________________________
|
|
||||||
tmpdir = Path('/tmp/pytest-of-mockbuild/pytest-0/test_freeze_path_multiple0')
|
|
||||||
script = <tests.lib.PipTestEnvironment object at 0x7fe950b43fd0>
|
|
||||||
data = <tests.lib.TestData object at 0x7fe950b43df0>
|
|
||||||
def test_freeze_path_multiple(tmpdir, script, data):
|
|
||||||
"""
|
|
||||||
Test freeze with multiple --path arguments.
|
|
||||||
"""
|
|
||||||
path1 = tmpdir / "path1"
|
|
||||||
os.mkdir(path1)
|
|
||||||
path2 = tmpdir / "path2"
|
|
||||||
os.mkdir(path2)
|
|
||||||
> script.pip('install', '--find-links', data.find_links,
|
|
||||||
'--target', path1, 'simple==2.0')
|
|
||||||
tests/functional/test_freeze.py:750:
|
|
||||||
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
|
|
||||||
tests/lib/__init__.py:593: in run
|
|
||||||
_check_stderr(
|
|
||||||
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
|
|
||||||
stderr = "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'N...t at 0x7f07e6253280>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/\n"
|
|
||||||
allow_stderr_warning = False, allow_stderr_error = False
|
|
||||||
def _check_stderr(
|
|
||||||
stderr, allow_stderr_warning, allow_stderr_error,
|
|
||||||
):
|
|
||||||
"""
|
|
||||||
Check the given stderr for logged warnings and errors.
|
|
||||||
|
|
||||||
:param stderr: stderr output as a string.
|
|
||||||
:param allow_stderr_warning: whether a logged warning (or deprecation
|
|
||||||
message) is allowed. Must be True if allow_stderr_error is True.
|
|
||||||
:param allow_stderr_error: whether a logged error is allowed.
|
|
||||||
"""
|
|
||||||
assert not (allow_stderr_error and not allow_stderr_warning)
|
|
||||||
|
|
||||||
lines = stderr.splitlines()
|
|
||||||
for line in lines:
|
|
||||||
# First check for logging errors, which we don't allow during
|
|
||||||
# tests even if allow_stderr_error=True (since a logging error
|
|
||||||
# would signal a bug in pip's code).
|
|
||||||
# Unlike errors logged with logger.error(), these errors are
|
|
||||||
# sent directly to stderr and so bypass any configured log formatter.
|
|
||||||
# The "--- Logging error ---" string is used in Python 3.4+, and
|
|
||||||
# "Logged from file " is used in Python 2.
|
|
||||||
if (line.startswith('--- Logging error ---') or
|
|
||||||
line.startswith('Logged from file ')):
|
|
||||||
reason = 'stderr has a logging error, which is never allowed'
|
|
||||||
msg = make_check_stderr_message(stderr, line=line, reason=reason)
|
|
||||||
raise RuntimeError(msg)
|
|
||||||
if allow_stderr_error:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if line.startswith('ERROR: '):
|
|
||||||
reason = (
|
|
||||||
'stderr has an unexpected error '
|
|
||||||
'(pass allow_stderr_error=True to permit this)'
|
|
||||||
)
|
|
||||||
msg = make_check_stderr_message(stderr, line=line, reason=reason)
|
|
||||||
raise RuntimeError(msg)
|
|
||||||
if allow_stderr_warning:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if (line.startswith('WARNING: ') or
|
|
||||||
line.startswith(DEPRECATION_MSG_PREFIX)):
|
|
||||||
reason = (
|
|
||||||
'stderr has an unexpected warning '
|
|
||||||
'(pass allow_stderr_warning=True to permit this)'
|
|
||||||
)
|
|
||||||
msg = make_check_stderr_message(stderr, line=line, reason=reason)
|
|
||||||
> raise RuntimeError(msg)
|
|
||||||
E RuntimeError: stderr has an unexpected warning (pass allow_stderr_warning=True to permit this):
|
|
||||||
E Caused by line: "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e62ae850>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/"
|
|
||||||
E Complete stderr: WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e62ae850>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e62aedc0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e62aef70>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e6253130>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
E WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e6253280>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
|
|
||||||
tests/lib/__init__.py:404: RuntimeError
|
|
||||||
_________________ test_install_no_binary_builds_pep_517_wheel __________________
|
|
||||||
script = <tests.lib.PipTestEnvironment object at 0x7fe9509f4e20>
|
|
||||||
data = <tests.lib.TestData object at 0x7fe9509f4640>, with_wheel = None
|
|
||||||
def test_install_no_binary_builds_pep_517_wheel(script, data, with_wheel):
|
|
||||||
to_install = data.packages.joinpath('pep517_setup_and_pyproject')
|
|
||||||
> res = script.pip(
|
|
||||||
'install', '--no-binary=:all:', '-f', data.find_links, to_install
|
|
||||||
)
|
|
||||||
tests/functional/test_install.py:1279:
|
|
||||||
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
|
|
||||||
self = <tests.lib.PipTestEnvironment object at 0x7fe9509f4e20>
|
|
||||||
args = ('python', '-m', 'pip', 'install', '--no-binary=:all:', '-f', ...)
|
|
||||||
kw = {'expect_stderr': True}
|
|
||||||
cwd = Path('/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/scratch')
|
|
||||||
run_from = None, allow_stderr_error = False, allow_stderr_warning = False
|
|
||||||
expect_error = None
|
|
||||||
def run(self, *args, **kw):
|
|
||||||
"""
|
|
||||||
:param allow_stderr_error: whether a logged error is allowed in
|
|
||||||
stderr. Passing True for this argument implies
|
|
||||||
`allow_stderr_warning` since warnings are weaker than errors.
|
|
||||||
:param allow_stderr_warning: whether a logged warning (or
|
|
||||||
deprecation message) is allowed in stderr.
|
|
||||||
:param expect_error: if False (the default), asserts that the command
|
|
||||||
exits with 0. Otherwise, asserts that the command exits with a
|
|
||||||
non-zero exit code. Passing True also implies allow_stderr_error
|
|
||||||
and allow_stderr_warning.
|
|
||||||
:param expect_stderr: whether to allow warnings in stderr (equivalent
|
|
||||||
to `allow_stderr_warning`). This argument is an abbreviated
|
|
||||||
version of `allow_stderr_warning` and is also kept for backwards
|
|
||||||
compatibility.
|
|
||||||
"""
|
|
||||||
if self.verbose:
|
|
||||||
print('>> running %s %s' % (args, kw))
|
|
||||||
|
|
||||||
cwd = kw.pop('cwd', None)
|
|
||||||
run_from = kw.pop('run_from', None)
|
|
||||||
assert not cwd or not run_from, "Don't use run_from; it's going away"
|
|
||||||
cwd = cwd or run_from or self.cwd
|
|
||||||
if sys.platform == 'win32':
|
|
||||||
# Partial fix for ScriptTest.run using `shell=True` on Windows.
|
|
||||||
args = [str(a).replace('^', '^^').replace('&', '^&') for a in args]
|
|
||||||
|
|
||||||
# Remove `allow_stderr_error` and `allow_stderr_warning` before
|
|
||||||
# calling run() because PipTestEnvironment doesn't support them.
|
|
||||||
allow_stderr_error = kw.pop('allow_stderr_error', None)
|
|
||||||
allow_stderr_warning = kw.pop('allow_stderr_warning', None)
|
|
||||||
|
|
||||||
# Propagate default values.
|
|
||||||
expect_error = kw.get('expect_error')
|
|
||||||
if expect_error:
|
|
||||||
# Then default to allowing logged errors.
|
|
||||||
if allow_stderr_error is not None and not allow_stderr_error:
|
|
||||||
raise RuntimeError(
|
|
||||||
'cannot pass allow_stderr_error=False with '
|
|
||||||
'expect_error=True'
|
|
||||||
)
|
|
||||||
allow_stderr_error = True
|
|
||||||
|
|
||||||
elif kw.get('expect_stderr'):
|
|
||||||
# Then default to allowing logged warnings.
|
|
||||||
if allow_stderr_warning is not None and not allow_stderr_warning:
|
|
||||||
raise RuntimeError(
|
|
||||||
'cannot pass allow_stderr_warning=False with '
|
|
||||||
'expect_stderr=True'
|
|
||||||
)
|
|
||||||
allow_stderr_warning = True
|
|
||||||
|
|
||||||
if allow_stderr_error:
|
|
||||||
if allow_stderr_warning is not None and not allow_stderr_warning:
|
|
||||||
raise RuntimeError(
|
|
||||||
'cannot pass allow_stderr_warning=False with '
|
|
||||||
'allow_stderr_error=True'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Default values if not set.
|
|
||||||
if allow_stderr_error is None:
|
|
||||||
allow_stderr_error = False
|
|
||||||
if allow_stderr_warning is None:
|
|
||||||
allow_stderr_warning = allow_stderr_error
|
|
||||||
|
|
||||||
# Pass expect_stderr=True to allow any stderr. We do this because
|
|
||||||
# we do our checking of stderr further on in check_stderr().
|
|
||||||
kw['expect_stderr'] = True
|
|
||||||
> result = super(PipTestEnvironment, self).run(cwd=cwd, *args, **kw)
|
|
||||||
E AssertionError: Script returned code: 1
|
|
||||||
tests/lib/__init__.py:586: AssertionError
|
|
||||||
----------------------------- Captured stdout call -----------------------------
|
|
||||||
Script result: python -m pip install --no-binary=:all: -f file:///tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages/pep517_setup_and_pyproject
|
|
||||||
return code: 1
|
|
||||||
-- stderr: --------------------
|
|
||||||
ERROR: Command errored out with exit status 1:
|
|
||||||
command: /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/venv/bin/python /builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip install --ignore-installed --no-user --prefix /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-build-env-ntp1m4dh/overlay --no-warn-script-location --no-binary :all: --only-binary :none: -i https://pypi.org/simple --find-links file:///tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages -- setuptools
|
|
||||||
cwd: None
|
|
||||||
Complete output (28 lines):
|
|
||||||
Looking in links: file:///tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages
|
|
||||||
WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f7234ef1e50>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/setuptools/
|
|
||||||
WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f7234e92040>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/setuptools/
|
|
||||||
WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f7234e921c0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/setuptools/
|
|
||||||
WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f7234e92340>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/setuptools/
|
|
||||||
WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f7234e924c0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/setuptools/
|
|
||||||
Processing /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages/setuptools-0.9.6.tar.gz
|
|
||||||
ERROR: Command errored out with exit status 1:
|
|
||||||
command: /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/venv/bin/python -c 'import sys, setuptools, tokenize; sys.argv[0] = '"'"'/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setup.py'"'"'; __file__='"'"'/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setup.py'"'"';f=getattr(tokenize, '"'"'open'"'"', open)(__file__);code=f.read().replace('"'"'\r\n'"'"', '"'"'\n'"'"');f.close();exec(compile(code, __file__, '"'"'exec'"'"'))' egg_info --egg-base /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/pip-egg-info
|
|
||||||
cwd: /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/
|
|
||||||
Complete output (15 lines):
|
|
||||||
Traceback (most recent call last):
|
|
||||||
File "<string>", line 1, in <module>
|
|
||||||
File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setuptools/__init__.py", line 2, in <module>
|
|
||||||
from setuptools.extension import Extension, Library
|
|
||||||
File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setuptools/extension.py", line 5, in <module>
|
|
||||||
from setuptools.dist import _get_unpatched
|
|
||||||
File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setuptools/dist.py", line 7, in <module>
|
|
||||||
from setuptools.command.install import install
|
|
||||||
File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setuptools/command/__init__.py", line 8, in <module>
|
|
||||||
from setuptools.command import install_scripts
|
|
||||||
File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setuptools/command/install_scripts.py", line 3, in <module>
|
|
||||||
from pkg_resources import Distribution, PathMetadata, ensure_directory
|
|
||||||
File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/pkg_resources.py", line 1545, in <module>
|
|
||||||
register_loader_type(importlib_bootstrap.SourceFileLoader, DefaultProvider)
|
|
||||||
AttributeError: module 'importlib._bootstrap' has no attribute 'SourceFileLoader'
|
|
||||||
----------------------------------------
|
|
||||||
ERROR: Command errored out with exit status 1: python setup.py egg_info Check the logs for full command output.
|
|
||||||
----------------------------------------
|
|
||||||
ERROR: Command errored out with exit status 1: /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/venv/bin/python /builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip install --ignore-installed --no-user --prefix /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-build-env-ntp1m4dh/overlay --no-warn-script-location --no-binary :all: --only-binary :none: -i https://pypi.org/simple --find-links file:///tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages -- setuptools Check the logs for full command output.
|
|
||||||
-- stdout: --------------------
|
|
||||||
Looking in links: file:///tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages
|
|
||||||
Processing /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages/pep517_setup_and_pyproject
|
|
||||||
Installing build dependencies: started
|
|
||||||
Installing build dependencies: finished with status 'error'
|
|
||||||
_______________________ test_config_file_override_stack ________________________
|
|
||||||
script = <tests.lib.PipTestEnvironment object at 0x7fe950d9b7f0>
|
|
||||||
virtualenv = <VirtualEnvironment /tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/venv>
|
|
||||||
def test_config_file_override_stack(script, virtualenv):
|
|
||||||
"""
|
|
||||||
Test config files (global, overriding a global config with a
|
|
||||||
local, overriding all with a command line flag).
|
|
||||||
|
|
||||||
"""
|
|
||||||
fd, config_file = tempfile.mkstemp('-pip.cfg', 'test-')
|
|
||||||
try:
|
|
||||||
> _test_config_file_override_stack(script, virtualenv, config_file)
|
|
||||||
tests/functional/test_install_config.py:144:
|
|
||||||
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
|
|
||||||
tests/functional/test_install_config.py:172: in _test_config_file_override_stack
|
|
||||||
result = script.pip(
|
|
||||||
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
|
|
||||||
self = <tests.lib.PipTestEnvironment object at 0x7fe950d9b7f0>
|
|
||||||
args = ('python', '-m', 'pip', 'install', '-vvv', '--index-url', ...)
|
|
||||||
kw = {'expect_stderr': True}
|
|
||||||
cwd = Path('/tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/scratch')
|
|
||||||
run_from = None, allow_stderr_error = False, allow_stderr_warning = False
|
|
||||||
expect_error = None
|
|
||||||
def run(self, *args, **kw):
|
|
||||||
"""
|
|
||||||
:param allow_stderr_error: whether a logged error is allowed in
|
|
||||||
stderr. Passing True for this argument implies
|
|
||||||
`allow_stderr_warning` since warnings are weaker than errors.
|
|
||||||
:param allow_stderr_warning: whether a logged warning (or
|
|
||||||
deprecation message) is allowed in stderr.
|
|
||||||
:param expect_error: if False (the default), asserts that the command
|
|
||||||
exits with 0. Otherwise, asserts that the command exits with a
|
|
||||||
non-zero exit code. Passing True also implies allow_stderr_error
|
|
||||||
and allow_stderr_warning.
|
|
||||||
:param expect_stderr: whether to allow warnings in stderr (equivalent
|
|
||||||
to `allow_stderr_warning`). This argument is an abbreviated
|
|
||||||
version of `allow_stderr_warning` and is also kept for backwards
|
|
||||||
compatibility.
|
|
||||||
"""
|
|
||||||
if self.verbose:
|
|
||||||
print('>> running %s %s' % (args, kw))
|
|
||||||
|
|
||||||
cwd = kw.pop('cwd', None)
|
|
||||||
run_from = kw.pop('run_from', None)
|
|
||||||
assert not cwd or not run_from, "Don't use run_from; it's going away"
|
|
||||||
cwd = cwd or run_from or self.cwd
|
|
||||||
if sys.platform == 'win32':
|
|
||||||
# Partial fix for ScriptTest.run using `shell=True` on Windows.
|
|
||||||
args = [str(a).replace('^', '^^').replace('&', '^&') for a in args]
|
|
||||||
|
|
||||||
# Remove `allow_stderr_error` and `allow_stderr_warning` before
|
|
||||||
# calling run() because PipTestEnvironment doesn't support them.
|
|
||||||
allow_stderr_error = kw.pop('allow_stderr_error', None)
|
|
||||||
allow_stderr_warning = kw.pop('allow_stderr_warning', None)
|
|
||||||
|
|
||||||
# Propagate default values.
|
|
||||||
expect_error = kw.get('expect_error')
|
|
||||||
if expect_error:
|
|
||||||
# Then default to allowing logged errors.
|
|
||||||
if allow_stderr_error is not None and not allow_stderr_error:
|
|
||||||
raise RuntimeError(
|
|
||||||
'cannot pass allow_stderr_error=False with '
|
|
||||||
'expect_error=True'
|
|
||||||
)
|
|
||||||
allow_stderr_error = True
|
|
||||||
|
|
||||||
elif kw.get('expect_stderr'):
|
|
||||||
# Then default to allowing logged warnings.
|
|
||||||
if allow_stderr_warning is not None and not allow_stderr_warning:
|
|
||||||
raise RuntimeError(
|
|
||||||
'cannot pass allow_stderr_warning=False with '
|
|
||||||
'expect_stderr=True'
|
|
||||||
)
|
|
||||||
allow_stderr_warning = True
|
|
||||||
|
|
||||||
if allow_stderr_error:
|
|
||||||
if allow_stderr_warning is not None and not allow_stderr_warning:
|
|
||||||
raise RuntimeError(
|
|
||||||
'cannot pass allow_stderr_warning=False with '
|
|
||||||
'allow_stderr_error=True'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Default values if not set.
|
|
||||||
if allow_stderr_error is None:
|
|
||||||
allow_stderr_error = False
|
|
||||||
if allow_stderr_warning is None:
|
|
||||||
allow_stderr_warning = allow_stderr_error
|
|
||||||
|
|
||||||
# Pass expect_stderr=True to allow any stderr. We do this because
|
|
||||||
# we do our checking of stderr further on in check_stderr().
|
|
||||||
kw['expect_stderr'] = True
|
|
||||||
> result = super(PipTestEnvironment, self).run(cwd=cwd, *args, **kw)
|
|
||||||
E AssertionError: Script returned code: 1
|
|
||||||
tests/lib/__init__.py:586: AssertionError
|
|
||||||
----------------------------- Captured stdout call -----------------------------
|
|
||||||
Script result: python -m pip install -vvv --index-url https://pypi.org/simple/ INITools
|
|
||||||
return code: 1
|
|
||||||
-- stderr: --------------------
|
|
||||||
WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f9669c3d8b0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
|
|
||||||
WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f9669c3da60>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
|
|
||||||
WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f9669c3dbe0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
|
|
||||||
WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f9669c3dd60>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
|
|
||||||
WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f966900f490>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
|
|
||||||
ERROR: Could not find a version that satisfies the requirement INITools (from versions: none)
|
|
||||||
ERROR: No matching distribution found for INITools
|
|
||||||
-- stdout: --------------------
|
|
||||||
Created temporary directory: /tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/tmp/pip-ephem-wheel-cache-6gj33ens
|
|
||||||
Created temporary directory: /tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/tmp/pip-req-tracker-s7_2cwgc
|
|
||||||
Created requirements tracker '/tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/tmp/pip-req-tracker-s7_2cwgc'
|
|
||||||
Created temporary directory: /tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/tmp/pip-install-_91mh3df
|
|
||||||
Looking in indexes: https://pypi.org/simple/
|
|
||||||
1 location(s) to search for versions of INITools:
|
|
||||||
* https://pypi.org/simple/initools/
|
|
||||||
Getting page https://pypi.org/simple/initools/
|
|
||||||
Found index url https://pypi.org/simple/
|
|
||||||
Looking up "https://pypi.org/simple/initools/" in the cache
|
|
||||||
Request header has "max_age" as 0, cache bypassed
|
|
||||||
Starting new HTTPS connection (1): pypi.org:443
|
|
||||||
Incremented Retry for (url='/simple/initools/'): Retry(total=4, connect=None, read=None, redirect=None, status=None)
|
|
||||||
Starting new HTTPS connection (2): pypi.org:443
|
|
||||||
Incremented Retry for (url='/simple/initools/'): Retry(total=3, connect=None, read=None, redirect=None, status=None)
|
|
||||||
Starting new HTTPS connection (3): pypi.org:443
|
|
||||||
Incremented Retry for (url='/simple/initools/'): Retry(total=2, connect=None, read=None, redirect=None, status=None)
|
|
||||||
Starting new HTTPS connection (4): pypi.org:443
|
|
||||||
Incremented Retry for (url='/simple/initools/'): Retry(total=1, connect=None, read=None, redirect=None, status=None)
|
|
||||||
Starting new HTTPS connection (5): pypi.org:443
|
|
||||||
Incremented Retry for (url='/simple/initools/'): Retry(total=0, connect=None, read=None, redirect=None, status=None)
|
|
||||||
Starting new HTTPS connection (6): pypi.org:443
|
|
||||||
Could not fetch URL https://pypi.org/simple/initools/: connection error: HTTPSConnectionPool(host='pypi.org', port=443): Max retries exceeded with url: /simple/initools/ (Caused by NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f9669c15b50>: Failed to establish a new connection: [Errno -2] Name or service not known')) - skipping
|
|
||||||
Given no hashes to check 0 links for project 'INITools': discarding no candidates
|
|
||||||
Cleaning up...
|
|
||||||
Removed build tracker '/tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/tmp/pip-req-tracker-s7_2cwgc'
|
|
||||||
Exception information:
|
|
||||||
Traceback (most recent call last):
|
|
||||||
File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/cli/base_command.py", line 153, in _main
|
|
||||||
status = self.run(options, args)
|
|
||||||
File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/commands/install.py", line 401, in run
|
|
||||||
resolver.resolve(requirement_set)
|
|
||||||
File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/legacy_resolve.py", line 202, in resolve
|
|
||||||
self._resolve_one(requirement_set, req)
|
|
||||||
File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/legacy_resolve.py", line 368, in _resolve_one
|
|
||||||
abstract_dist = self._get_abstract_dist_for(req_to_install)
|
|
||||||
File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/legacy_resolve.py", line 314, in _get_abstract_dist_for
|
|
||||||
req.populate_link(self.finder, upgrade_allowed, self.require_hashes)
|
|
||||||
File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/req/req_install.py", line 226, in populate_link
|
|
||||||
self.link = finder.find_requirement(self, upgrade)
|
|
||||||
File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/index.py", line 905, in find_requirement
|
|
||||||
raise DistributionNotFound(
|
|
||||||
pip._internal.exceptions.DistributionNotFound: No matching distribution found for INITools
|
|
||||||
_______________________ test_no_upgrade_unless_requested _______________________
|
|
||||||
script = <tests.lib.PipTestEnvironment object at 0x7fe950d86070>
|
|
||||||
def test_no_upgrade_unless_requested(script):
|
|
||||||
"""
|
|
||||||
No upgrade if not specifically requested.
|
|
||||||
|
|
||||||
"""
|
|
||||||
> script.pip('install', 'INITools==0.1')
|
|
||||||
tests/functional/test_install_upgrade.py:16:
|
|
||||||
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
|
|
||||||
self = <tests.lib.PipTestEnvironment object at 0x7fe950d86070>
|
|
||||||
args = ('python', '-m', 'pip', 'install', 'INITools==0.1')
|
|
||||||
kw = {'expect_stderr': True}
|
|
||||||
cwd = Path('/tmp/pytest-of-mockbuild/pytest-0/test_no_upgrade_unless_request0/workspace/scratch')
|
|
||||||
run_from = None, allow_stderr_error = False, allow_stderr_warning = False
|
|
||||||
expect_error = None
|
|
||||||
def run(self, *args, **kw):
|
|
||||||
"""
|
|
||||||
:param allow_stderr_error: whether a logged error is allowed in
|
|
||||||
stderr. Passing True for this argument implies
|
|
||||||
`allow_stderr_warning` since warnings are weaker than errors.
|
|
||||||
:param allow_stderr_warning: whether a logged warning (or
|
|
||||||
deprecation message) is allowed in stderr.
|
|
||||||
:param expect_error: if False (the default), asserts that the command
|
|
||||||
exits with 0. Otherwise, asserts that the command exits with a
|
|
||||||
non-zero exit code. Passing True also implies allow_stderr_error
|
|
||||||
and allow_stderr_warning.
|
|
||||||
:param expect_stderr: whether to allow warnings in stderr (equivalent
|
|
||||||
to `allow_stderr_warning`). This argument is an abbreviated
|
|
||||||
version of `allow_stderr_warning` and is also kept for backwards
|
|
||||||
compatibility.
|
|
||||||
"""
|
|
||||||
if self.verbose:
|
|
||||||
print('>> running %s %s' % (args, kw))
|
|
||||||
|
|
||||||
cwd = kw.pop('cwd', None)
|
|
||||||
run_from = kw.pop('run_from', None)
|
|
||||||
assert not cwd or not run_from, "Don't use run_from; it's going away"
|
|
||||||
cwd = cwd or run_from or self.cwd
|
|
||||||
if sys.platform == 'win32':
|
|
||||||
# Partial fix for ScriptTest.run using `shell=True` on Windows.
|
|
||||||
args = [str(a).replace('^', '^^').replace('&', '^&') for a in args]
|
|
||||||
|
|
||||||
# Remove `allow_stderr_error` and `allow_stderr_warning` before
|
|
||||||
# calling run() because PipTestEnvironment doesn't support them.
|
|
||||||
allow_stderr_error = kw.pop('allow_stderr_error', None)
|
|
||||||
allow_stderr_warning = kw.pop('allow_stderr_warning', None)
|
|
||||||
|
|
||||||
# Propagate default values.
|
|
||||||
expect_error = kw.get('expect_error')
|
|
||||||
if expect_error:
|
|
||||||
# Then default to allowing logged errors.
|
|
||||||
if allow_stderr_error is not None and not allow_stderr_error:
|
|
||||||
raise RuntimeError(
|
|
||||||
'cannot pass allow_stderr_error=False with '
|
|
||||||
'expect_error=True'
|
|
||||||
)
|
|
||||||
allow_stderr_error = True
|
|
||||||
|
|
||||||
elif kw.get('expect_stderr'):
|
|
||||||
# Then default to allowing logged warnings.
|
|
||||||
if allow_stderr_warning is not None and not allow_stderr_warning:
|
|
||||||
raise RuntimeError(
|
|
||||||
'cannot pass allow_stderr_warning=False with '
|
|
||||||
'expect_stderr=True'
|
|
||||||
)
|
|
||||||
allow_stderr_warning = True
|
|
||||||
|
|
||||||
if allow_stderr_error:
|
|
||||||
if allow_stderr_warning is not None and not allow_stderr_warning:
|
|
||||||
raise RuntimeError(
|
|
||||||
'cannot pass allow_stderr_warning=False with '
|
|
||||||
'allow_stderr_error=True'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Default values if not set.
|
|
||||||
if allow_stderr_error is None:
|
|
||||||
allow_stderr_error = False
|
|
||||||
if allow_stderr_warning is None:
|
|
||||||
allow_stderr_warning = allow_stderr_error
|
|
||||||
|
|
||||||
# Pass expect_stderr=True to allow any stderr. We do this because
|
|
||||||
# we do our checking of stderr further on in check_stderr().
|
|
||||||
kw['expect_stderr'] = True
|
|
||||||
> result = super(PipTestEnvironment, self).run(cwd=cwd, *args, **kw)
|
|
||||||
E AssertionError: Script returned code: 1
|
|
||||||
tests/lib/__init__.py:586: AssertionError
|
|
||||||
----------------------------- Captured stdout call -----------------------------
|
|
||||||
Script result: python -m pip install INITools==0.1
|
|
||||||
return code: 1
|
|
||||||
-- stderr: --------------------
|
|
||||||
WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fd66cc36700>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
|
|
||||||
WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fd66cc36c40>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
|
|
||||||
WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fd66cc36dc0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
|
|
||||||
WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fd66cc36f40>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
|
|
||||||
WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fd66be48100>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
|
|
||||||
ERROR: Could not find a version that satisfies the requirement INITools==0.1 (from versions: none)
|
|
||||||
ERROR: No matching distribution found for INITools==0.1
|
|
||||||
---
|
|
||||||
tests/functional/test_freeze.py | 3 +++
|
|
||||||
tests/functional/test_install.py | 1 +
|
|
||||||
tests/functional/test_install_config.py | 1 +
|
|
||||||
tests/functional/test_install_upgrade.py | 1 +
|
|
||||||
4 files changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py
|
|
||||||
index 546a482..aabb0ca 100644
|
|
||||||
--- a/tests/functional/test_freeze.py
|
|
||||||
+++ b/tests/functional/test_freeze.py
|
|
||||||
@@ -705,6 +705,7 @@ def test_freeze_user(script, virtualenv, data):
|
|
||||||
assert 'simple2' not in result.stdout
|
|
||||||
|
|
||||||
|
|
||||||
+@pytest.mark.network
|
|
||||||
def test_freeze_path(tmpdir, script, data):
|
|
||||||
"""
|
|
||||||
Test freeze with --path.
|
|
||||||
@@ -718,6 +719,7 @@ def test_freeze_path(tmpdir, script, data):
|
|
||||||
_check_output(result.stdout, expected)
|
|
||||||
|
|
||||||
|
|
||||||
+@pytest.mark.network
|
|
||||||
def test_freeze_path_exclude_user(tmpdir, script, data):
|
|
||||||
"""
|
|
||||||
Test freeze with --path and make sure packages from --user are not picked
|
|
||||||
@@ -739,6 +741,7 @@ def test_freeze_path_exclude_user(tmpdir, script, data):
|
|
||||||
_check_output(result.stdout, expected)
|
|
||||||
|
|
||||||
|
|
||||||
+@pytest.mark.network
|
|
||||||
def test_freeze_path_multiple(tmpdir, script, data):
|
|
||||||
"""
|
|
||||||
Test freeze with multiple --path arguments.
|
|
||||||
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
|
|
||||||
index 0bea054..b816df6 100644
|
|
||||||
--- a/tests/functional/test_install.py
|
|
||||||
+++ b/tests/functional/test_install.py
|
|
||||||
@@ -1274,6 +1274,7 @@ def test_install_no_binary_disables_building_wheels(script, data, with_wheel):
|
|
||||||
assert "Running setup.py install for upper" in str(res), str(res)
|
|
||||||
|
|
||||||
|
|
||||||
+@pytest.mark.network
|
|
||||||
def test_install_no_binary_builds_pep_517_wheel(script, data, with_wheel):
|
|
||||||
to_install = data.packages.joinpath('pep517_setup_and_pyproject')
|
|
||||||
res = script.pip(
|
|
||||||
diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py
|
|
||||||
index bcf83f1..c9c60a2 100644
|
|
||||||
--- a/tests/functional/test_install_config.py
|
|
||||||
+++ b/tests/functional/test_install_config.py
|
|
||||||
@@ -133,6 +133,7 @@ def test_command_line_appends_correctly(script, data):
|
|
||||||
), 'stdout: {}'.format(result.stdout)
|
|
||||||
|
|
||||||
|
|
||||||
+@pytest.mark.network
|
|
||||||
def test_config_file_override_stack(script, virtualenv):
|
|
||||||
"""
|
|
||||||
Test config files (global, overriding a global config with a
|
|
||||||
diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py
|
|
||||||
index 36b518b..c34a961 100644
|
|
||||||
--- a/tests/functional/test_install_upgrade.py
|
|
||||||
+++ b/tests/functional/test_install_upgrade.py
|
|
||||||
@@ -8,6 +8,7 @@ from tests.lib import assert_all_changes, pyversion
|
|
||||||
from tests.lib.local_repos import local_checkout
|
|
||||||
|
|
||||||
|
|
||||||
+@pytest.mark.network
|
|
||||||
def test_no_upgrade_unless_requested(script):
|
|
||||||
"""
|
|
||||||
No upgrade if not specifically requested.
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
--- /usr/bin/pip3 2019-11-12 17:37:34.793131862 +0100
|
|
||||||
+++ pip3 2019-11-12 17:40:42.014107134 +0100
|
|
||||||
@@ -2,7 +2,19 @@
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
import re
|
|
||||||
import sys
|
|
||||||
-from pip._internal.main import main
|
|
||||||
+try:
|
|
||||||
+ from pip._internal.main import main
|
|
||||||
+except ImportError:
|
|
||||||
+ try:
|
|
||||||
+ # If the user has downgraded pip, the above import will fail.
|
|
||||||
+ # Let's try older methods of invoking it:
|
|
||||||
+
|
|
||||||
+ # pip 19 uses this
|
|
||||||
+ from pip._internal import main
|
|
||||||
+ except ImportError:
|
|
||||||
+ # older pip versions use this
|
|
||||||
+ from pip import main
|
|
||||||
+
|
|
||||||
if __name__ == '__main__':
|
|
||||||
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
|
|
||||||
sys.exit(main())
|
|
|
@ -0,0 +1,78 @@
|
||||||
|
Minimal patch for pip
|
||||||
|
|
||||||
|
diff -rU3 pip-orig/src/pip/_internal/utils/unpacking.py pip/src/pip/_internal/utils/unpacking.py
|
||||||
|
--- pip-orig/src/pip/_internal/utils/unpacking.py 2022-11-05 16:25:43.000000000 +0100
|
||||||
|
+++ pip/src/pip/_internal/utils/unpacking.py 2023-08-08 13:17:47.705613554 +0200
|
||||||
|
@@ -184,6 +184,13 @@
|
||||||
|
raise InstallationError(
|
||||||
|
message.format(filename, path, location)
|
||||||
|
)
|
||||||
|
+
|
||||||
|
+ # Call the `data` filter for its side effect (raising exception)
|
||||||
|
+ try:
|
||||||
|
+ tarfile.data_filter(member.replace(name=fn), location)
|
||||||
|
+ except tarfile.LinkOutsideDestinationError:
|
||||||
|
+ pass
|
||||||
|
+
|
||||||
|
if member.isdir():
|
||||||
|
ensure_dir(path)
|
||||||
|
elif member.issym():
|
||||||
|
|
||||||
|
|
||||||
|
Test from https://github.com/pypa/pip/pull/12214
|
||||||
|
|
||||||
|
diff -rU3 pip-orig/tests/unit/test_utils_unpacking.py pip/tests/unit/test_utils_unpacking.py
|
||||||
|
--- pip-orig/tests/unit/test_utils_unpacking.py 2022-11-05 16:25:43.000000000 +0100
|
||||||
|
+++ pip/tests/unit/test_utils_unpacking.py 2023-08-08 13:17:35.151540108 +0200
|
||||||
|
@@ -171,6 +171,23 @@
|
||||||
|
test_tar = self.make_tar_file('test_tar.tar', files)
|
||||||
|
untar_file(test_tar, self.tempdir)
|
||||||
|
|
||||||
|
+ def test_unpack_tar_filter(self) -> None:
|
||||||
|
+ """
|
||||||
|
+ Test that the tarfile.data_filter is used to disallow dangerous
|
||||||
|
+ behaviour (PEP-721)
|
||||||
|
+ """
|
||||||
|
+ test_tar = os.path.join(self.tempdir, "test_tar_filter.tar")
|
||||||
|
+ with tarfile.open(test_tar, "w") as mytar:
|
||||||
|
+ file_tarinfo = tarfile.TarInfo("bad-link")
|
||||||
|
+ file_tarinfo.type = tarfile.SYMTYPE
|
||||||
|
+ file_tarinfo.linkname = "../../../../pwn"
|
||||||
|
+ mytar.addfile(file_tarinfo, io.BytesIO(b""))
|
||||||
|
+ with pytest.raises(InstallationError) as e:
|
||||||
|
+ untar_file(test_tar, self.tempdir)
|
||||||
|
+
|
||||||
|
+ assert "is outside the destination" in str(e.value)
|
||||||
|
+
|
||||||
|
+
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('args, expected', [
|
||||||
|
# Test the second containing the first.
|
||||||
|
|
||||||
|
|
||||||
|
Patch for vendored distlib from https://github.com/pypa/distlib/pull/201
|
||||||
|
|
||||||
|
diff --git a/distlib/util.py b/distlib/util.py
|
||||||
|
index e0622e4..4349d0b 100644
|
||||||
|
--- a/src/pip/_vendor/distlib/util.py
|
||||||
|
+++ b/src/pip/_vendor/distlib/util.py
|
||||||
|
@@ -1249,6 +1249,19 @@ def check_path(path):
|
||||||
|
for tarinfo in archive.getmembers():
|
||||||
|
if not isinstance(tarinfo.name, text_type):
|
||||||
|
tarinfo.name = tarinfo.name.decode('utf-8')
|
||||||
|
+
|
||||||
|
+ # Limit extraction of dangerous items, if this Python
|
||||||
|
+ # allows it easily. If not, just trust the input.
|
||||||
|
+ # See: https://docs.python.org/3/library/tarfile.html#extraction-filters
|
||||||
|
+ def extraction_filter(member, path):
|
||||||
|
+ """Run tarfile.tar_fillter, but raise the expected ValueError"""
|
||||||
|
+ # This is only called if the current Python has tarfile filters
|
||||||
|
+ try:
|
||||||
|
+ return tarfile.tar_filter(member, path)
|
||||||
|
+ except tarfile.FilterError as exc:
|
||||||
|
+ raise ValueError(str(exc))
|
||||||
|
+ archive.extraction_filter = extraction_filter
|
||||||
|
+
|
||||||
|
archive.extractall(dest_dir)
|
||||||
|
|
||||||
|
finally:
|
|
@ -0,0 +1,35 @@
|
||||||
|
From cf96ff346639d1b9f5efa3fd0976694e04df3f5f 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..d174ced 100644
|
||||||
|
--- a/src/pip/_vendor/certifi/core.py
|
||||||
|
+++ b/src/pip/_vendor/certifi/core.py
|
||||||
|
@@ -9,6 +9,7 @@ This module returns the installation location of cacert.pem or its contents.
|
||||||
|
import os
|
||||||
|
|
||||||
|
try:
|
||||||
|
+ raise ImportError # force fallback
|
||||||
|
from importlib.resources import path as get_path, read_text
|
||||||
|
|
||||||
|
_CACERT_CTX = None
|
||||||
|
@@ -51,9 +52,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():
|
||||||
|
--
|
||||||
|
2.25.4
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
From aab24967a03bda3b0999d80562a6064c27d1e0e0 Mon Sep 17 00:00:00 2001
|
From 74bb5d26e232493de43adfa1f4b42b66fd701294 Mon Sep 17 00:00:00 2001
|
||||||
From: Tomas Orsava <torsava@redhat.com>
|
From: Tomas Hrnciar <thrnciar@redhat.com>
|
||||||
Date: Tue, 12 Nov 2019 17:15:08 +0100
|
Date: Sun, 26 Apr 2020 13:52:24 +0200
|
||||||
Subject: [PATCH] Downstream only patch
|
Subject: [PATCH] Downstream only patch
|
||||||
|
|
||||||
Emit a warning to the user if pip install is run with root privileges
|
Emit a warning to the user if pip install is run with root privileges
|
||||||
|
@ -10,21 +10,21 @@ Issue upstream: https://github.com/pypa/pip/issues/4288
|
||||||
1 file changed, 19 insertions(+)
|
1 file changed, 19 insertions(+)
|
||||||
|
|
||||||
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
|
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
|
||||||
index 5842d18..a6104b4 100644
|
index 70bda2e2..1e750ae1 100644
|
||||||
--- a/src/pip/_internal/commands/install.py
|
--- a/src/pip/_internal/commands/install.py
|
||||||
+++ b/src/pip/_internal/commands/install.py
|
+++ b/src/pip/_internal/commands/install.py
|
||||||
@@ -12,6 +12,8 @@ import logging
|
@@ -13,6 +13,8 @@ import operator
|
||||||
import operator
|
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
|
import site
|
||||||
+import sys
|
+import sys
|
||||||
+from os import path
|
+from os import path
|
||||||
from optparse import SUPPRESS_HELP
|
from optparse import SUPPRESS_HELP
|
||||||
|
|
||||||
from pip._vendor import pkg_resources
|
from pip._vendor import pkg_resources
|
||||||
@@ -281,6 +283,23 @@ class InstallCommand(RequirementCommand):
|
@@ -241,6 +243,23 @@ class InstallCommand(RequirementCommand):
|
||||||
def run(self, options, args):
|
raise CommandError("Can not combine '--user' and '--target'")
|
||||||
# type: (Values, List[Any]) -> int
|
|
||||||
cmdoptions.check_install_build_global(options)
|
cmdoptions.check_install_build_global(options)
|
||||||
+
|
+
|
||||||
+ def is_venv():
|
+ def is_venv():
|
||||||
|
@ -33,7 +33,7 @@ index 5842d18..a6104b4 100644
|
||||||
+ sys.base_prefix != sys.prefix))
|
+ sys.base_prefix != sys.prefix))
|
||||||
+
|
+
|
||||||
+ # Check whether we have root privileges and aren't in venv/virtualenv
|
+ # Check whether we have root privileges and aren't in venv/virtualenv
|
||||||
+ if os.getuid() == 0 and not is_venv():
|
+ if os.getuid() == 0 and not is_venv() and not options.root_path:
|
||||||
+ command = path.basename(sys.argv[0])
|
+ command = path.basename(sys.argv[0])
|
||||||
+ if command == "__main__.py":
|
+ if command == "__main__.py":
|
||||||
+ command = path.basename(sys.executable) + " -m pip"
|
+ command = path.basename(sys.executable) + " -m pip"
|
||||||
|
@ -47,5 +47,5 @@ index 5842d18..a6104b4 100644
|
||||||
if options.upgrade:
|
if options.upgrade:
|
||||||
upgrade_strategy = options.upgrade_strategy
|
upgrade_strategy = options.upgrade_strategy
|
||||||
--
|
--
|
||||||
2.20.1
|
2.23.0
|
||||||
|
|
|
@ -0,0 +1,72 @@
|
||||||
|
From 7c36cb21910b415e0eb171d0f6c4dbf72382fdaf Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||||
|
Date: Tue, 10 Mar 2020 11:03:22 +0100
|
||||||
|
Subject: [PATCH] Don't warn the user about pip._internal.main() entrypoint
|
||||||
|
|
||||||
|
In Fedora, we use that in ensurepip and users cannot do anything about it,
|
||||||
|
this warning is juts moot. Also, the warning breaks CPython test suite.
|
||||||
|
---
|
||||||
|
src/pip/_internal/__init__.py | 2 +-
|
||||||
|
src/pip/_internal/utils/entrypoints.py | 19 ++++++++++---------
|
||||||
|
tests/functional/test_cli.py | 3 ++-
|
||||||
|
3 files changed, 13 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py
|
||||||
|
index 3aa8a46..0ec017b 100755
|
||||||
|
--- a/src/pip/_internal/__init__.py
|
||||||
|
+++ b/src/pip/_internal/__init__.py
|
||||||
|
@@ -15,4 +15,4 @@ def main(args=None):
|
||||||
|
"""
|
||||||
|
from pip._internal.utils.entrypoints import _wrapper
|
||||||
|
|
||||||
|
- return _wrapper(args)
|
||||||
|
+ return _wrapper(args, _nowarn=True)
|
||||||
|
diff --git a/src/pip/_internal/utils/entrypoints.py b/src/pip/_internal/utils/entrypoints.py
|
||||||
|
index befd01c..d6f3632 100644
|
||||||
|
--- a/src/pip/_internal/utils/entrypoints.py
|
||||||
|
+++ b/src/pip/_internal/utils/entrypoints.py
|
||||||
|
@@ -7,7 +7,7 @@ if MYPY_CHECK_RUNNING:
|
||||||
|
from typing import Optional, List
|
||||||
|
|
||||||
|
|
||||||
|
-def _wrapper(args=None):
|
||||||
|
+def _wrapper(args=None, _nowarn=False):
|
||||||
|
# type: (Optional[List[str]]) -> int
|
||||||
|
"""Central wrapper for all old entrypoints.
|
||||||
|
|
||||||
|
@@ -20,12 +20,13 @@ def _wrapper(args=None):
|
||||||
|
directing them to an appropriate place for help, we now define all of
|
||||||
|
our old entrypoints as wrappers for the current one.
|
||||||
|
"""
|
||||||
|
- sys.stderr.write(
|
||||||
|
- "WARNING: pip is being invoked by an old script wrapper. This will "
|
||||||
|
- "fail in a future version of pip.\n"
|
||||||
|
- "Please see https://github.com/pypa/pip/issues/5599 for advice on "
|
||||||
|
- "fixing the underlying issue.\n"
|
||||||
|
- "To avoid this problem you can invoke Python with '-m pip' instead of "
|
||||||
|
- "running pip directly.\n"
|
||||||
|
- )
|
||||||
|
+ if not _nowarn:
|
||||||
|
+ sys.stderr.write(
|
||||||
|
+ "WARNING: pip is being invoked by an old script wrapper. This will "
|
||||||
|
+ "fail in a future version of pip.\n"
|
||||||
|
+ "Please see https://github.com/pypa/pip/issues/5599 for advice on "
|
||||||
|
+ "fixing the underlying issue.\n"
|
||||||
|
+ "To avoid this problem you can invoke Python with '-m pip' instead of "
|
||||||
|
+ "running pip directly.\n"
|
||||||
|
+ )
|
||||||
|
return main(args)
|
||||||
|
diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
|
||||||
|
index e416315..7f57f67 100644
|
||||||
|
--- a/tests/functional/test_cli.py
|
||||||
|
+++ b/tests/functional/test_cli.py
|
||||||
|
@@ -31,4 +31,5 @@ def test_entrypoints_work(entrypoint, script):
|
||||||
|
result = script.pip("-V")
|
||||||
|
result2 = script.run("fake_pip", "-V", allow_stderr_warning=True)
|
||||||
|
assert result.stdout == result2.stdout
|
||||||
|
- assert "old script wrapper" in result2.stderr
|
||||||
|
+ if entrypoint[0] != "fake_pip = pip._internal:main":
|
||||||
|
+ assert "old script wrapper" in result2.stderr
|
||||||
|
--
|
||||||
|
2.24.1
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
--- /usr/bin/pip3 2019-11-12 17:37:34.793131862 +0100
|
||||||
|
+++ pip3 2019-11-12 17:40:42.014107134 +0100
|
||||||
|
@@ -2,7 +2,23 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
import re
|
||||||
|
import sys
|
||||||
|
-from pip._internal.cli.main import main
|
||||||
|
+
|
||||||
|
+try:
|
||||||
|
+ from pip._internal.cli.main import main
|
||||||
|
+except ImportError:
|
||||||
|
+ try:
|
||||||
|
+ from pip._internal.main import main
|
||||||
|
+ except ImportError:
|
||||||
|
+ try:
|
||||||
|
+ # If the user has downgraded pip, the above import will fail.
|
||||||
|
+ # Let's try older methods of invoking it:
|
||||||
|
+
|
||||||
|
+ # pip 19 uses this
|
||||||
|
+ from pip._internal import main
|
||||||
|
+ except ImportError:
|
||||||
|
+ # older pip versions use this
|
||||||
|
+ from pip import main
|
||||||
|
+
|
||||||
|
if __name__ == '__main__':
|
||||||
|
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
|
||||||
|
sys.exit(main())
|
|
@ -1,22 +1,25 @@
|
||||||
%bcond_with tests
|
%bcond_with tests
|
||||||
|
# RHEL: docs disabled because they need python3-sphinx, which needs
|
||||||
|
# python3-packaging, which is shahowed by python39-packaging during the build
|
||||||
|
# of the python39 module
|
||||||
%bcond_with doc
|
%bcond_with doc
|
||||||
|
|
||||||
%global srcname pip
|
%global srcname pip
|
||||||
%global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
|
%global base_version 20.2.4
|
||||||
%global python_wheeldir %{_datadir}/python38-wheels
|
%global upstream_version %{base_version}%{?prerel}
|
||||||
|
%global python_wheelname %{srcname}-%{upstream_version}-py2.py3-none-any.whl
|
||||||
|
%global python_wheeldir %{_datadir}/python%{python3_pkgversion}-wheels
|
||||||
|
|
||||||
%if %{with doc}
|
%if %{with doc}
|
||||||
|
# Commit hash to use from the repo https://github.com/pypa/pypa-docs-theme
|
||||||
%global pypa_theme_commit_hash d2e63fbfc62af3b7050f619b2f5bb8658985b931
|
%global pypa_theme_commit_hash d2e63fbfc62af3b7050f619b2f5bb8658985b931
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
|
%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
|
||||||
|
|
||||||
Name: python3x-%{srcname}
|
Name: python3x-%{srcname}
|
||||||
# When updating, update the bundled libraries versions bellow!
|
Version: %{base_version}%{?prerel:~%{prerel}}
|
||||||
# You can use vendor_meta.sh in the dist git repo
|
Release: 8%{?dist}.1
|
||||||
Version: 19.3.1
|
|
||||||
Release: 6%{?dist}
|
|
||||||
Summary: A tool for installing and managing Python packages
|
Summary: A tool for installing and managing Python packages
|
||||||
|
|
||||||
# We bundle a lot of libraries with pip, which itself is under MIT license.
|
# We bundle a lot of libraries with pip, which itself is under MIT license.
|
||||||
|
@ -38,17 +41,18 @@ Summary: A tool for installing and managing Python packages
|
||||||
# pep517: MIT
|
# pep517: MIT
|
||||||
# progress: ISC
|
# progress: ISC
|
||||||
# pyparsing: MIT
|
# pyparsing: MIT
|
||||||
# pytoml: MIT
|
|
||||||
# requests: ASL 2.0
|
# requests: ASL 2.0
|
||||||
|
# resolvelib: ISC
|
||||||
# retrying: ASL 2.0
|
# retrying: ASL 2.0
|
||||||
# setuptools: MIT
|
# setuptools: MIT
|
||||||
# six: MIT
|
# six: MIT
|
||||||
|
# toml: MIT
|
||||||
# urllib3: MIT
|
# urllib3: MIT
|
||||||
# webencodings: BSD
|
# webencodings: BSD
|
||||||
|
|
||||||
License: MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD)
|
License: MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD)
|
||||||
URL: https://pip.pypa.io/
|
URL: https://pip.pypa.io/
|
||||||
Source0: https://github.com/pypa/pip/archive/%{version}/%{srcname}-%{version}.tar.gz
|
Source0: https://github.com/pypa/pip/archive/%{upstream_version}/%{srcname}-%{upstream_version}.tar.gz
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
# Exclude i686 arch. Due to a modularity issue it's being added to the
|
# Exclude i686 arch. Due to a modularity issue it's being added to the
|
||||||
|
@ -58,10 +62,11 @@ ExcludeArch: i686
|
||||||
|
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
BuildRequires: /usr/bin/git
|
BuildRequires: /usr/bin/git
|
||||||
|
BuildRequires: /usr/bin/hg
|
||||||
BuildRequires: /usr/bin/bzr
|
BuildRequires: /usr/bin/bzr
|
||||||
BuildRequires: /usr/bin/svn
|
BuildRequires: /usr/bin/svn
|
||||||
BuildRequires: python38-setuptools-wheel
|
BuildRequires: python%{python3_pkgversion}-setuptools-wheel
|
||||||
BuildRequires: python38-wheel-wheel
|
BuildRequires: python%{python3_pkgversion}-wheel-wheel
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Themes required to build the docs.
|
# Themes required to build the docs.
|
||||||
|
@ -87,9 +92,10 @@ Patch3: remove-existing-dist-only-if-path-conflicts.patch
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1655253
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1655253
|
||||||
Patch4: dummy-certifi.patch
|
Patch4: dummy-certifi.patch
|
||||||
|
|
||||||
# Mark tests that need the Internet as network tests so we can skip them
|
# Don't warn the user about pip._internal.main() entrypoint
|
||||||
# https://github.com/pypa/pip/pull/7359
|
# In Fedora, we use that in ensurepip and users cannot do anything about it,
|
||||||
Patch5: network-tests.patch
|
# this warning is juts moot. Also, the warning breaks CPython test suite.
|
||||||
|
Patch5: nowarn-pip._internal.main.patch
|
||||||
|
|
||||||
# Patch for CVE-2021-3572 - pip incorrectly handled unicode separators in git references
|
# Patch for CVE-2021-3572 - pip incorrectly handled unicode separators in git references
|
||||||
# Upstream PR: https://github.com/pypa/pip/pull/9827
|
# Upstream PR: https://github.com/pypa/pip/pull/9827
|
||||||
|
@ -101,9 +107,13 @@ Patch6: CVE-2021-3572.patch
|
||||||
# Upstream fix: https://github.com/urllib3/urllib3/commit/2d4a3fee6de2fa45eb82169361918f759269b4ec
|
# Upstream fix: https://github.com/urllib3/urllib3/commit/2d4a3fee6de2fa45eb82169361918f759269b4ec
|
||||||
Patch7: CVE-2021-33503.patch
|
Patch7: CVE-2021-33503.patch
|
||||||
|
|
||||||
# Prevent infinite recursion with pip wheel with $TMPDIR in $PWD
|
# CVE-2007-4559, PEP-721, PEP-706: Use tarfile.data_filter for extracting
|
||||||
# https://github.com/pypa/pip/pull/7873
|
# - Minimal downstream-only patch, to be replaced by upstream solution
|
||||||
Patch8: fix-tmpdir-infinite-recursion.patch
|
# proposed in https://github.com/pypa/pip/pull/12214
|
||||||
|
# - Test patch submitted upstream in the above pull request
|
||||||
|
# - Patch for vendored distlib, accepted upstream:
|
||||||
|
# https://github.com/pypa/distlib/pull/201
|
||||||
|
Patch8: cve-2007-4559-tarfile.patch
|
||||||
|
|
||||||
# Downstream only patch
|
# Downstream only patch
|
||||||
# Users might have local installations of pip from using
|
# Users might have local installations of pip from using
|
||||||
|
@ -122,6 +132,10 @@ Patch8: fix-tmpdir-infinite-recursion.patch
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1767212
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1767212
|
||||||
# WARNING: /usr/bin/pip* are entrypoints, this cannot be applied in %%prep!
|
# WARNING: /usr/bin/pip* are entrypoints, this cannot be applied in %%prep!
|
||||||
# %%patch10 doesn't work outside of %%prep, so we add it as a source
|
# %%patch10 doesn't work outside of %%prep, so we add it as a source
|
||||||
|
# Note that since pip 20, old main() import paths are preserved for backwards
|
||||||
|
# compatibility: https://github.com/pypa/pip/issues/7498
|
||||||
|
# Meaning we don't need to update any of the older pips to support 20+
|
||||||
|
# We also don't need to update Pythons to use new import path in ensurepip
|
||||||
Source10: pip-allow-different-versions.patch
|
Source10: pip-allow-different-versions.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
@ -133,30 +147,32 @@ Packages" or "Pip Installs Python".
|
||||||
|
|
||||||
|
|
||||||
# Virtual provides for the packages bundled by pip.
|
# Virtual provides for the packages bundled by pip.
|
||||||
# You can find the versions in src/pip/_vendor/vendor.txt file.
|
# You can generate it with:
|
||||||
|
# %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{1}dist' src/pip/_vendor/vendor.txt
|
||||||
%global bundled() %{expand:
|
%global bundled() %{expand:
|
||||||
Provides: bundled(python%{1}dist(appdirs)) = 1.4.3
|
Provides: bundled(python%{1}dist(appdirs)) = 1.4.4
|
||||||
Provides: bundled(python%{1}dist(CacheControl)) = 0.12.5
|
Provides: bundled(python%{1}dist(cachecontrol)) = 0.12.6
|
||||||
Provides: bundled(python%{1}dist(certifi)) = 2019.9.11
|
Provides: bundled(python%{1}dist(certifi)) = 2020.6.20
|
||||||
Provides: bundled(python%{1}dist(chardet)) = 3.0.4
|
Provides: bundled(python%{1}dist(chardet)) = 3.0.4
|
||||||
Provides: bundled(python%{1}dist(colorama)) = 0.4.1
|
Provides: bundled(python%{1}dist(colorama)) = 0.4.3
|
||||||
Provides: bundled(python%{1}dist(contextlib2)) = 0.6.0
|
Provides: bundled(python%{1}dist(contextlib2)) = 0.6^post1
|
||||||
Provides: bundled(python%{1}dist(distlib)) = 0.2.9.post0
|
Provides: bundled(python%{1}dist(distlib)) = 0.3.1
|
||||||
Provides: bundled(python%{1}dist(distro)) = 1.4.0
|
Provides: bundled(python%{1}dist(distro)) = 1.5
|
||||||
Provides: bundled(python%{1}dist(html5lib)) = 1.0.1
|
Provides: bundled(python%{1}dist(html5lib)) = 1.1
|
||||||
Provides: bundled(python%{1}dist(idna)) = 2.8
|
Provides: bundled(python%{1}dist(idna)) = 2.10
|
||||||
Provides: bundled(python%{1}dist(ipaddress)) = 1.0.22
|
Provides: bundled(python%{1}dist(ipaddress)) = 1.0.23
|
||||||
Provides: bundled(python%{1}dist(msgpack)) = 0.6.2
|
Provides: bundled(python%{1}dist(msgpack)) = 1
|
||||||
Provides: bundled(python%{1}dist(packaging)) = 19.2
|
Provides: bundled(python%{1}dist(packaging)) = 20.4
|
||||||
Provides: bundled(python%{1}dist(pep517)) = 0.7.0
|
Provides: bundled(python%{1}dist(pep517)) = 0.8.2
|
||||||
Provides: bundled(python%{1}dist(progress)) = 1.5
|
Provides: bundled(python%{1}dist(progress)) = 1.5
|
||||||
Provides: bundled(python%{1}dist(pyparsing)) = 2.4.2
|
Provides: bundled(python%{1}dist(pyparsing)) = 2.4.7
|
||||||
Provides: bundled(python%{1}dist(pytoml)) = 0.1.21
|
Provides: bundled(python%{1}dist(requests)) = 2.24
|
||||||
Provides: bundled(python%{1}dist(requests)) = 2.22.0
|
Provides: bundled(python%{1}dist(resolvelib)) = 0.4
|
||||||
Provides: bundled(python%{1}dist(retrying)) = 1.3.3
|
Provides: bundled(python%{1}dist(retrying)) = 1.3.3
|
||||||
Provides: bundled(python%{1}dist(setuptools)) = 41.4.0
|
Provides: bundled(python%{1}dist(setuptools)) = 44
|
||||||
Provides: bundled(python%{1}dist(six)) = 1.12.0
|
Provides: bundled(python%{1}dist(six)) = 1.15
|
||||||
Provides: bundled(python%{1}dist(urllib3)) = 1.25.6
|
Provides: bundled(python%{1}dist(toml)) = 0.10.1
|
||||||
|
Provides: bundled(python%{1}dist(urllib3)) = 1.25.9
|
||||||
Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
|
Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -183,35 +199,48 @@ Summary: A tool for installing and managing Python3 packages
|
||||||
|
|
||||||
BuildRequires: python%{python3_pkgversion}-devel
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
BuildRequires: python%{python3_pkgversion}-rpm-macros
|
BuildRequires: python%{python3_pkgversion}-rpm-macros
|
||||||
|
# python3 bootstrap: this is rebuilt before the final build of python3, which
|
||||||
|
# adds the dependency on python3-rpm-generators, so we require it manually
|
||||||
|
# Note that the package prefix is always python3-, even if we build for 3.X
|
||||||
|
BuildRequires: python3-rpm-generators
|
||||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||||
BuildRequires: bash-completion
|
BuildRequires: bash-completion
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
|
BuildRequires: python%{python3_pkgversion}-cryptography
|
||||||
BuildRequires: python%{python3_pkgversion}-mock
|
BuildRequires: python%{python3_pkgversion}-mock
|
||||||
BuildRequires: python%{python3_pkgversion}-pytest
|
BuildRequires: python%{python3_pkgversion}-pytest
|
||||||
BuildRequires: python%{python3_pkgversion}-pretend
|
BuildRequires: python%{python3_pkgversion}-pretend
|
||||||
BuildRequires: python%{python3_pkgversion}-freezegun
|
BuildRequires: python%{python3_pkgversion}-freezegun
|
||||||
BuildRequires: python%{python3_pkgversion}-scripttest
|
BuildRequires: python%{python3_pkgversion}-scripttest
|
||||||
BuildRequires: python%{python3_pkgversion}-virtualenv
|
BuildRequires: python%{python3_pkgversion}-virtualenv
|
||||||
|
BuildRequires: python%{python3_pkgversion}-werkzeug
|
||||||
BuildRequires: python%{python3_pkgversion}-pyyaml
|
BuildRequires: python%{python3_pkgversion}-pyyaml
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: python%{python3_pkgversion}-wheel
|
BuildRequires: python%{python3_pkgversion}-wheel
|
||||||
BuildRequires: ca-certificates
|
BuildRequires: ca-certificates
|
||||||
Requires: ca-certificates
|
Requires: ca-certificates
|
||||||
Requires: python%{python3_pkgversion}-setuptools
|
|
||||||
|
# This was previously required and we keep it recommended because a lot of
|
||||||
|
# sdists installed via pip will try to import setuptools.
|
||||||
|
# But pip doesn't actually require setuptools.
|
||||||
|
# It can install wheels without them and it can build wheels in isolation mode
|
||||||
|
# (using setuptools/flit/poetry/... installed from PyPI).
|
||||||
|
# Side note: pip bundles pkg_resources from setuptools for internal usage.
|
||||||
|
Recommends: python%{python3_pkgversion}-setuptools
|
||||||
|
|
||||||
# Require alternatives version that implements the --keep-foreign flag
|
# Require alternatives version that implements the --keep-foreign flag
|
||||||
Requires(postun): alternatives >= 1.19.1-1
|
Requires(postun): alternatives >= 1.19.1-1
|
||||||
# python38 installs the alternatives master symlink to which we attach a slave
|
# python39 installs the alternatives master symlink to which we attach a slave
|
||||||
Requires: python38
|
# pip has to require explicit version of python that provides
|
||||||
Requires(post): python38
|
# filters in tarfile module (fix for CVE-2007-4559).
|
||||||
Requires(postun): python38
|
Requires: python%{python3_pkgversion} >= 3.9.17-2
|
||||||
|
Requires(post): python%{python3_pkgversion}
|
||||||
|
Requires(postun): python%{python3_pkgversion}
|
||||||
|
|
||||||
# Virtual provides for the packages bundled by pip:
|
# Virtual provides for the packages bundled by pip:
|
||||||
%{bundled 3.8}
|
%{bundled %{python3_version}}
|
||||||
|
|
||||||
%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
|
%{crypt_compat_recommends %{python3_pkgversion}}
|
||||||
|
|
||||||
%{crypt_compat_recommends 38}
|
|
||||||
|
|
||||||
%description -n python%{python3_pkgversion}-%{srcname}
|
%description -n python%{python3_pkgversion}-%{srcname}
|
||||||
pip is a package management system used to install and manage software packages
|
pip is a package management system used to install and manage software packages
|
||||||
|
@ -220,12 +249,12 @@ written in Python. Many packages can be found in the Python Package Index
|
||||||
Packages" or "Pip Installs Python".
|
Packages" or "Pip Installs Python".
|
||||||
|
|
||||||
%if %{with doc}
|
%if %{with doc}
|
||||||
%package doc
|
%package -n python%{python3_pkgversion}-%{srcname}-doc
|
||||||
Summary: A documentation for a tool for installing and managing Python packages
|
Summary: A documentation for a tool for installing and managing Python packages
|
||||||
|
|
||||||
BuildRequires: python%{python3_pkgversion}-sphinx
|
BuildRequires: python3-sphinx
|
||||||
|
|
||||||
%description doc
|
%description -n python%{python3_pkgversion}-%{srcname}-doc
|
||||||
A documentation for a tool for installing and managing Python packages
|
A documentation for a tool for installing and managing Python packages
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
@ -233,17 +262,19 @@ A documentation for a tool for installing and managing Python packages
|
||||||
%package -n python%{python3_pkgversion}-%{srcname}-wheel
|
%package -n python%{python3_pkgversion}-%{srcname}-wheel
|
||||||
Summary: The pip wheel
|
Summary: The pip wheel
|
||||||
Requires: ca-certificates
|
Requires: ca-certificates
|
||||||
|
Conflicts: python%{python3_pkgversion} < 3.9.17-2
|
||||||
|
|
||||||
# Virtual provides for the packages bundled by pip:
|
# Virtual provides for the packages bundled by pip:
|
||||||
%{bundled 3.8}
|
%{bundled %{python3_version}}
|
||||||
|
|
||||||
%{crypt_compat_recommends 38}
|
%{crypt_compat_recommends %{python3_pkgversion}}
|
||||||
|
|
||||||
%description -n python%{python3_pkgversion}-%{srcname}-wheel
|
%description -n python%{python3_pkgversion}-%{srcname}-wheel
|
||||||
A Python wheel of pip to use with venv.
|
A Python wheel of pip to use with venv.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{srcname}-%{version}
|
%setup -q -n %{srcname}-%{upstream_version}
|
||||||
|
|
||||||
%if %{with doc}
|
%if %{with doc}
|
||||||
pushd docs/html
|
pushd docs/html
|
||||||
tar -xf %{SOURCE1}
|
tar -xf %{SOURCE1}
|
||||||
|
@ -253,27 +284,28 @@ mv python-docs-theme-2018.2 python-docs-theme
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch1 -p1
|
%autopatch -p1
|
||||||
%patch2 -p1
|
|
||||||
%patch3 -p1
|
|
||||||
%patch4 -p1
|
|
||||||
%patch5 -p1
|
|
||||||
%patch6 -p1
|
|
||||||
%patch7 -p1
|
|
||||||
%patch8 -p1
|
|
||||||
|
|
||||||
# this goes together with patch4
|
# this goes together with patch4
|
||||||
rm src/pip/_vendor/certifi/*.pem
|
rm src/pip/_vendor/certifi/*.pem
|
||||||
|
|
||||||
%if %{with tests}
|
|
||||||
# tests expect wheels in here
|
# tests expect wheels in here
|
||||||
ln -s %{python_wheeldir} tests/data/common_wheels
|
ln -s %{python_wheeldir} tests/data/common_wheels
|
||||||
%endif
|
|
||||||
|
# Upstream uses a Python 2/3 compatibility library for csv with Python 3 semantics in tests
|
||||||
|
# We only target Python 3 and csv23 is not (yet) packaged
|
||||||
|
# As of 20.1b1, this workaround was sufficient to get around the missing dependency
|
||||||
|
sed -i -e 's/csv23/csv/g' tests/lib/wheel.py
|
||||||
|
|
||||||
# Remove windows executable binaries
|
# Remove windows executable binaries
|
||||||
rm -v src/pip/_vendor/distlib/*.exe
|
rm -v src/pip/_vendor/distlib/*.exe
|
||||||
sed -i '/\.exe/d' setup.py
|
sed -i '/\.exe/d' setup.py
|
||||||
|
|
||||||
|
# Backports for Python 2
|
||||||
|
rm src/pip/_vendor/distlib/_backport/shutil.py
|
||||||
|
rm src/pip/_vendor/distlib/_backport/tarfile.py
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%py3_build_wheel
|
%py3_build_wheel
|
||||||
|
|
||||||
|
@ -282,26 +314,30 @@ export PYTHONPATH=./src/
|
||||||
# from tox.ini
|
# from tox.ini
|
||||||
sphinx-build-3 -b html docs/html docs/build/html
|
sphinx-build-3 -b html docs/html docs/build/html
|
||||||
sphinx-build-3 -b man docs/man docs/build/man -c docs/html
|
sphinx-build-3 -b man docs/man docs/build/man -c docs/html
|
||||||
rm docs/build/html/.buildinfo
|
rm -rf docs/build/html/{.doctrees,.buildinfo}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
||||||
# The following is similar to %%py3_install_wheel, but we don't have
|
# The following is similar to %%py3_install_wheel, but we don't have
|
||||||
# /usr/bin/pip yet, so we install using the wheel directly.
|
# /usr/bin/pip yet, so we install using the wheel directly.
|
||||||
# (This is not standard wheel usage, but the pip wheel supports it -- see
|
# (This is not standard wheel usage, but the pip wheel supports it -- see
|
||||||
# pip/__main__.py)
|
# pip/__main__.py)
|
||||||
%{__python3} dist/%{python_wheelname}/pip install \
|
%{__python3} dist/%{python_wheelname}/pip install \
|
||||||
-I 'dist/%{python_wheelname}' \
|
|
||||||
--root %{buildroot} \
|
--root %{buildroot} \
|
||||||
--no-deps
|
--no-deps \
|
||||||
|
--no-cache-dir \
|
||||||
|
--no-index \
|
||||||
|
--ignore-installed \
|
||||||
|
--find-links dist \
|
||||||
|
'pip==%{upstream_version}'
|
||||||
|
|
||||||
%if %{with doc}
|
%if %{with doc}
|
||||||
pushd docs/build/man
|
pushd docs/build/man
|
||||||
install -d %{buildroot}%{_mandir}/man1
|
install -d %{buildroot}%{_mandir}/man1
|
||||||
for MAN in *1; do
|
for MAN in *1; do
|
||||||
install -pm0644 $MAN %{buildroot}%{_mandir}/man1/${MAN/pip/pip3.8}
|
install -pm0644 $MAN %{buildroot}%{_mandir}/man1/${MAN/pip/pip%{python3_version}}
|
||||||
|
install -pm0644 $MAN %{buildroot}%{_mandir}/man1/${MAN/pip/pip-%{python3_version}}
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
@ -311,16 +347,15 @@ for PIP in %{buildroot}%{_bindir}/pip*; do
|
||||||
patch -p1 --no-backup-if-mismatch $PIP < %{SOURCE10}
|
patch -p1 --no-backup-if-mismatch $PIP < %{SOURCE10}
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{bashcompdir}
|
mkdir -p %{buildroot}%{bashcompdir}
|
||||||
PYTHONPATH=%{buildroot}%{python3_sitelib} \
|
PYTHONPATH=%{buildroot}%{python3_sitelib} \
|
||||||
%{buildroot}%{_bindir}/pip completion --bash \
|
%{buildroot}%{_bindir}/pip completion --bash \
|
||||||
> %{buildroot}%{bashcompdir}/pip3.8
|
> %{buildroot}%{bashcompdir}/pip%{python3_version}
|
||||||
|
|
||||||
# Make bash completion apply to all the 5 symlinks we install
|
# Make bash completion apply to all the 5 symlinks we install
|
||||||
sed -i -e "s/^\\(complete.*\\) pip\$/\\1 pip{,-}%{python3_version}/" \
|
sed -i -e "s/^\\(complete.*\\) pip\$/\\1 pip{,-}%{python3_version}/" \
|
||||||
-e s/_pip_completion/_pip38_completion/ \
|
-e s/_pip_completion/_pip%{python3_pkgversion}_completion/ \
|
||||||
%{buildroot}%{bashcompdir}/pip3.8
|
%{buildroot}%{bashcompdir}/pip%{python3_version}
|
||||||
|
|
||||||
|
|
||||||
# Provide symlinks to executables to comply with Fedora guidelines for Python
|
# Provide symlinks to executables to comply with Fedora guidelines for Python
|
||||||
|
@ -329,8 +364,8 @@ ln -s ./pip-%{python3_version} %{buildroot}%{_bindir}/pip-3
|
||||||
|
|
||||||
|
|
||||||
# Make sure the INSTALLER is not pip, otherwise Patch2 won't work
|
# Make sure the INSTALLER is not pip, otherwise Patch2 won't work
|
||||||
# TODO Maybe we should make all our python packages have this?
|
# %%pyproject macros do this for all packages
|
||||||
echo rpm > %{buildroot}%{python3_sitelib}/pip-%{version}.dist-info/INSTALLER
|
echo rpm > %{buildroot}%{python3_sitelib}/pip-%{upstream_version}.dist-info/INSTALLER
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{python_wheeldir}
|
mkdir -p %{buildroot}%{python_wheeldir}
|
||||||
install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
|
install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
|
||||||
|
@ -348,49 +383,57 @@ touch %{buildroot}%{_bindir}/pip-3
|
||||||
|
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
%check
|
%check
|
||||||
|
# Upstream tests
|
||||||
# bash completion tests only work from installed package
|
# bash completion tests only work from installed package
|
||||||
# needs unaltered sys.path and we cannot do that in %%check
|
# needs unaltered sys.path and we cannot do that in %%check
|
||||||
# test_pep517_and_build_options
|
# test_pep517_and_build_options
|
||||||
# test_config_file_venv_option
|
# test_config_file_venv_option
|
||||||
# TODO investigate failures
|
# TODO investigate failures
|
||||||
# test_uninstall_non_local_distutils
|
# test_uninstall_non_local_distutils
|
||||||
|
# Incompatible with the latest virtualenv
|
||||||
|
# test_from_link_vcs_with_source_dir_obtains_commit_id
|
||||||
|
# test_from_link_vcs_without_source_dir
|
||||||
|
# test_should_cache_git_sha
|
||||||
pytest_k='not completion and
|
pytest_k='not completion and
|
||||||
not test_pep517_and_build_options and
|
not test_pep517_and_build_options and
|
||||||
not test_config_file_venv_option and
|
not test_config_file_venv_option and
|
||||||
not test_uninstall_non_local_distutils'
|
not test_uninstall_non_local_distutils and
|
||||||
|
not test_from_link_vcs_with_source_dir_obtains_commit_id and
|
||||||
|
not test_from_link_vcs_without_source_dir and
|
||||||
|
not test_should_cache_git_sha'
|
||||||
|
|
||||||
mkdir _bin
|
# --deselect'ed tests are not compatible with the latest virtualenv
|
||||||
export PATH="$PWD/_bin:$PATH"
|
# These files contain almost 500 tests so we should enable them back
|
||||||
|
# as soon as pip will be compatible upstream
|
||||||
export PYTHONPATH=%{buildroot}%{python3_sitelib}
|
# https://github.com/pypa/pip/pull/8441
|
||||||
ln -sf %{buildroot}%{_bindir}/pip3 _bin/pip
|
%pytest -m 'not network' -k "$(echo $pytest_k)" \
|
||||||
%{__python3} -m pytest -m 'not network' -k "$(echo $pytest_k)" -v
|
--deselect tests/functional --deselect tests/lib/test_lib.py --deselect tests/unit/test_build_env.py
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%post -n python%{python3_pkgversion}-%{srcname}
|
%post -n python%{python3_pkgversion}-%{srcname}
|
||||||
alternatives --add-slave python3 %{_bindir}/python3.8 \
|
alternatives --add-slave python3 %{_bindir}/python%{python3_version} \
|
||||||
%{_bindir}/pip3 \
|
%{_bindir}/pip3 \
|
||||||
pip3 \
|
pip3 \
|
||||||
%{_bindir}/pip3.8
|
%{_bindir}/pip%{python3_version}
|
||||||
alternatives --add-slave python3 %{_bindir}/python3.8 \
|
alternatives --add-slave python3 %{_bindir}/python%{python3_version} \
|
||||||
%{_bindir}/pip-3 \
|
%{_bindir}/pip-3 \
|
||||||
pip-3 \
|
pip-3 \
|
||||||
%{_bindir}/pip-3.8
|
%{_bindir}/pip-%{python3_version}
|
||||||
|
|
||||||
%postun -n python%{python3_pkgversion}-%{srcname}
|
%postun -n python%{python3_pkgversion}-%{srcname}
|
||||||
# Do this only during uninstall process (not during update)
|
# Do this only during uninstall process (not during update)
|
||||||
if [ $1 -eq 0 ]; then
|
if [ $1 -eq 0 ]; then
|
||||||
# Only remove the slave links if the master link for python3 still exists.
|
# Only remove the slave links if the master link for python3 still exists.
|
||||||
# Due to a possible bug in yum, python38 gets removed before python38-pip
|
# Due to a possible bug in yum, python39 gets removed before python39-pip
|
||||||
# even though we have declared Requires(postun): python38
|
# even though we have declared Requires(postun): python39
|
||||||
EXISTS=`alternatives --display python3 | \
|
EXISTS=`alternatives --display python3 | \
|
||||||
grep -c "^/usr/bin/python3.8 - priority [0-9]*"`
|
grep -c "^/usr/bin/python%{python3_version} - priority [0-9]*"`
|
||||||
|
|
||||||
if [ $EXISTS -ne 0 ]; then
|
if [ $EXISTS -ne 0 ]; then
|
||||||
alternatives --keep-foreign --remove-slave python3 %{_bindir}/python3.8 \
|
alternatives --keep-foreign --remove-slave python3 %{_bindir}/python%{python3_version} \
|
||||||
pip3
|
pip3
|
||||||
alternatives --keep-foreign --remove-slave python3 %{_bindir}/python3.8 \
|
alternatives --keep-foreign --remove-slave python3 %{_bindir}/python%{python3_version} \
|
||||||
pip-3
|
pip-3
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -400,19 +443,21 @@ fi
|
||||||
%license LICENSE.txt
|
%license LICENSE.txt
|
||||||
%doc README.rst
|
%doc README.rst
|
||||||
%if %{with doc}
|
%if %{with doc}
|
||||||
%{_mandir}/man1/pip3.8.*
|
%{_mandir}/man1/pip%{python3_version}.*
|
||||||
%{_mandir}/man1/pip3.8-*.*
|
%{_mandir}/man1/pip%{python3_version}-*.*
|
||||||
|
%{_mandir}/man1/pip-%{python3_version}.*
|
||||||
|
%{_mandir}/man1/pip-%{python3_version}-*.*
|
||||||
%endif
|
%endif
|
||||||
%{_bindir}/pip%{python3_version}
|
%{_bindir}/pip%{python3_version}
|
||||||
%{_bindir}/pip-%{python3_version}
|
%{_bindir}/pip-%{python3_version}
|
||||||
%{python3_sitelib}/pip*
|
%{python3_sitelib}/pip*
|
||||||
%dir %{bashcompdir}
|
%dir %{bashcompdir}
|
||||||
%{bashcompdir}/pip3.8
|
%{bashcompdir}/pip%{python3_version}
|
||||||
%ghost %{_bindir}/pip3
|
%ghost %{_bindir}/pip3
|
||||||
%ghost %{_bindir}/pip-3
|
%ghost %{_bindir}/pip-3
|
||||||
|
|
||||||
%if %{with doc}
|
%if %{with doc}
|
||||||
%files doc
|
%files -n python%{python3_pkgversion}-%{srcname}-doc
|
||||||
%license LICENSE.txt
|
%license LICENSE.txt
|
||||||
%doc README.rst
|
%doc README.rst
|
||||||
%doc docs/build/html
|
%doc docs/build/html
|
||||||
|
@ -425,40 +470,88 @@ fi
|
||||||
%{python_wheeldir}/%{python_wheelname}
|
%{python_wheeldir}/%{python_wheelname}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue May 24 2022 Orion Poplawski <orion@nwra.com> - 19.3.1-6
|
* Fri Feb 16 2024 Tomáš Hrnčiar <thrnciar@redhat.com> - 20.2.4-8.1
|
||||||
- Backport patch to fix infinite recursion with pip wheel with $TMPDIR in $PWD
|
- Require Python with tarfile filters
|
||||||
- Resolves: rhbz#2090006
|
Resolves: RHEL-25459
|
||||||
|
|
||||||
* Thu Oct 14 2021 Charalampos Stratakis <cstratak@redhat.com> - 19.3.1-5
|
* Tue Aug 08 2023 Petr Viktorin <pviktori@redhat.com> - 20.2.4-8
|
||||||
|
- Use tarfile.data_filter for extracting (CVE-2007-4559, PEP-721, PEP-706)
|
||||||
|
Resolves: RHBZ#2218275
|
||||||
|
|
||||||
|
* Thu Oct 14 2021 Charalampos Stratakis <cstratak@redhat.com> - 20.2.4-7
|
||||||
- Remove bundled windows executables
|
- Remove bundled windows executables
|
||||||
- Resolves: rhbz#2006789
|
- Resolves: rhbz#2006790
|
||||||
|
|
||||||
* Mon Aug 02 2021 Tomas Orsava <torsava@redhat.com> - 19.3.1-4
|
* Thu Aug 05 2021 Tomas Orsava <torsava@redhat.com> - 20.2.4-6
|
||||||
- Adjusted the postun scriptlets to enable upgrading to RHEL 9
|
- Adjusted the postun scriptlets to enable upgrading to RHEL 9
|
||||||
- Resolves: rhbz#1933055
|
- Resolves: rhbz#1933055
|
||||||
|
|
||||||
* Wed Jun 30 2021 Lumír Balhar <lbalhar@redhat.com> - 19.3.1-3
|
* Wed Jun 30 2021 Lumír Balhar <lbalhar@redhat.com> - 20.2.4-5
|
||||||
- Fix for CVE-2021-33503 Catastrophic backtracking in URL authority parser
|
- Fix for CVE-2021-33503 Catastrophic backtracking in URL authority parser
|
||||||
Resolves: rhbz#1968074
|
Resolves: rhbz#1968074
|
||||||
|
|
||||||
* Tue Jun 08 2021 Lumír Balhar <lbalhar@redhat.com> - 19.3.1-2
|
* Tue Jun 08 2021 Lumír Balhar <lbalhar@redhat.com> - 20.2.4-4
|
||||||
- Fix for CVE-2021-3572 - pip incorrectly handled unicode separators in git references
|
- Fix for CVE-2021-3572 - pip incorrectly handled unicode separators in git references
|
||||||
Resolves: rhbz#1962856
|
Resolves: rhbz#1962856
|
||||||
|
|
||||||
* Thu Apr 23 2020 Lumír Balhar <lbalhar@redhat.com> - 19.3.1
|
* Wed Jan 06 2021 Tomas Orsava <torsava@redhat.com> - 20.2.4-3
|
||||||
- Rebase to 19.3.1 to enable support for manylinux2014
|
- Convert from Fedora to the python39 module in RHEL8
|
||||||
Resolves: rhbz#1827623
|
- Resolves: rhbz#1877430
|
||||||
- + some other fixes from Fedora 32 where we have the same version now
|
|
||||||
|
|
||||||
* Mon Mar 09 2020 Tomas Orsava <torsava@redhat.com> - 19.2.3-5
|
* Fri Dec 04 2020 Miro Hrončok <mhroncok@redhat.com> - 20.2.4-2
|
||||||
- Implement the alternatives system for the executables
|
- Disable tests and documentation in Fedora ELN (and RHEL)
|
||||||
- Resolves: rhbz#1807041
|
|
||||||
|
|
||||||
* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 19.2.3-4
|
* Mon Oct 19 2020 Lumír Balhar <lbalhar@redhat.com> - 20.2.4-1
|
||||||
- Exclude unsupported i686 arch
|
- Update to 20.2.4 (#1889112)
|
||||||
|
|
||||||
* Wed Nov 20 2019 Tomas Orsava <torsava@redhat.com> - 19.2.3-3
|
* Wed Aug 05 2020 Tomas Orsava <torsava@redhat.com> - 20.2.2-1
|
||||||
- Modify for RHEL8
|
- Update to 20.2.2 (#1838553)
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.1.1-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 10 2020 Lumír Balhar <lbalhar@redhat.com> - 20.1.1-6
|
||||||
|
- Do not emit a warning about root privileges when --root is used
|
||||||
|
|
||||||
|
* Wed Jul 08 2020 Miro Hrončok <mhroncok@redhat.com> - 20.1.1-5
|
||||||
|
- Update bundled provides to match 20.1.1
|
||||||
|
|
||||||
|
* Tue Jun 16 2020 Lumír Balhar <lbalhar@redhat.com> - 20.1.1-4
|
||||||
|
- Deselect tests incompatible with the latest virtualenv
|
||||||
|
|
||||||
|
* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 20.1.1-3
|
||||||
|
- Rebuilt for Python 3.9
|
||||||
|
|
||||||
|
* Thu May 21 2020 Miro Hrončok <mhroncok@redhat.com> - 20.1.1-2
|
||||||
|
- Bootstrap for Python 3.9
|
||||||
|
|
||||||
|
* Wed May 20 2020 Tomas Hrnciar <thrnciar@redhat.com> - 20.1.1-1
|
||||||
|
- Update to 20.1.1
|
||||||
|
|
||||||
|
* Wed Apr 29 2020 Tomas Hrnciar <thrnciar@redhat.com> - 20.1-1
|
||||||
|
- Update to 20.1
|
||||||
|
|
||||||
|
* Mon Apr 27 2020 Tomas Hrnciar <thrnciar@redhat.com> - 20.1~b1-1
|
||||||
|
- Update to 20.1~b1
|
||||||
|
|
||||||
|
* Wed Apr 15 2020 Miro Hrončok <mhroncok@redhat.com> - 20.0.2-4
|
||||||
|
- Only recommend setuptools, don't require them
|
||||||
|
|
||||||
|
* Fri Apr 10 2020 Miro Hrončok <mhroncok@redhat.com> - 20.0.2-3
|
||||||
|
- Allow setting $TMPDIR to $PWD/... during pip wheel (#1806625)
|
||||||
|
|
||||||
|
* Tue Mar 10 2020 Miro Hrončok <mhroncok@redhat.com> - 20.0.2-2
|
||||||
|
- Don't warn the user about pip._internal.main() entrypoint to fix ensurepip
|
||||||
|
|
||||||
|
* Mon Mar 02 2020 Miro Hrončok <mhroncok@redhat.com> - 20.0.2-1
|
||||||
|
- Update to 20.0.2 (#1793456)
|
||||||
|
|
||||||
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.3.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Nov 04 2019 Tomas Orsava <torsava@redhat.com> - 19.3.1-1
|
||||||
|
- Update to 19.3.1 (#1761508)
|
||||||
|
- Drop upstreamed patch that fixed expected output in test to not break with alpha/beta/rc Python versions
|
||||||
|
|
||||||
* Wed Oct 30 2019 Miro Hrončok <mhroncok@redhat.com> - 19.2.3-2
|
* Wed Oct 30 2019 Miro Hrončok <mhroncok@redhat.com> - 19.2.3-2
|
||||||
- Make /usr/bin/pip(3) work with user-installed pip 19.3+ (#1767212)
|
- Make /usr/bin/pip(3) work with user-installed pip 19.3+ (#1767212)
|
||||||
|
@ -738,8 +831,9 @@ Resolves: rhbz#1406922
|
||||||
* Fri Jan 1 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1.4
|
* Fri Jan 1 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1.4
|
||||||
- fix dependency issue
|
- fix dependency issue
|
||||||
* Fri Dec 18 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-2
|
* Fri Dec 18 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-2
|
||||||
- fix spec file
|
- fix spec file
|
||||||
* Thu Dec 17 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-1
|
* Thu Dec 17 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-1
|
||||||
- upgrade to 0.6.1 of pip
|
- upgrade to 0.6.1 of pip
|
||||||
* Mon Aug 31 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.4-1
|
* Mon Aug 31 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.4-1
|
||||||
- Initial package
|
- Initial package
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
From 8c58a99221415ca7c3d5ce50dcffefa14e421928 Mon Sep 17 00:00:00 2001
|
From 854fd7296bb9306d46ba3cc8bb7c6f18a7960ed6 Mon Sep 17 00:00:00 2001
|
||||||
From: Tomas Orsava <torsava@redhat.com>
|
From: Tomas Hrnciar <thrnciar@redhat.com>
|
||||||
Date: Tue, 12 Nov 2019 17:24:20 +0100
|
Date: Sun, 26 Apr 2020 21:19:03 +0200
|
||||||
Subject: [PATCH] Subject: Prevent removing of the system packages installed
|
Subject: [PATCH] Prevent removing of the system packages installed under
|
||||||
under /usr/lib
|
/usr/lib
|
||||||
|
|
||||||
when pip install -U is executed.
|
when pip install -U is executed.
|
||||||
|
|
||||||
|
@ -11,36 +11,13 @@ Resolves: rhbz#1550368
|
||||||
Co-Authored-By: Michal Cyprian <m.cyprian@gmail.com>
|
Co-Authored-By: Michal Cyprian <m.cyprian@gmail.com>
|
||||||
Co-Authored-By: Victor Stinner <vstinner@redhat.com>
|
Co-Authored-By: Victor Stinner <vstinner@redhat.com>
|
||||||
---
|
---
|
||||||
src/pip/_internal/legacy_resolve.py | 5 ++++-
|
src/pip/_internal/req/req_install.py | 3 ++-
|
||||||
src/pip/_internal/req/req_install.py | 3 ++-
|
src/pip/_internal/resolution/legacy/resolver.py | 5 ++++-
|
||||||
src/pip/_internal/utils/misc.py | 11 +++++++++++
|
src/pip/_internal/utils/misc.py | 11 +++++++++++
|
||||||
3 files changed, 17 insertions(+), 2 deletions(-)
|
3 files changed, 17 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/pip/_internal/legacy_resolve.py b/src/pip/_internal/legacy_resolve.py
|
|
||||||
index c24158f..bd92287 100644
|
|
||||||
--- a/src/pip/_internal/legacy_resolve.py
|
|
||||||
+++ b/src/pip/_internal/legacy_resolve.py
|
|
||||||
@@ -30,6 +30,7 @@ from pip._internal.exceptions import (
|
|
||||||
)
|
|
||||||
from pip._internal.utils.logging import indent_log
|
|
||||||
from pip._internal.utils.misc import (
|
|
||||||
+ dist_in_install_path,
|
|
||||||
dist_in_usersite,
|
|
||||||
ensure_dir,
|
|
||||||
normalize_version_info,
|
|
||||||
@@ -224,7 +225,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/req/req_install.py b/src/pip/_internal/req/req_install.py
|
diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
|
||||||
index 5a8c0dc..f80ba87 100644
|
index 4759f4a..2e76e35 100644
|
||||||
--- a/src/pip/_internal/req/req_install.py
|
--- a/src/pip/_internal/req/req_install.py
|
||||||
+++ b/src/pip/_internal/req/req_install.py
|
+++ b/src/pip/_internal/req/req_install.py
|
||||||
@@ -39,6 +39,7 @@ from pip._internal.utils.misc import (
|
@@ -39,6 +39,7 @@ from pip._internal.utils.misc import (
|
||||||
|
@ -50,21 +27,44 @@ index 5a8c0dc..f80ba87 100644
|
||||||
+ dist_in_install_path,
|
+ dist_in_install_path,
|
||||||
dist_in_site_packages,
|
dist_in_site_packages,
|
||||||
dist_in_usersite,
|
dist_in_usersite,
|
||||||
ensure_dir,
|
get_distribution,
|
||||||
@@ -461,7 +462,7 @@ class InstallRequirement(object):
|
@@ -446,7 +447,7 @@ class InstallRequirement(object):
|
||||||
"lack sys.path precedence to %s in %s" %
|
"lack sys.path precedence to {} in {}".format(
|
||||||
(existing_dist.project_name, existing_dist.location)
|
existing_dist.project_name, existing_dist.location)
|
||||||
)
|
)
|
||||||
- else:
|
- else:
|
||||||
+ elif dist_in_install_path(existing_dist):
|
+ elif dist_in_install_path(existing_dist):
|
||||||
self.conflicts_with = existing_dist
|
self.should_reinstall = True
|
||||||
return True
|
else:
|
||||||
|
if self.editable:
|
||||||
|
diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
|
||||||
|
index c9b4c66..ff361d8 100644
|
||||||
|
--- a/src/pip/_internal/resolution/legacy/resolver.py
|
||||||
|
+++ b/src/pip/_internal/resolution/legacy/resolver.py
|
||||||
|
@@ -34,6 +34,7 @@ from pip._internal.resolution.base import BaseResolver
|
||||||
|
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,
|
||||||
|
get_requires_python,
|
||||||
|
@@ -207,7 +208,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/utils/misc.py b/src/pip/_internal/utils/misc.py
|
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
|
||||||
index b848263..5b75fed 100644
|
index 24a7455..5fd48d3 100644
|
||||||
--- a/src/pip/_internal/utils/misc.py
|
--- a/src/pip/_internal/utils/misc.py
|
||||||
+++ b/src/pip/_internal/utils/misc.py
|
+++ b/src/pip/_internal/utils/misc.py
|
||||||
@@ -28,6 +28,7 @@ from pip._vendor.six.moves.urllib.parse import unquote as urllib_unquote
|
@@ -31,6 +31,7 @@ from pip._vendor.six.moves.urllib.parse import unquote as urllib_unquote
|
||||||
from pip import __version__
|
from pip import __version__
|
||||||
from pip._internal.exceptions import CommandError
|
from pip._internal.exceptions import CommandError
|
||||||
from pip._internal.locations import (
|
from pip._internal.locations import (
|
||||||
|
@ -72,7 +72,7 @@ index b848263..5b75fed 100644
|
||||||
get_major_minor_version,
|
get_major_minor_version,
|
||||||
site_packages,
|
site_packages,
|
||||||
user_site,
|
user_site,
|
||||||
@@ -389,6 +390,16 @@ def dist_in_site_packages(dist):
|
@@ -403,6 +404,16 @@ def dist_in_site_packages(dist):
|
||||||
return dist_location(dist).startswith(normalize_path(site_packages))
|
return dist_location(dist).startswith(normalize_path(site_packages))
|
||||||
|
|
||||||
|
|
||||||
|
@ -90,5 +90,5 @@ index b848263..5b75fed 100644
|
||||||
# type: (Distribution) -> bool
|
# type: (Distribution) -> bool
|
||||||
"""
|
"""
|
||||||
--
|
--
|
||||||
2.20.1
|
2.25.4
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
SHA512 (2018.2.tar.gz) = 4c09c43a70ecb3ca3bc9445b01bf209eb382e41d9c969145696dea38551992ed88fd9b725a1264380f3dbdf8acdaf5ada3ef86b44255cdfbdbe4a01a1630912d
|
||||||
|
SHA512 (d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz) = fc7b11c5cbf6322469ce2eaca2a8d7eb60b17398d316f7465ab5d3d38dabd00ee22a3da7437a28f6312f0115f77f2df0d8bf0abc671e055eef06356c94283409
|
||||||
|
SHA512 (pip-20.2.4.tar.gz) = 649fdc6baa1ebe741717bd1e5ed8f2450d79f8bc0d06f2804c27488be9018f6fa6cc2eccc3ec2801442073f59ac0b8c377612c25116126aa919aa95050f4214f
|
Loading…
Reference in New Issue