From 58e2eec75f1cbacc1d581ce3e3f4d964024b0bb0 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 15 May 2023 23:33:34 +0200 Subject: [PATCH] Replace whole repo with latest content from branch stream-20.2.2-rhel-8.8.0 Content corresponds with RHEL dist-git commit 975aaa8 --- .gitignore | 3 +- fix-tmpdir-infinite-recursion.patch | 84 ---- network-tests.patch | 683 ---------------------------- python3x-pip.spec | 2 +- sources | 2 + 5 files changed, 5 insertions(+), 769 deletions(-) delete mode 100644 fix-tmpdir-infinite-recursion.patch delete mode 100644 network-tests.patch diff --git a/.gitignore b/.gitignore index 948040a..e9acc2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -SOURCES/pip-20.2.4.tar.gz +/2018.2.tar.gz +/d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz /pip-20.2.4.tar.gz diff --git a/fix-tmpdir-infinite-recursion.patch b/fix-tmpdir-infinite-recursion.patch deleted file mode 100644 index c27ebb2..0000000 --- a/fix-tmpdir-infinite-recursion.patch +++ /dev/null @@ -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) diff --git a/network-tests.patch b/network-tests.patch deleted file mode 100644 index 8acf694..0000000 --- a/network-tests.patch +++ /dev/null @@ -1,683 +0,0 @@ -From 621800d5c65aea36c6a1d9b685ff88f35cfce476 Mon Sep 17 00:00:00 2001 -From: Tomas Orsava -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 = -data = - 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(': 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(': 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(': 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(': 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(': 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(': 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 = -data = - 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(': 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(': 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(': 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(': 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(': 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(': 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 = -data = - 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(': 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(': 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(': 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(': 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(': 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(': 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 = -data = , 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 = -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(': 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(': 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(': 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(': 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(': 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 "", line 1, in - 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 - 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 - 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 - 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 - 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 - 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 - 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 = -virtualenv = - 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 = -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(': 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(': 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(': 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(': 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(': 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(': 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 = - 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 = -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(': 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(': 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(': 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(': 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(': 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 - diff --git a/python3x-pip.spec b/python3x-pip.spec index ce285b5..b12910a 100644 --- a/python3x-pip.spec +++ b/python3x-pip.spec @@ -147,7 +147,7 @@ Provides: bundled(python%{1}dist(cachecontrol)) = 0.12.6 Provides: bundled(python%{1}dist(certifi)) = 2020.6.20 Provides: bundled(python%{1}dist(chardet)) = 3.0.4 Provides: bundled(python%{1}dist(colorama)) = 0.4.3 -Provides: bundled(python%{1}dist(contextlib2)) = 0.6.post1 +Provides: bundled(python%{1}dist(contextlib2)) = 0.6^post1 Provides: bundled(python%{1}dist(distlib)) = 0.3.1 Provides: bundled(python%{1}dist(distro)) = 1.5 Provides: bundled(python%{1}dist(html5lib)) = 1.1 diff --git a/sources b/sources index 00c5f6d..c4e6f2b 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ +SHA512 (2018.2.tar.gz) = 4c09c43a70ecb3ca3bc9445b01bf209eb382e41d9c969145696dea38551992ed88fd9b725a1264380f3dbdf8acdaf5ada3ef86b44255cdfbdbe4a01a1630912d +SHA512 (d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz) = fc7b11c5cbf6322469ce2eaca2a8d7eb60b17398d316f7465ab5d3d38dabd00ee22a3da7437a28f6312f0115f77f2df0d8bf0abc671e055eef06356c94283409 SHA512 (pip-20.2.4.tar.gz) = 649fdc6baa1ebe741717bd1e5ed8f2450d79f8bc0d06f2804c27488be9018f6fa6cc2eccc3ec2801442073f59ac0b8c377612c25116126aa919aa95050f4214f