diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index d3d7fdd..72d39d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +1,7 @@ -pip-0.7.2.tar.gz -/pip-0.8.tar.gz -/pip-0.8.2.tar.gz -/pip-0.8.3.tar.gz -/pip-1.0.2.tar.gz -/pip-1.1.tar.gz -/pip-1.3.1.tar.gz -/pip-1.4.1.tar.gz -/pip-1.5.4.tar.gz -/pip-1.5.6.tar.gz -/pip-1.5.6-tests.tar.gz -/pip-6.0.8.tar.gz -/pip-7.0.3.tar.gz -/pip-7.1.0.tar.gz -/pip-7.1.0-tests.tar.gz -/pip-8.0.2.tar.gz -/pip-8.1.2.tar.gz -/pip-8.1.2-tests.tar.gz -/pip-9.0.1.tar.gz -/pip-9.0.1-tests.tar.gz -/pip-9.0.3.tar.gz -/pip-9.0.3-tests.tar.gz -/pip-10.0.1.tar.gz -/pip-18.0.tar.gz -/d2e63fbfc62af3b7050f619b2f5bb8658985b931.zip -/2018.2.tar.gz -/pip-18.0-tests.tar.gz -/d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz -/pip-18.1.tar.gz -/pip-18.1-tests.tar.gz -/pip-19.0.2.tar.gz -/pip-19.0.2-tests.tar.gz -/pip-19.0.3.tar.gz -/pip-19.0.3-tests.tar.gz -/pip-19.1.tar.gz -/pip-19.1-tests.tar.gz -/pip-19.1.1.tar.gz -/pip-19.1.1-tests.tar.gz -/pip-19.2.3.tar.gz -/pip-19.2.3-tests.tar.gz -/pip-19.3.1.tar.gz -/pip-19.3.1-tests.tar.gz +/*.tar.gz +/*.zip +/pip-*/ +/pip/ +/results_python-pip/ +*.rpm +*.whl diff --git a/7873.patch b/7873.patch deleted file mode 100644 index 8e4a8e4..0000000 --- a/7873.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 0ef2645af8871b1722608c36b4f5cdcb8d38067e Mon Sep 17 00:00:00 2001 -From: Tomas Hrnciar -Date: Sun, 19 Apr 2020 20:06:52 +0200 -Subject: [PATCH 1/2] Prevent infinite recursion with pip wheel with $TMPDIR in - $PWD - -During a build of extension module within `pip wheel` the source directory is -recursively copied in a temporary directory. - -See https://github.com/pypa/pip/issues/7555 - -When the temporary directory is inside the source directory -(for example by setting `TMPDIR=$PWD/tmp`) this caused an infinite recursion -that ended in: - - [Errno 36] File name too long - -We prevent that buy never copying the target to the target in _copy_source_tree. - -Fixes https://github.com/pypa/pip/issues/7872 ---- - news/7872.bugfix | 1 + - src/pip/_internal/download.py | 23 ++++++++++++++++++----- - tests/data/src/extension/extension.c | 0 - tests/data/src/extension/setup.py | 4 ++++ - tests/functional/test_wheel.py | 11 +++++++++++ - 5 files changed, 34 insertions(+), 5 deletions(-) - create mode 100644 news/7872.bugfix - create mode 100644 tests/data/src/extension/extension.c - create mode 100644 tests/data/src/extension/setup.py - -diff --git a/news/7872.bugfix b/news/7872.bugfix -new file mode 100644 -index 00000000..3550d573 ---- /dev/null -+++ b/news/7872.bugfix -@@ -0,0 +1 @@ -+Prevent an infinite recursion with ``pip wheel`` when ``$TMPDIR`` is within the source directory. -diff --git a/src/pip/_internal/download.py b/src/pip/_internal/download.py -index 6567fc37..d5c01a41 100644 ---- a/src/pip/_internal/download.py -+++ b/src/pip/_internal/download.py -@@ -350,12 +350,25 @@ def _copy2_ignoring_special_files(src, dest): - - 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 [] -+ # type: (str, List[str]) -> List[str] -+ 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 --git a/tests/data/src/extension/extension.c b/tests/data/src/extension/extension.c -new file mode 100644 -index 00000000..e69de29b -diff --git a/tests/data/src/extension/setup.py b/tests/data/src/extension/setup.py -new file mode 100644 -index 00000000..b26302b0 ---- /dev/null -+++ b/tests/data/src/extension/setup.py -@@ -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 --git a/tests/functional/test_wheel.py b/tests/functional/test_wheel.py -index 5ebc9ea4..9923c023 100644 ---- a/tests/functional/test_wheel.py -+++ b/tests/functional/test_wheel.py -@@ -228,6 +228,17 @@ def test_pip_wheel_with_user_set_in_config(script, data, common_wheels): - assert "Successfully built withpyproject" in result.stdout, result.stdout - - -+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) -+ 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) - - -From 168e98adb0f5d03887c4d88fc1733308761c3b8a Mon Sep 17 00:00:00 2001 -From: Tomas Hrnciar -Date: Sun, 19 Apr 2020 20:31:47 +0200 -Subject: [PATCH 2/2] Avoid a test dependency on a C compiler, skip the test on - Windows - ---- - tests/functional/test_wheel.py | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/tests/functional/test_wheel.py b/tests/functional/test_wheel.py -index 9923c023..fa3df239 100644 ---- a/tests/functional/test_wheel.py -+++ b/tests/functional/test_wheel.py -@@ -1,6 +1,7 @@ - """'pip wheel' tests""" - import os - import re -+import sys - from os.path import exists - - import pytest -@@ -228,10 +229,17 @@ def test_pip_wheel_with_user_set_in_config(script, data, common_wheels): - 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 - diff --git a/8744.patch b/8744.patch deleted file mode 100644 index 1dfc974..0000000 --- a/8744.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 23a2fef3919d773041f0c06e5f1a85471132098c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 3 Aug 2020 10:41:03 +0200 -Subject: [PATCH] When one keyring attempt fails, don't bother with more - -This makes https://github.com/pypa/pip/issues/8090 much less painful. ---- - news/8090.bugfix | 3 +++ - src/pip/_internal/network/auth.py | 2 ++ - tests/unit/test_networking_auth.py | 26 ++++++++++++++++++++++++++ - 3 files changed, 31 insertions(+) - create mode 100644 news/8090.bugfix - -diff --git a/news/8090.bugfix b/news/8090.bugfix -new file mode 100644 -index 0000000..e9f2b7c ---- /dev/null -+++ b/news/8090.bugfix -@@ -0,0 +1,3 @@ -+Only attempt to use the keyring once and if it fails, don't try again. -+This prevents spamming users with several keyring unlock prompts when they -+cannot unlock or don't want to do so. -diff --git a/src/pip/_internal/network/auth.py b/src/pip/_internal/network/auth.py -index 1e1da54..c101f93 100644 ---- a/src/pip/_internal/network/auth.py -+++ b/src/pip/_internal/network/auth.py -@@ -45,6 +45,7 @@ except Exception as exc: - - def get_keyring_auth(url, username): - """Return the tuple auth for a given url from keyring.""" -+ global keyring - if not url or not keyring: - return None - -@@ -70,6 +71,7 @@ def get_keyring_auth(url, username): - logger.warning( - "Keyring is skipped due to an exception: %s", str(exc), - ) -+ keyring = None - - - class MultiDomainBasicAuth(AuthBase): -diff --git a/tests/unit/test_networking_auth.py b/tests/unit/test_networking_auth.py -index 0f0b679..0fc5799 100644 ---- a/tests/unit/test_networking_auth.py -+++ b/tests/unit/test_networking_auth.py -@@ -222,3 +222,29 @@ def test_keyring_get_credential(monkeypatch, url, expect): - assert auth._get_new_credentials( - url, allow_netrc=False, allow_keyring=True - ) == expect -+ -+ -+class KeyringModuleBroken(object): -+ """Represents the current supported API of keyring, but broken""" -+ -+ def __init__(self): -+ self._call_count = 0 -+ -+ def get_credential(self, system, username): -+ self._call_count += 1 -+ raise Exception("This keyring is broken!") -+ -+ -+def test_broken_keyring_disables_keyring(monkeypatch): -+ keyring_broken = KeyringModuleBroken() -+ monkeypatch.setattr(pip._internal.network.auth, 'keyring', keyring_broken) -+ -+ auth = MultiDomainBasicAuth(index_urls=["http://example.com/"]) -+ -+ assert keyring_broken._call_count == 0 -+ for i in range(5): -+ url = "http://example.com/path" + str(i) -+ assert auth._get_new_credentials( -+ url, allow_netrc=False, allow_keyring=True -+ ) == (None, None) -+ assert keyring_broken._call_count == 1 --- -2.26.2 - diff --git a/callable-main.patch b/callable-main.patch deleted file mode 100644 index 9a4cdf4..0000000 --- a/callable-main.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py -index 8c0e4c58..76e280e5 100755 ---- a/src/pip/_internal/__init__.py -+++ b/src/pip/_internal/__init__.py -@@ -1,2 +1,3 @@ - #!/usr/bin/env python - import pip._internal.utils.inject_securetransport # noqa -+from pip._internal import main # noqa -diff --git a/src/pip/_internal/main.py b/src/pip/_internal/main.py -index 1e922402..d3df58b3 100644 ---- a/src/pip/_internal/main.py -+++ b/src/pip/_internal/main.py -@@ -45,3 +45,30 @@ def main(args=None): - command = create_command(cmd_name, isolated=("--isolated" in cmd_args)) - - return command.main(cmd_args) -+ -+ -+# Dark magic to make the main module itself callable. -+# This is needed to be able to use this pip in ensurepip of older Pythons -+# without patching all the Pythons. -+ -+# In Python 3.5+, we can just inherit, define __call__ and override -+# sys.modules[__name__].__class__, however, that is not possible in 2.7. -+ -+class _CallableModule(type(sys.modules[__name__])): -+ def __init__(self): -+ super(_CallableModule, self).__init__(__name__) -+ self._main = sys.modules[__name__] -+ sys.modules[__name__] = self -+ self.__doc__ = self._main.__doc__ -+ -+ def __call__(self, *args, **kwargs): -+ return main(*args, **kwargs) -+ -+ def __dir__(self): -+ return dir(self._main) -+ -+ def __getattr__(self, attr): -+ return getattr(self._main, attr) -+ -+ -+_CallableModule() diff --git a/changelog b/changelog new file mode 100644 index 0000000..f16cb91 --- /dev/null +++ b/changelog @@ -0,0 +1,496 @@ +* Mon Jan 22 2024 Miro Hrončok - 23.3.1-5 +- Switched to autogenerated BuildRequires for test dependencies, + which removed some that were no longer necessary + +* Mon Jan 22 2024 Fedora Release Engineering - 23.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 12 2024 Maxwell G - 23.3.1-3 +- Remove unused python3-mock dependency + +* Wed Jan 03 2024 Maxwell G - 23.3.1-2 +- Remove weak dependency on python3-setuptools + +* Thu Nov 16 2023 Petr Viktorin - 23.3.1-1 +- Update to 23.3.1 +Resolves: rhbz#2244306 + +* Fri Aug 04 2023 Miro Hrončok - 23.2.1-1 +- Update to 23.2.1 +Resolves: rhbz#2223082 + +* Fri Aug 04 2023 Miro Hrončok - 23.1.2-7 +- Actually run the tests and build the docs when building this package + +* Wed Jul 26 2023 Miro Hrončok - 23.1.2-6 +- Drop no-longer-needed custom changes to /usr/bin/pip* +- Stop Recommending libcrypt.so.1 on Python 3.12+ +Resolves: rhbz#2150373 + +* Tue Jul 25 2023 Python Maint - 23.1.2-5 +- Rebuilt for Python 3.12 + +* Fri Jul 21 2023 Fedora Release Engineering - 23.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 20 2023 Python Maint - 23.1.2-3 +- Rebuilt for Python 3.12 + +* Tue Jun 13 2023 Python Maint - 23.1.2-2 +- Bootstrap for Python 3.12 + +* Fri May 19 2023 Miro Hrončok - 23.1.2-1 +- Update to 23.1.2 +Resolves: rhbz#2186979 + +* Mon Mar 27 2023 Karolina Surma - 23.0.1-2 +- Fix compatibility with Sphinx 6+ +Resolves: rhbz#2180479 + +* Mon Feb 20 2023 Tomáš Hrnčiar - 23.0.1-1 +- Update to 23.0.1 +Resolves: rhbz#2165760 + +* Fri Jan 20 2023 Fedora Release Engineering - 22.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Nov 14 2022 Karolina Surma - 22.3.1-1 +- Update to 22.3.1 +Resolves: rhbz#2135044 + +* Mon Sep 05 2022 Python Maint - 22.2.2-2 +- Fix crash when an empty dist-info/egg-info is present +Resolves: rhbz#2115001 +- No longer use the rpm_install prefix to determine RPM-installed packages +Related: rhbz#2026979 + +* Wed Aug 03 2022 Charalampos Stratakis - 22.2.2-1 +- Update to 22.2.2 +Resolves: rhbz#2109468 + +* Fri Jul 22 2022 Charalampos Stratakis - 22.2-1 +- Update to 22.2 +Resolves: rhbz#2109468 + +* Fri Jul 22 2022 Fedora Release Engineering - 22.0.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jun 15 2022 Python Maint - 22.0.4-4 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 22.0.4-3 +- Bootstrap for Python 3.11 + +* Tue Apr 26 2022 Tomáš Hrnčiar - 22.0.4-2 +- Fallback to pep517 if setup.py is present and setuptools cannot be imported +- Fixes: rhbz#2020635 + +* Mon Mar 21 2022 Karolina Surma - 22.0.4-1 +- Update to 22.0.4 +Resolves: rhbz#2061262 + +* Wed Feb 16 2022 Lumír Balhar - 22.0.3-1 +- Update to 22.0.3 +Resolves: rhbz#2048243 + +* Fri Jan 21 2022 Fedora Release Engineering - 21.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Oct 25 2021 Miro Hrončok - 21.3.1-1 +- Update to 21.3.1 +- Resolves: rhbz#2016682 + +* Wed Oct 13 2021 Miro Hrončok - 21.3-1 +- Update to 21.3 +- Resolves: rhbz#2013026 +- Fix incomplete pip-updates in virtual environments + +* Wed Oct 06 2021 Charalampos Stratakis - 21.2.3-4 +- Remove bundled windows executables +- Resolves: rhbz#2005453 + +* Thu Sep 23 2021 Miro Hrončok - 21.2.3-3 +- Detect paths not to uninstall from via sysconfig's rpm_prefix install scheme + +* Mon Aug 16 2021 Miro Hrončok - 21.2.3-2 +- Fix broken uninstallation by a bogus downstream patch + +* Mon Aug 09 2021 Miro Hrončok - 21.2.3-1 +- Update to 21.2.3 +- Resolves: rhbz#1985635 + +* Fri Jul 23 2021 Fedora Release Engineering - 21.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 29 2021 Lumír Balhar - 21.1.3-1 +- Update to 21.1.3 +Resolves: rhbz#1976449 + +* Mon Jun 07 2021 Karolina Surma - 21.1.2-1 +- Update to 21.1.2 +Resolves: rhbz#1963433 + +* Fri Jun 04 2021 Python Maint - 21.1.1-3 +- Rebuilt for Python 3.10 + +* Tue Jun 01 2021 Python Maint - 21.1.1-2 +- Bootstrap for Python 3.10 + +* Mon May 10 2021 Karolina Surma - 21.1.1-1 +- Update to 21.1.1 + +* Sat Mar 13 2021 Miro Hrončok - 21.0.1-2 +- python-pip-wheel: Remove bundled provides and libcrypt recommends for Python 2 + (The wheel is Python 3 only for a while) + +* Wed Feb 17 2021 Lumír Balhar - 21.0.1-1 +- Update to 21.0.1 +Resolves: rhbz#1922592 + +* Tue Jan 26 2021 Lumír Balhar - 21.0-1 +- Update to 21.0 (#1919530) + +* Thu Dec 17 2020 Petr Viktorin - 20.3.3-1 +- Update to 20.3.3 + +* Mon Nov 30 2020 Miro Hrončok - 20.3-1 +- Update to 20.3 +- Add support for PEP 600: Future manylinux Platform Tags +- New resolver +- Fixes: rhbz#1893470 + +* Mon Oct 19 2020 Lumír Balhar - 20.2.4-1 +- Update to 20.2.4 (#1889112) + +* Wed Aug 05 2020 Tomas Orsava - 20.2.2-1 +- Update to 20.2.2 (#1838553) + +* Wed Jul 29 2020 Fedora Release Engineering - 20.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Lumír Balhar - 20.1.1-6 +- Do not emit a warning about root privileges when --root is used + +* Wed Jul 08 2020 Miro Hrončok - 20.1.1-5 +- Update bundled provides to match 20.1.1 + +* Tue Jun 16 2020 Lumír Balhar - 20.1.1-4 +- Deselect tests incompatible with the latest virtualenv + +* Sun May 24 2020 Miro Hrončok - 20.1.1-3 +- Rebuilt for Python 3.9 + +* Thu May 21 2020 Miro Hrončok - 20.1.1-2 +- Bootstrap for Python 3.9 + +* Wed May 20 2020 Tomas Hrnciar - 20.1.1-1 +- Update to 20.1.1 + +* Wed Apr 29 2020 Tomas Hrnciar - 20.1-1 +- Update to 20.1 + +* Mon Apr 27 2020 Tomas Hrnciar - 20.1~b1-1 +- Update to 20.1~b1 + +* Wed Apr 15 2020 Miro Hrončok - 20.0.2-4 +- Only recommend setuptools, don't require them + +* Fri Apr 10 2020 Miro Hrončok - 20.0.2-3 +- Allow setting $TMPDIR to $PWD/... during pip wheel (#1806625) + +* Tue Mar 10 2020 Miro Hrončok - 20.0.2-2 +- Don't warn the user about pip._internal.main() entrypoint to fix ensurepip + +* Mon Mar 02 2020 Miro Hrončok - 20.0.2-1 +- Update to 20.0.2 (#1793456) + +* Thu Jan 30 2020 Fedora Release Engineering - 19.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Nov 04 2019 Tomas Orsava - 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 - 19.2.3-2 +- Make /usr/bin/pip(3) work with user-installed pip 19.3+ (#1767212) + +* Mon Sep 02 2019 Miro Hrončok - 19.2.3-1 +- Update to 19.2.3 (#1742230) +- Drop patch that should strip path prefixes from RECORD files, the paths are relative + +* Wed Aug 21 2019 Petr Viktorin - 19.1.1-8 +- Remove python2-pip +- Make pip bootstrap itself, rather than with an extra bootstrap RPM build + +* Sat Aug 17 2019 Miro Hrončok - 19.1.1-7 +- Rebuilt for Python 3.8 + +* Wed Aug 14 2019 Miro Hrončok - 19.1.1-6 +- Bootstrap for Python 3.8 + +* Wed Aug 14 2019 Miro Hrončok - 19.1.1-5 +- Bootstrap for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 19.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 15 2019 Petr Viktorin - 19.1.1-3 +- Recommend libcrypt.so.1 for manylinux1 compatibility +- Make /usr/bin/pip Python 3 + +* Mon Jun 10 2019 Miro Hrončok - 19.1.1-2 +- Fix root warning when pip is invoked via python -m pip +- Remove a redundant second WARNING prefix form the abovementioned warning + +* Wed May 15 2019 Miro Hrončok - 19.1.1-1 +- Update to 19.1.1 (#1706995) + +* Thu Apr 25 2019 Miro Hrončok - 19.1-1 +- Update to 19.1 (#1702525) + +* Wed Mar 06 2019 Miro Hrončok - 19.0.3-1 +- Update to 19.0.3 (#1679277) + +* Wed Feb 13 2019 Miro Hrončok - 19.0.2-1 +- Update to 19.0.2 (#1668492) + +* Sat Feb 02 2019 Fedora Release Engineering - 18.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Dec 03 2018 Miro Hrončok - 18.1-2 +- Use the system level root certificate instead of the one bundled in certifi + +* Thu Nov 22 2018 Miro Hrončok - 18.1-1 +- Update to 18.1 (#1652089) + +* Tue Sep 18 2018 Victor Stinner - 18.0-4 +- Prevent removing of the system packages installed under /usr/lib + when pip install -U is executed. Original patch by Michal Cyprian. + Resolves: rhbz#1550368. + +* Wed Aug 08 2018 Miro Hrončok - 18.0-3 +- Create python-pip-wheel package with the wheel + +* Tue Jul 31 2018 Miro Hrončok - 18.0-2 +- Remove redundant "Unicode" from License + +* Mon Jul 23 2018 Marcel Plch - 18.0-7 +- Update to 18.0 + +* Sat Jul 14 2018 Fedora Release Engineering - 9.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Miro Hrončok - 9.0.3-5 +- Rebuilt for Python 3.7 + +* Wed Jun 13 2018 Miro Hrončok - 9.0.3-4 +- Bootstrap for Python 3.7 + +* Wed Jun 13 2018 Miro Hrončok - 9.0.3-3 +- Bootstrap for Python 3.7 + +* Fri May 04 2018 Miro Hrončok - 9.0.3-2 +- Allow to import pip10's main from pip9's /usr/bin/pip +- Do not show the "new version of pip" warning outside of venv +Resolves: rhbz#1569488 +Resolves: rhbz#1571650 +Resolves: rhbz#1573755 + +* Thu Mar 29 2018 Charalampos Stratakis - 9.0.3-1 +- Update to 9.0.3 + +* Wed Feb 21 2018 Lumír Balhar - 9.0.1-16 +- Include built HTML documentation (in the new -doc subpackage) and man page + +* Fri Feb 09 2018 Fedora Release Engineering - 9.0.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Dec 04 2017 Charalampos Stratakis - 9.0.1-14 +- Reintroduce the ipaddress module in the python3 subpackage. + +* Mon Nov 20 2017 Charalampos Stratakis - 9.0.1-13 +- Add virtual provides for the bundled libraries. (rhbz#1096912) + +* Tue Aug 29 2017 Tomas Orsava - 9.0.1-12 +- Switch macros to bcond's and make Python 2 optional to facilitate building + the Python 2 and Python 3 modules + +* Thu Jul 27 2017 Fedora Release Engineering - 9.0.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue May 23 2017 Tomas Orsava - 9.0.1-10 +- Modernized package descriptions +Resolves: rhbz#1452568 + +* Tue Mar 21 2017 Tomas Orsava - 9.0.1-9 +- Fix typo in the sudo pip warning + +* Fri Mar 03 2017 Tomas Orsava - 9.0.1-8 +- Patch 1 update: No sudo pip warning in venv or virtualenv + +* Thu Feb 23 2017 Tomas Orsava - 9.0.1-7 +- Patch 1 update: Customize the warning with the proper version of the pip + command + +* Tue Feb 14 2017 Tomas Orsava - 9.0.1-6 +- Added patch 1: Emit a warning when running with root privileges + +* Sat Feb 11 2017 Fedora Release Engineering - 9.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 02 2017 Tomas Orsava - 9.0.1-4 +- Provide symlinks to executables to comply with Fedora guidelines for Python +Resolves: rhbz#1406922 + +* Fri Dec 09 2016 Charalampos Stratakis - 9.0.1-3 +- Rebuild for Python 3.6 with wheel + +* Fri Dec 09 2016 Charalampos Stratakis - 9.0.1-2 +- Rebuild for Python 3.6 without wheel + +* Fri Nov 18 2016 Orion Poplawski - 9.0.1-1 +- Update to 9.0.1 + +* Fri Nov 18 2016 Orion Poplawski - 8.1.2-5 +- Enable EPEL Python 3 builds +- Use new python macros +- Cleanup spec + +* Fri Aug 05 2016 Tomas Orsava - 8.1.2-4 +- Updated the test sources + +* Fri Aug 05 2016 Tomas Orsava - 8.1.2-3 +- Moved python-pip into the python2-pip subpackage +- Added the python_provide macro + +* Tue Jul 19 2016 Fedora Release Engineering - 8.1.2-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Tue May 17 2016 Tomas Orsava - 8.1.2-1 +- Update to 8.1.2 +- Moved to a new PyPI URL format +- Updated the prefix-stripping patch because of upstream changes in pip/wheel.py + +* Mon Feb 22 2016 Slavek Kabrda - 8.0.2-1 +- Update to 8.0.2 + +* Thu Feb 04 2016 Fedora Release Engineering - 7.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Oct 14 2015 Robert Kuska - 7.1.0-3 +- Rebuilt for Python3.5 rebuild +- With wheel set to 1 + +* Tue Oct 13 2015 Robert Kuska - 7.1.0-2 +- Rebuilt for Python3.5 rebuild + +* Wed Jul 01 2015 Slavek Kabrda - 7.1.0-1 +- Update to 7.1.0 + +* Tue Jun 30 2015 Ville Skyttä - 7.0.3-3 +- Install bash completion +- Ship LICENSE.txt as %%license where available + +* Thu Jun 18 2015 Fedora Release Engineering - 7.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Jun 04 2015 Matej Stuchlik - 7.0.3-1 +- Update to 7.0.3 + +* Fri Mar 06 2015 Matej Stuchlik - 6.0.8-1 +- Update to 6.0.8 + +* Thu Dec 18 2014 Slavek Kabrda - 1.5.6-5 +- Only enable tests on Fedora. + +* Mon Dec 01 2014 Matej Stuchlik - 1.5.6-4 +- Add tests +- Add patch skipping tests requiring Internet access + +* Tue Nov 18 2014 Matej Stuchlik - 1.5.6-3 +- Added patch for local dos with predictable temp dictionary names + (http://seclists.org/oss-sec/2014/q4/655) + +* Sat Jun 07 2014 Fedora Release Engineering - 1.5.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun May 25 2014 Matej Stuchlik - 1.5.6-1 +- Update to 1.5.6 + +* Fri Apr 25 2014 Matej Stuchlik - 1.5.4-4 +- Rebuild as wheel for Python 3.4 + +* Thu Apr 24 2014 Matej Stuchlik - 1.5.4-3 +- Disable build_wheel + +* Thu Apr 24 2014 Matej Stuchlik - 1.5.4-2 +- Rebuild as wheel for Python 3.4 + +* Mon Apr 07 2014 Matej Stuchlik - 1.5.4-1 +- Updated to 1.5.4 + +* Mon Oct 14 2013 Tim Flink - 1.4.1-1 +- Removed patch for CVE 2013-2099 as it has been included in the upstream 1.4.1 release +- Updated version to 1.4.1 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 16 2013 Toshio Kuratomi - 1.3.1-4 +- Fix for CVE 2013-2099 + +* Thu May 23 2013 Tim Flink - 1.3.1-3 +- undo python2 executable rename to python-pip. fixes #958377 +- fix summary to match upstream + +* Mon May 06 2013 Kevin Kofler - 1.3.1-2 +- Fix main package Summary, it's for Python 2, not 3 (#877401) + +* Fri Apr 26 2013 Jon Ciesla - 1.3.1-1 +- Update to 1.3.1, fix for CVE-2013-1888. + +* Thu Feb 14 2013 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Oct 09 2012 Tim Flink - 1.2.1-2 +- Fixing files for python3-pip + +* Thu Oct 04 2012 Tim Flink - 1.2.1-1 +- Update to upstream 1.2.1 +- Change binary from pip-python to python-pip (RHBZ#855495) +- Add alias from python-pip to pip-python, to be removed at a later date + +* Tue May 15 2012 Tim Flink - 1.1.0-1 +- Update to upstream 1.1.0 + +* Sat Jan 14 2012 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sat Oct 22 2011 Tim Flink - 1.0.2-1 +- update to 1.0.2 and added python3 subpackage + +* Wed Jun 22 2011 Tim Flink - 0.8.3-1 +- update to 0.8.3 and project home page + +* Tue Feb 08 2011 Fedora Release Engineering - 0.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Dec 20 2010 Luke Macken - 0.8.2-1 +- update to 0.8.2 of pip +* Mon Aug 30 2010 Peter Halliday - 0.8-1 +- update to 0.8 of pip +* Thu Jul 22 2010 David Malcolm - 0.7.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Wed Jul 7 2010 Peter Halliday - 0.7.2-1 +- update to 0.7.2 of pip +* Sun May 23 2010 Peter Halliday - 0.7.1-1 +- update to 0.7.1 of pip +* Fri Jan 1 2010 Peter Halliday - 0.6.1.4 +- fix dependency issue +* Fri Dec 18 2009 Peter Halliday - 0.6.1-2 +- fix spec file +* Thu Dec 17 2009 Peter Halliday - 0.6.1-1 +- upgrade to 0.6.1 of pip +* Mon Aug 31 2009 Peter Halliday - 0.4-1 +- Initial package diff --git a/downstream-remove-pytest-subket.patch b/downstream-remove-pytest-subket.patch new file mode 100644 index 0000000..564794c --- /dev/null +++ b/downstream-remove-pytest-subket.patch @@ -0,0 +1,54 @@ +From 35378ae02912d704d466e4809070e17a8d13ad0a Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Thu, 7 Aug 2025 15:05:34 +0200 +Subject: [PATCH] Downstream-Only: Remove pytest-subket from tests + +--- + tests/conftest.py | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git a/tests/conftest.py b/tests/conftest.py +index c98b871..ada7a7e 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -451,18 +451,6 @@ def coverage_install( + return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage") + + +-@pytest.fixture(scope="session") +-def socket_install(tmpdir_factory: pytest.TempPathFactory, common_wheels: Path) -> Path: +- lib_dir = _common_wheel_editable_install( +- tmpdir_factory, common_wheels, "pytest_subket" +- ) +- # pytest-subket is only included so it can intercept and block unexpected +- # network requests. It should NOT be visible to the pip under test. +- dist_info = next(lib_dir.glob("*.dist-info")) +- shutil.rmtree(dist_info) +- return lib_dir +- +- + def install_pth_link( + venv: VirtualEnvironment, project_name: str, lib_dir: Path + ) -> None: +@@ -480,7 +468,6 @@ def virtualenv_template( + setuptools_install: Path, + wheel_install: Path, + coverage_install: Path, +- socket_install: Path, + ) -> VirtualEnvironment: + venv_type: VirtualEnvironmentType + if request.config.getoption("--use-venv"): +@@ -495,10 +482,6 @@ def virtualenv_template( + # Install setuptools, wheel, pytest-subket, and pip. + install_pth_link(venv, "setuptools", setuptools_install) + install_pth_link(venv, "wheel", wheel_install) +- install_pth_link(venv, "pytest_subket", socket_install) +- # Also copy pytest-subket's .pth file so it can intercept socket calls. +- with open(venv.site / "pytest_socket.pth", "w") as f: +- f.write(socket_install.joinpath("pytest_socket.pth").read_text()) + + pth, dist_info = pip_editable_parts + +-- +2.50.1 + diff --git a/dummy-certifi.patch b/dummy-certifi.patch index 6e02685..ce34415 100644 --- a/dummy-certifi.patch +++ b/dummy-certifi.patch @@ -1,12 +1,103 @@ +From 7b5fbac83944e3a0dd975ff17b69358791b68721 Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Thu, 27 Jun 2024 10:38:53 +0200 +Subject: [PATCH] Dummy certifi patch + +--- + src/pip/_vendor/certifi/core.py | 80 +++------------------------------ + 1 file changed, 6 insertions(+), 74 deletions(-) + diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py -index 7271acf..9f0dc20 100644 +index 2f2f7e0..bec6595 100644 --- a/src/pip/_vendor/certifi/core.py +++ b/src/pip/_vendor/certifi/core.py -@@ -10,6 +10,4 @@ import os +@@ -4,80 +4,12 @@ certifi.py + + This module returns the installation location of cacert.pem or its contents. + """ +-import sys +-import atexit + +-def exit_cacert_ctx() -> None: +- _CACERT_CTX.__exit__(None, None, None) # type: ignore[union-attr] ++# The RPM-packaged certifi always uses the system certificates ++def where() -> str: ++ return '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem' - def where(): -- f = os.path.dirname(__file__) +-if sys.version_info >= (3, 11): - -- return os.path.join(f, 'cacert.pem') -+ return '/etc/pki/tls/certs/ca-bundle.crt' +- from importlib.resources import as_file, files +- +- _CACERT_CTX = None +- _CACERT_PATH = None +- +- def where() -> str: +- # This is slightly terrible, but we want to delay extracting the file +- # in cases where we're inside of a zipimport situation until someone +- # actually calls where(), but we don't want to re-extract the file +- # on every call of where(), so we'll do it once then store it in a +- # global variable. +- global _CACERT_CTX +- global _CACERT_PATH +- if _CACERT_PATH is None: +- # This is slightly janky, the importlib.resources API wants you to +- # manage the cleanup of this file, so it doesn't actually return a +- # path, it returns a context manager that will give you the path +- # when you enter it and will do any cleanup when you leave it. In +- # the common case of not needing a temporary file, it will just +- # return the file system location and the __exit__() is a no-op. +- # +- # We also have to hold onto the actual context manager, because +- # it will do the cleanup whenever it gets garbage collected, so +- # we will also store that at the global level as well. +- _CACERT_CTX = as_file(files("pip._vendor.certifi").joinpath("cacert.pem")) +- _CACERT_PATH = str(_CACERT_CTX.__enter__()) +- atexit.register(exit_cacert_ctx) +- +- return _CACERT_PATH +- +- def contents() -> str: +- return files("pip._vendor.certifi").joinpath("cacert.pem").read_text(encoding="ascii") +- +-else: +- +- from importlib.resources import path as get_path, read_text +- +- _CACERT_CTX = None +- _CACERT_PATH = None +- +- def where() -> str: +- # This is slightly terrible, but we want to delay extracting the +- # file in cases where we're inside of a zipimport situation until +- # someone actually calls where(), but we don't want to re-extract +- # the file on every call of where(), so we'll do it once then store +- # it in a global variable. +- global _CACERT_CTX +- global _CACERT_PATH +- if _CACERT_PATH is None: +- # This is slightly janky, the importlib.resources API wants you +- # to manage the cleanup of this file, so it doesn't actually +- # return a path, it returns a context manager that will give +- # you the path when you enter it and will do any cleanup when +- # you leave it. In the common case of not needing a temporary +- # file, it will just return the file system location and the +- # __exit__() is a no-op. +- # +- # We also have to hold onto the actual context manager, because +- # it will do the cleanup whenever it gets garbage collected, so +- # we will also store that at the global level as well. +- _CACERT_CTX = get_path("pip._vendor.certifi", "cacert.pem") +- _CACERT_PATH = str(_CACERT_CTX.__enter__()) +- atexit.register(exit_cacert_ctx) +- +- return _CACERT_PATH +- +- def contents() -> str: +- return read_text("pip._vendor.certifi", "cacert.pem", encoding="ascii") ++def contents() -> str: ++ with open(where(), encoding='utf=8') as data: ++ return data.read() +-- +2.50.1 + diff --git a/emit-a-warning-when-running-with-root-privileges.patch b/emit-a-warning-when-running-with-root-privileges.patch deleted file mode 100644 index c782610..0000000 --- a/emit-a-warning-when-running-with-root-privileges.patch +++ /dev/null @@ -1,51 +0,0 @@ -From aab24967a03bda3b0999d80562a6064c27d1e0e0 Mon Sep 17 00:00:00 2001 -From: Tomas Orsava -Date: Tue, 12 Nov 2019 17:15:08 +0100 -Subject: [PATCH] Downstream only patch - -Emit a warning to the user if pip install is run with root privileges -Issue upstream: https://github.com/pypa/pip/issues/4288 ---- - src/pip/_internal/commands/install.py | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py -index 5842d18..a6104b4 100644 ---- a/src/pip/_internal/commands/install.py -+++ b/src/pip/_internal/commands/install.py -@@ -12,6 +12,8 @@ import logging - import operator - import os - import shutil -+import sys -+from os import path - from optparse import SUPPRESS_HELP - - from pip._vendor import pkg_resources -@@ -281,6 +283,23 @@ class InstallCommand(RequirementCommand): - def run(self, options, args): - # type: (Values, List[Any]) -> int - cmdoptions.check_install_build_global(options) -+ -+ def is_venv(): -+ return (hasattr(sys, 'real_prefix') or -+ (hasattr(sys, 'base_prefix') and -+ sys.base_prefix != sys.prefix)) -+ -+ # Check whether we have root privileges and aren't in venv/virtualenv -+ if os.getuid() == 0 and not is_venv(): -+ command = path.basename(sys.argv[0]) -+ if command == "__main__.py": -+ command = path.basename(sys.executable) + " -m pip" -+ logger.warning( -+ "Running pip install with root privileges is " -+ "generally not a good idea. Try `%s install --user` instead." -+ % command -+ ) -+ - upgrade_strategy = "to-satisfy-only" - if options.upgrade: - upgrade_strategy = options.upgrade_strategy --- -2.20.1 - diff --git a/html_theme_path.patch b/html_theme_path.patch deleted file mode 100644 index 4209471..0000000 --- a/html_theme_path.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru pip-10.0.1/docs/conf.py pip-10.0.1_patched/docs/conf.py ---- pip-10.0.1/docs/html/conf.py 2018-04-14 13:17:31.000000000 +0200 -+++ pip-10.0.1_patched/docs/html/conf.py 2018-07-23 15:23:31.053267611 +0200 -@@ -134,6 +134,7 @@ - # The theme to use for HTML and HTML Help pages. Major themes that come with - # Sphinx are currently 'default' and 'sphinxdoc'. - html_theme = "pypa_theme" -+html_theme_path = ["pypa", "python-docs-theme"] - - # Theme options are theme-specific and customize the look and feel of a theme - # further. For a list of options available for each theme, see the diff --git a/local-dos.patch b/local-dos.patch deleted file mode 100644 index 721ca51..0000000 --- a/local-dos.patch +++ /dev/null @@ -1,395 +0,0 @@ -diff --git a/pip/cmdoptions.py b/pip/cmdoptions.py -index 8ed3d91..01b2104 100644 ---- a/pip/cmdoptions.py -+++ b/pip/cmdoptions.py -@@ -9,7 +9,7 @@ To be consistent, all options will follow this design. - """ - import copy - from optparse import OptionGroup, SUPPRESS_HELP, Option --from pip.locations import build_prefix, default_log_file -+from pip.locations import default_log_file - - - def make_option_group(group, parser): -@@ -297,10 +297,8 @@ build_dir = OptionMaker( - '-b', '--build', '--build-dir', '--build-directory', - dest='build_dir', - metavar='dir', -- default=build_prefix, -- help='Directory to unpack packages into and build in. ' -- 'The default in a virtualenv is "/build". ' -- 'The default for global installs is "/pip_build_".') -+ help='Directory to unpack packages into and build in.', -+) - - install_options = OptionMaker( - '--install-option', -diff --git a/pip/commands/install.py b/pip/commands/install.py -index cbf22a0..cb7d0db 100644 ---- a/pip/commands/install.py -+++ b/pip/commands/install.py -@@ -10,6 +10,7 @@ from pip.basecommand import Command - from pip.index import PackageFinder - from pip.exceptions import InstallationError, CommandError, PreviousBuildDirError - from pip import cmdoptions -+from pip.util import BuildDirectory - - - class InstallCommand(Command): -@@ -188,7 +189,7 @@ class InstallCommand(Command): - if ( - options.no_install or - options.no_download or -- (options.build_dir != build_prefix) or -+ options.build_dir or - options.no_clean - ): - logger.deprecated('1.7', 'DEPRECATION: --no-install, --no-download, --build, ' -@@ -197,7 +198,16 @@ class InstallCommand(Command): - if options.download_dir: - options.no_install = True - options.ignore_installed = True -- options.build_dir = os.path.abspath(options.build_dir) -+ -+ # If we have --no-install or --no-download and no --build we use the -+ # legacy static build dir -+ if (options.build_dir is None -+ and (options.no_install or options.no_download)): -+ options.build_dir = build_prefix -+ -+ if options.build_dir: -+ options.build_dir = os.path.abspath(options.build_dir) -+ - options.src_dir = os.path.abspath(options.src_dir) - install_options = options.install_options or [] - if options.use_user_site: -@@ -246,73 +256,75 @@ class InstallCommand(Command): - - finder = self._build_package_finder(options, index_urls, session) - -- requirement_set = RequirementSet( -- build_dir=options.build_dir, -- src_dir=options.src_dir, -- download_dir=options.download_dir, -- download_cache=options.download_cache, -- upgrade=options.upgrade, -- as_egg=options.as_egg, -- ignore_installed=options.ignore_installed, -- ignore_dependencies=options.ignore_dependencies, -- force_reinstall=options.force_reinstall, -- use_user_site=options.use_user_site, -- target_dir=temp_target_dir, -- session=session, -- pycompile=options.compile, -- ) -- for name in args: -- requirement_set.add_requirement( -- InstallRequirement.from_line(name, None)) -- for name in options.editables: -- requirement_set.add_requirement( -- InstallRequirement.from_editable(name, default_vcs=options.default_vcs)) -- for filename in options.requirements: -- for req in parse_requirements(filename, finder=finder, options=options, session=session): -- requirement_set.add_requirement(req) -- if not requirement_set.has_requirements: -- opts = {'name': self.name} -- if options.find_links: -- msg = ('You must give at least one requirement to %(name)s ' -- '(maybe you meant "pip %(name)s %(links)s"?)' % -- dict(opts, links=' '.join(options.find_links))) -- else: -- msg = ('You must give at least one requirement ' -- 'to %(name)s (see "pip help %(name)s")' % opts) -- logger.warn(msg) -- return -- -- try: -- if not options.no_download: -- requirement_set.prepare_files(finder, force_root_egg_info=self.bundle, bundle=self.bundle) -- else: -- requirement_set.locate_files() -- -- if not options.no_install and not self.bundle: -- requirement_set.install( -- install_options, -- global_options, -- root=options.root_path, -- strip_file_prefix=options.strip_file_prefix) -- installed = ' '.join([req.name for req in -- requirement_set.successfully_installed]) -- if installed: -- logger.notify('Successfully installed %s' % installed) -- elif not self.bundle: -- downloaded = ' '.join([req.name for req in -- requirement_set.successfully_downloaded]) -- if downloaded: -- logger.notify('Successfully downloaded %s' % downloaded) -- elif self.bundle: -- requirement_set.create_bundle(self.bundle_filename) -- logger.notify('Created bundle in %s' % self.bundle_filename) -- except PreviousBuildDirError: -- options.no_clean = True -- raise -- finally: -- # Clean up -- if (not options.no_clean) and ((not options.no_install) or options.download_dir): -- requirement_set.cleanup_files(bundle=self.bundle) -+ build_delete = (not (options.no_clean or options.build_dir)) -+ with BuildDirectory(options.build_dir, delete=build_delete) as build_dir: -+ requirement_set = RequirementSet( -+ build_dir=build_dir, -+ src_dir=options.src_dir, -+ download_dir=options.download_dir, -+ download_cache=options.download_cache, -+ upgrade=options.upgrade, -+ as_egg=options.as_egg, -+ ignore_installed=options.ignore_installed, -+ ignore_dependencies=options.ignore_dependencies, -+ force_reinstall=options.force_reinstall, -+ use_user_site=options.use_user_site, -+ target_dir=temp_target_dir, -+ session=session, -+ pycompile=options.compile, -+ ) -+ for name in args: -+ requirement_set.add_requirement( -+ InstallRequirement.from_line(name, None)) -+ for name in options.editables: -+ requirement_set.add_requirement( -+ InstallRequirement.from_editable(name, default_vcs=options.default_vcs)) -+ for filename in options.requirements: -+ for req in parse_requirements(filename, finder=finder, options=options, session=session): -+ requirement_set.add_requirement(req) -+ if not requirement_set.has_requirements: -+ opts = {'name': self.name} -+ if options.find_links: -+ msg = ('You must give at least one requirement to %(name)s ' -+ '(maybe you meant "pip %(name)s %(links)s"?)' % -+ dict(opts, links=' '.join(options.find_links))) -+ else: -+ msg = ('You must give at least one requirement ' -+ 'to %(name)s (see "pip help %(name)s")' % opts) -+ logger.warn(msg) -+ return -+ -+ try: -+ if not options.no_download: -+ requirement_set.prepare_files(finder, force_root_egg_info=self.bundle, bundle=self.bundle) -+ else: -+ requirement_set.locate_files() -+ -+ if not options.no_install and not self.bundle: -+ requirement_set.install( -+ install_options, -+ global_options, -+ root=options.root_path, -+ strip_file_prefix=options.strip_file_prefix) -+ installed = ' '.join([req.name for req in -+ requirement_set.successfully_installed]) -+ if installed: -+ logger.notify('Successfully installed %s' % installed) -+ elif not self.bundle: -+ downloaded = ' '.join([req.name for req in -+ requirement_set.successfully_downloaded]) -+ if downloaded: -+ logger.notify('Successfully downloaded %s' % downloaded) -+ elif self.bundle: -+ requirement_set.create_bundle(self.bundle_filename) -+ logger.notify('Created bundle in %s' % self.bundle_filename) -+ except PreviousBuildDirError: -+ options.no_clean = True -+ raise -+ finally: -+ # Clean up -+ if (not options.no_clean) and ((not options.no_install) or options.download_dir): -+ requirement_set.cleanup_files(bundle=self.bundle) - - if options.target_dir: - if not os.path.exists(options.target_dir): -diff --git a/pip/commands/wheel.py b/pip/commands/wheel.py -index 6527063..a96631a 100644 ---- a/pip/commands/wheel.py -+++ b/pip/commands/wheel.py -@@ -8,7 +8,7 @@ from pip.index import PackageFinder - from pip.log import logger - from pip.exceptions import CommandError, PreviousBuildDirError - from pip.req import InstallRequirement, RequirementSet, parse_requirements --from pip.util import normalize_path -+from pip.util import BuildDirectory, normalize_path - from pip.wheel import WheelBuilder - from pip import cmdoptions - -@@ -123,6 +123,9 @@ class WheelCommand(Command): - "--extra-index-url is suggested.") - index_urls += options.mirrors - -+ if options.build_dir: -+ options.build_dir = os.path.abspath(options.build_dir) -+ - session = self._build_session(options) - - finder = PackageFinder(find_links=options.find_links, -@@ -137,59 +140,60 @@ class WheelCommand(Command): - session=session, - ) - -- options.build_dir = os.path.abspath(options.build_dir) -- requirement_set = RequirementSet( -- build_dir=options.build_dir, -- src_dir=None, -- download_dir=None, -- download_cache=options.download_cache, -- ignore_dependencies=options.ignore_dependencies, -- ignore_installed=True, -- session=session, -- wheel_download_dir=options.wheel_dir -- ) -- -- # make the wheelhouse -- if not os.path.exists(options.wheel_dir): -- os.makedirs(options.wheel_dir) -- -- #parse args and/or requirements files -- for name in args: -- requirement_set.add_requirement( -- InstallRequirement.from_line(name, None)) -- -- for filename in options.requirements: -- for req in parse_requirements( -- filename, -- finder=finder, -- options=options, -- session=session): -- if req.editable: -- logger.notify("ignoring %s" % req.url) -- continue -- requirement_set.add_requirement(req) -- -- #fail if no requirements -- if not requirement_set.has_requirements: -- opts = {'name': self.name} -- msg = ('You must give at least one requirement ' -- 'to %(name)s (see "pip help %(name)s")' % opts) -- logger.error(msg) -- return -+ build_delete = (not (options.no_clean or options.build_dir)) -+ with BuildDirectory(options.build_dir, delete=build_delete) as build_dir: -+ requirement_set = RequirementSet( -+ build_dir=build_dir, -+ src_dir=None, -+ download_dir=None, -+ download_cache=options.download_cache, -+ ignore_dependencies=options.ignore_dependencies, -+ ignore_installed=True, -+ session=session, -+ wheel_download_dir=options.wheel_dir -+ ) - -- try: -- #build wheels -- wb = WheelBuilder( -- requirement_set, -- finder, -- options.wheel_dir, -- build_options = options.build_options or [], -- global_options = options.global_options or [] -- ) -- wb.build() -- except PreviousBuildDirError: -- options.no_clean = True -- raise -- finally: -- if not options.no_clean: -- requirement_set.cleanup_files() -+ # make the wheelhouse -+ if not os.path.exists(options.wheel_dir): -+ os.makedirs(options.wheel_dir) -+ -+ #parse args and/or requirements files -+ for name in args: -+ requirement_set.add_requirement( -+ InstallRequirement.from_line(name, None)) -+ -+ for filename in options.requirements: -+ for req in parse_requirements( -+ filename, -+ finder=finder, -+ options=options, -+ session=session): -+ if req.editable: -+ logger.notify("ignoring %s" % req.url) -+ continue -+ requirement_set.add_requirement(req) -+ -+ #fail if no requirements -+ if not requirement_set.has_requirements: -+ opts = {'name': self.name} -+ msg = ('You must give at least one requirement ' -+ 'to %(name)s (see "pip help %(name)s")' % opts) -+ logger.error(msg) -+ return -+ -+ try: -+ #build wheels -+ wb = WheelBuilder( -+ requirement_set, -+ finder, -+ options.wheel_dir, -+ build_options = options.build_options or [], -+ global_options = options.global_options or [] -+ ) -+ wb.build() -+ except PreviousBuildDirError: -+ options.no_clean = True -+ raise -+ finally: -+ if not options.no_clean: -+ requirement_set.cleanup_files() -diff --git a/pip/util.py b/pip/util.py -index f459bb2..f5edeeb 100644 ---- a/pip/util.py -+++ b/pip/util.py -@@ -8,6 +8,7 @@ import zipfile - import tarfile - import subprocess - import textwrap -+import tempfile - - from pip.exceptions import InstallationError, BadCommand, PipError - from pip.backwardcompat import(WindowsError, string_types, raw_input, -@@ -718,3 +719,35 @@ def is_prerelease(vers): - - parsed = version._normalized_key(normalized) - return any([any([y in set(["a", "b", "c", "rc", "dev"]) for y in x]) for x in parsed]) -+ -+ -+class BuildDirectory(object): -+ -+ def __init__(self, name=None, delete=None): -+ # If we were not given an explicit directory, and we were not given an -+ # explicit delete option, then we'll default to deleting. -+ if name is None and delete is None: -+ delete = True -+ -+ if name is None: -+ name = tempfile.mkdtemp(prefix="pip-build-") -+ # If we were not given an explicit directory, and we were not given -+ # an explicit delete option, then we'll default to deleting. -+ if delete is None: -+ delete = True -+ -+ self.name = name -+ self.delete = delete -+ -+ def __repr__(self): -+ return "<{} {!r}>".format(self.__class__.__name__, self.name) -+ -+ def __enter__(self): -+ return self.name -+ -+ def __exit__(self, exc, value, tb): -+ self.cleanup() -+ -+ def cleanup(self): -+ if self.delete: -+ rmtree(self.name) 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/pip-allow-different-versions.patch b/pip-allow-different-versions.patch deleted file mode 100644 index 8b8fa47..0000000 --- a/pip-allow-different-versions.patch +++ /dev/null @@ -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()) diff --git a/plan.fmf b/plan.fmf new file mode 100644 index 0000000..72ad07b --- /dev/null +++ b/plan.fmf @@ -0,0 +1,111 @@ +execute: + how: tmt + +discover: + - name: tests_python + how: shell + url: https://src.fedoraproject.org/tests/python.git + tests: + - name: smoke36 + path: /smoke + test: VERSION=3.6 TOX=false ./venv.sh + - name: smoke39 + path: /smoke + test: VERSION=3.9 ./venv.sh + - name: smoke310 + path: /smoke + test: VERSION=3.10 ./venv.sh + - name: smoke311 + path: /smoke + test: VERSION=3.11 ./venv.sh + - name: smoke312 + path: /smoke + test: VERSION=3.12 ./venv.sh + - name: smoke313 + path: /smoke + test: VERSION=3.13 ./venv.sh + - name: smoke314 + path: /smoke + test: VERSION=3.14 ./venv.sh + - name: smoke315 + path: /smoke + test: VERSION=3.15 ./venv.sh + - name: smoke39_virtualenv + path: /smoke + test: VERSION=3.9 METHOD=virtualenv ./venv.sh + - name: smoke310_virtualenv + path: /smoke + test: VERSION=3.10 METHOD=virtualenv ./venv.sh + - name: smoke311_virtualenv + path: /smoke + test: VERSION=3.11 METHOD=virtualenv ./venv.sh + - name: smoke312_virtualenv + path: /smoke + test: VERSION=3.12 METHOD=virtualenv ./venv.sh + - name: smoke313_virtualenv + path: /smoke + test: VERSION=3.13 METHOD=virtualenv ./venv.sh + - name: smoke314_virtualenv + path: /smoke + test: VERSION=3.14 METHOD=virtualenv ./venv.sh + - name: smoke315_virtualenv + path: /smoke + test: VERSION=3.15 METHOD=virtualenv ./venv.sh + - name: rpms_pyproject-rpm-macros + how: shell + url: https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git + tests: + - name: pyproject_pytest + path: /tests + test: ./mocktest.sh python-pytest + - name: pyproject_entrypoints + path: /tests + test: ./mocktest.sh python-entrypoints + - name: pyproject_pluggy + path: /tests + test: ./mocktest.sh python-pluggy + - name: pyproject_clikit + path: /tests + test: ./mocktest.sh python-clikit + - name: same_repo + how: shell + dist-git-source: true + dist-git-download-only: true + tests: + - name: mock_bootstrap_build + test: | + cd $TMT_SOURCE_DIR && + $TMT_TREE/../discover/rpms_pyproject-rpm-macros/tests/tests/mocktest.sh python-pip --without tests --without man + - name: pip_install_upgrade + path: /tests/pip_install_upgrade/ + test: ./runtest.sh + - name: bash_completion + path: /tests/bash_completion + test: ./pip_completion_full_test.sh +prepare: + - name: Install dependencies + how: install + package: + - gcc + - virtualenv + - python3.6-devel + - python3.9-devel + - python3.10-devel + - python3.11-devel + - python3.12-devel + - python3.13-devel + - python3.14-devel + - python3.15-devel + - python3-devel + - python3-tox + - mock + - rpmdevtools + - rpm-build + - grep + - util-linux + - shadow-utils + - expect + - dnf + - name: Update packages + how: shell + script: dnf upgrade -y diff --git a/python-pip.rpmlintrc b/python-pip.rpmlintrc index 5ccb1f8..d32664b 100644 --- a/python-pip.rpmlintrc +++ b/python-pip.rpmlintrc @@ -1,15 +1,9 @@ # This is just temporary, when upstream merges PRs it can be removed -# https://github.com/pypa/pip/pull/7959 -# https://github.com/ActiveState/appdirs/pull/144 # https://github.com/psf/requests/pull/5410 -# https://github.com/chardet/chardet/pull/192 -addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_internal/__init__.py\b') -addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_vendor/appdirs.py\b') addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_vendor/requests/certs.py\b') -addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_vendor/chardet/cli/chardetect.py\b') + +# This file is actually a script but in the vendored context of pip, it is never executed +addFilter(r'non-executable-script .+/pip/_vendor/distro/distro.py\b') # We ship README with the main package but not with the wheel addFilter(r'python-pip-wheel.noarch: W: no-documentation') - -# SPELLING ERRORS -addFilter(r'W: spelling-error .* venv') diff --git a/python-pip.spec b/python-pip.spec index abbcb0b..8dc0aff 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -1,130 +1,115 @@ -%bcond_without tests - -%bcond_without doc +# The original RHEL N+1 content set is defined by (build)dependencies +# of the packages in Fedora ELN. Hence we disable tests here +# to prevent pulling many unwanted packages in. +%bcond tests %{defined fedora} +# Whether to build the manual pages (useful for bootstrapping Sphinx) +%bcond man 1 %global srcname pip -%global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl -%global python_wheeldir %{_datadir}/python-wheels - -%if %{with doc} -%global pypa_theme_commit_hash d2e63fbfc62af3b7050f619b2f5bb8658985b931 -%endif - -%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) +%global base_version 25.3 +%global upstream_version %{base_version}%{?prerel} +%global python_wheel_name %{srcname}-%{upstream_version}-py3-none-any.whl Name: python-%{srcname} -# When updating, update the bundled libraries versions bellow! -# You can use vendor_meta.sh in the dist git repo -Version: 19.3.1 -Release: 4%{?dist} +Version: %{base_version}%{?prerel:~%{prerel}} +Release: %autorelease Summary: A tool for installing and managing Python packages # We bundle a lot of libraries with pip, which itself is under MIT license. # Here is the list of the libraries with corresponding licenses: -# appdirs: MIT -# certifi: MPLv2.0 -# chardet: LGPLv2 -# colorama: BSD -# CacheControl: ASL 2.0 -# contextlib2: Python -# distlib: Python -# distro: ASL 2.0 -# html5lib: MIT -# idna: BSD -# ipaddress: Python -# msgpack: ASL 2.0 -# packaging: ASL 2.0 or BSD -# pep517: MIT -# progress: ISC -# pyparsing: MIT -# pytoml: MIT -# requests: ASL 2.0 -# retrying: ASL 2.0 +# certifi: MPL-2.0 +# CacheControl: Apache-2.0 +# dependency-groups: MIT +# distlib: Python-2.0.1 +# distro: Apache-2.0 +# idna: BSD-3-Clause +# msgpack: Apache-2.0 +# packaging: Apache-2.0 OR BSD-2-Clause +# platformdirs: MIT +# pygments: BSD-2-Clause +# pyproject-hooks: MIT +# requests: Apache-2.0 +# resolvelib: ISC +# rich: MIT # setuptools: MIT -# six: MIT +# truststore: MIT +# tomli: MIT +# tomli-w: MIT # urllib3: MIT -# 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-2.0.1 AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MPL-2.0 AND (Apache-2.0 OR BSD-2-Clause) 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 + +# The following sources are wheels used only for tests. +# They are not bundled in the built package and do not contribute to the overall license. +# They are pre-built but only contain text files, rebuilding them in %%build has very little benefit. + +# setuptools.whl +# We cannot use RPM-packaged python-setuptools-wheel because upstream pins to <80. +# See https://github.com/pypa/pip/pull/13357 for rationale. +Source1: https://files.pythonhosted.org/packages/0d/6d/b4752b044bf94cb802d88a888dc7d288baaf77d7910b7dedda74b5ceea0c/setuptools-79.0.1-py3-none-any.whl + +# wheel.whl +# We cannot use RPM-packaged python-wheel-wheel because we intent to drop that package in wheel 0.46+. +# That version of wheel has runtime dependencies and is generally useless as a standalone wheel. +# See https://github.com/pypa/pip/pull/13382 as an attempt to drop the requirement from pip tests. +Source2: https://files.pythonhosted.org/packages/0b/2c/87f3254fd8ffd29e4c02732eee68a83a1d3c346ae39bc6822dcbcb697f2b/wheel-0.45.1-py3-none-any.whl + +# flit_core.whl +# This is not built as RPM-packaged wheel in Fedora at all. +Source3: https://files.pythonhosted.org/packages/f2/65/b6ba90634c984a4fcc02c7e3afe523fef500c4980fec67cc27536ee50acf/flit_core-3.12.0-py3-none-any.whl + +# coverage.whl +# There is no RPM-packaged python-coverage-wheel, the package is archful. +# Upstream uses this to measure coverage, which we don't. +# This is a dummy placeholder package that only contains empty coverage.process_startup(). +# That way, we don't need to patch the usage out of conftest.py. +Source4: coverage-0-py3-none-any.whl BuildArch: noarch %if %{with tests} BuildRequires: /usr/bin/git +BuildRequires: /usr/bin/hg BuildRequires: /usr/bin/bzr BuildRequires: /usr/bin/svn -BuildRequires: python-setuptools-wheel -BuildRequires: python-wheel-wheel +BuildRequires: python%{python3_pkgversion}-pytest-xdist %endif -# Themes required to build the docs. -%if %{with doc} -Source1: https://github.com/pypa/pypa-docs-theme/archive/%{pypa_theme_commit_hash}.tar.gz -Source2: https://github.com/python/python-docs-theme/archive/2018.2.tar.gz +%if %{with man} +# docs/requirements.txt contains many sphinx extensions +# however, we only build the manual pages thanks to +# https://github.com/pypa/pip/pull/13168 +# We also always use the "main" Sphinx, not python%%{python3_pkgversion}-sphinx +BuildRequires: python3-sphinx %endif -# Downstream only patch -# Emit a warning to the user if pip install is run with root privileges -# Issue upstream: https://github.com/pypa/pip/issues/4288 -Patch1: emit-a-warning-when-running-with-root-privileges.patch - -# Add path to the doc themes to conf.py -Patch2: html_theme_path.patch - # Prevent removing of the system packages installed under /usr/lib # when pip install -U is executed. # https://bugzilla.redhat.com/show_bug.cgi?id=1550368#c24 -Patch3: remove-existing-dist-only-if-path-conflicts.patch +# Could be replaced with https://www.python.org/dev/peps/pep-0668/ +Patch: remove-existing-dist-only-if-path-conflicts.patch # Use the system level root certificate instead of the one bundled in certifi # https://bugzilla.redhat.com/show_bug.cgi?id=1655253 -Patch4: dummy-certifi.patch +# The same patch is a part of the RPM-packaged python-certifi +Patch: dummy-certifi.patch -%if %{with tests} -# Mark tests that need the Internet as network tests so we can skip them -# https://github.com/pypa/pip/pull/7359 -Patch5: network-tests.patch -%endif +# pytest-subket has been introduced to intercept network calls +# https://github.com/pypa/pip/commit/a4b40f62332ccb3228b12cc5ae1493c75177247a +# We don't need a layer to check that, as we're by default in an offline environment +Patch: downstream-remove-pytest-subket.patch -# Dark magic to make pip 19.3+ support the old private API of main() -# This is needed to be able to use pip 19.3+ in ensurepip of older Pythons -# without patching all the Pythons -# A proper fix is discussed in: -# https://discuss.python.org/t/can-we-finally-add-a-minimal-api-to-pip/2833/3 -# https://github.com/pypa/pip/pull/7061 -# https://github.com/python/cpython/pull/16782 -Patch6: callable-main.patch +# Patch for the bundled urllib3 for CVE-2025-50181 +# Redirects are not disabled when retries are disabled on PoolManager instantiation +# Upstream fix: https://github.com/urllib3/urllib3/commit/f05b1329126d5be6de501f9d1e3e36738bc08857 +Patch: urllib3-CVE-2025-50181.patch -# Allow setting $TMPDIR to $PWD/... during pip wheel -# This is needed to have proper debugsource packages with pyproject-rpm-macros -# https://bugzilla.redhat.com/show_bug.cgi?id=1806625 -# Backported from https://github.com/pypa/pip/pull/7873 -Patch7: 7873.patch - -# Backported from https://github.com/pypa/pip/pull/8744 -Patch8: 8744.patch - -# Downstream only patch -# Users might have local installations of pip from using -# `pip install --user --upgrade pip` on older/newer versions. -# If they do that and they run `pip` or `pip3`, the one from /usr/bin is used. -# However that's the one from this RPM package and the import in there might -# fail (it tries to import from ~/.local, but older or newer pip is there with -# a bit different API). -# We add this patch as a dirty workaround to make /usr/bin/pip* work with -# both pip10+ (from this RPM) and older or newer (19.3+) pip (from whatever). -# A proper fix is to put ~/.local/bin in front of /usr/bin in the PATH, -# however others are against that and we cannot change it for existing -# installs/user homes anyway. -# https://bugzilla.redhat.com/show_bug.cgi?id=1569488 -# https://bugzilla.redhat.com/show_bug.cgi?id=1571650 -# https://bugzilla.redhat.com/show_bug.cgi?id=1767212 -# 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 -Source10: pip-allow-different-versions.patch +# Remove -s from Python shebang - ensure that packages installed with pip +# to user locations are seen by pip itself +%undefine _py3_shebang_s %description pip is a package management system used to install and manage software packages @@ -135,31 +120,28 @@ Packages" or "Pip Installs Python". # 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: -Provides: bundled(python%{1}dist(appdirs)) = 1.4.3 -Provides: bundled(python%{1}dist(CacheControl)) = 0.12.5 -Provides: bundled(python%{1}dist(certifi)) = 2019.9.11 -Provides: bundled(python%{1}dist(chardet)) = 3.0.4 -Provides: bundled(python%{1}dist(colorama)) = 0.4.1 -Provides: bundled(python%{1}dist(contextlib2)) = 0.6.0 -Provides: bundled(python%{1}dist(distlib)) = 0.2.9.post0 -Provides: bundled(python%{1}dist(distro)) = 1.4.0 -Provides: bundled(python%{1}dist(html5lib)) = 1.0.1 -Provides: bundled(python%{1}dist(idna)) = 2.8 -Provides: bundled(python%{1}dist(ipaddress)) = 1.0.22 -Provides: bundled(python%{1}dist(msgpack)) = 0.6.2 -Provides: bundled(python%{1}dist(packaging)) = 19.2 -Provides: bundled(python%{1}dist(pep517)) = 0.7.0 -Provides: bundled(python%{1}dist(progress)) = 1.5 -Provides: bundled(python%{1}dist(pyparsing)) = 2.4.2 -Provides: bundled(python%{1}dist(pytoml)) = 0.1.21 -Provides: bundled(python%{1}dist(requests)) = 2.22.0 -Provides: bundled(python%{1}dist(retrying)) = 1.3.3 -Provides: bundled(python%{1}dist(setuptools)) = 41.4.0 -Provides: bundled(python%{1}dist(six)) = 1.12.0 -Provides: bundled(python%{1}dist(urllib3)) = 1.25.6 -Provides: bundled(python%{1}dist(webencodings)) = 0.5.1 +Provides: bundled(python%{1}dist(cachecontrol)) = 0.14.3 +Provides: bundled(python%{1}dist(certifi)) = 2025.10.5 +Provides: bundled(python%{1}dist(dependency-groups)) = 1.3.1 +Provides: bundled(python%{1}dist(distlib)) = 0.4 +Provides: bundled(python%{1}dist(distro)) = 1.9 +Provides: bundled(python%{1}dist(idna)) = 3.10 +Provides: bundled(python%{1}dist(msgpack)) = 1.1.2 +Provides: bundled(python%{1}dist(packaging)) = 25 +Provides: bundled(python%{1}dist(platformdirs)) = 4.5 +Provides: bundled(python%{1}dist(pygments)) = 2.19.2 +Provides: bundled(python%{1}dist(pyproject-hooks)) = 1.2 +Provides: bundled(python%{1}dist(requests)) = 2.32.5 +Provides: bundled(python%{1}dist(resolvelib)) = 1.2.1 +Provides: bundled(python%{1}dist(rich)) = 14.2 +Provides: bundled(python%{1}dist(setuptools)) = 70.3 +Provides: bundled(python%{1}dist(tomli)) = 2.3 +Provides: bundled(python%{1}dist(tomli-w)) = 1.2 +Provides: bundled(python%{1}dist(truststore)) = 0.10.4 +Provides: bundled(python%{1}dist(urllib3)) = 1.26.20 } # Some manylinux1 wheels need libcrypt.so.1. @@ -173,6 +155,9 @@ Provides: bundled(python%{1}dist(webencodings)) = 0.5.1 # a long time until manylinux1 is phased out). # See: https://github.com/pypa/manylinux/issues/305 # Note that manylinux is only applicable to x86 (both 32 and 64 bits) +# As of Python 3.12, we no longer use this, +# see https://discuss.python.org/t/29455/ +# However, we keep it around for previous Python versions that use the wheel package. %global crypt_compat_recommends() %{expand: Recommends: (libcrypt.so.1()(64bit) if python%{1}(x86-64)) Recommends: (libcrypt.so.1 if python%{1}(x86-32)) @@ -186,31 +171,19 @@ Summary: A tool for installing and managing Python3 packages BuildRequires: python%{python3_pkgversion}-devel # python3 bootstrap: this is rebuilt before the final build of python3, which # adds the dependency on python3-rpm-generators, so we require it manually -BuildRequires: python%{python3_pkgversion}-rpm-generators -BuildRequires: python%{python3_pkgversion}-setuptools +# Note that the package prefix is always python3-, even if we build for 3.X +# The minimal version is for bundled provides verification script +BuildRequires: python3-rpm-generators >= 11-8 +BuildRequires: pyproject-rpm-macros +BuildRequires: python%{python3_pkgversion}-flit-core BuildRequires: bash-completion -%if %{with tests} -BuildRequires: python%{python3_pkgversion}-mock -BuildRequires: python%{python3_pkgversion}-pytest -BuildRequires: python%{python3_pkgversion}-pretend -BuildRequires: python%{python3_pkgversion}-freezegun -BuildRequires: python%{python3_pkgversion}-scripttest -BuildRequires: python%{python3_pkgversion}-virtualenv -BuildRequires: python%{python3_pkgversion}-pyyaml -%endif -BuildRequires: python%{python3_pkgversion}-wheel BuildRequires: ca-certificates Requires: ca-certificates -Requires: python%{python3_pkgversion}-setuptools # Virtual provides for the packages bundled by pip: -%{bundled 3} +%{bundled %{python3_pkgversion}} -%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} Provides: pip = %{version}-%{release} -Conflicts: python-pip < %{version}-%{release} - -%{crypt_compat_recommends 3} %description -n python%{python3_pkgversion}-%{srcname} pip is a package management system used to install and manage software packages @@ -218,474 +191,173 @@ written in Python. Many packages can be found in the Python Package Index (PyPI). pip is a recursive acronym that can stand for either "Pip Installs Packages" or "Pip Installs Python". -%if %{with doc} -%package doc -Summary: A documentation for a tool for installing and managing Python packages -BuildRequires: python%{python3_pkgversion}-sphinx - -%description doc -A documentation for a tool for installing and managing Python packages - -%endif - -%package wheel +%package -n %{python_wheel_pkg_prefix}-%{srcname}-wheel Summary: The pip wheel Requires: ca-certificates # Virtual provides for the packages bundled by pip: -%{bundled 2} -%{bundled 3} +%{bundled %{python3_pkgversion}} -%{crypt_compat_recommends 2} -%{crypt_compat_recommends 3} +# This is only relevant for Pythons that are older than 3.12 and don't use their own bundled wheels +# It is also only relevant when this wheel is shared across multiple Pythons +%if "%{python_wheel_pkg_prefix}" == "python" +%{crypt_compat_recommends 3.11} +%{crypt_compat_recommends 3.10} +%{crypt_compat_recommends 3.9} +%endif -%description wheel +%description -n %{python_wheel_pkg_prefix}-%{srcname}-wheel A Python wheel of pip to use with venv. %prep -%setup -q -n %{srcname}-%{version} - -%if %{with doc} -pushd docs/html -tar -xf %{SOURCE1} -mv pypa-docs-theme-%{pypa_theme_commit_hash} pypa -tar -xf %{SOURCE2} -mv python-docs-theme-2018.2 python-docs-theme -popd -%endif - -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%if %{with tests} -%patch5 -p1 -%endif -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%autosetup -p1 -n %{srcname}-%{upstream_version} # this goes together with patch4 rm src/pip/_vendor/certifi/*.pem +# Remove windows executable binaries +rm -v src/pip/_vendor/distlib/*.exe +sed -i '/\.exe/d' pyproject.toml + +# Remove unused test requirements +sed -Ei '/(pytest-(cov|xdist|rerunfailures|subket)|proxy\.py)/d' pyproject.toml + +# Remove unused pytest-subket options +sed -Ei '/(--disable-socket|--allow-unix-socket|--allow-hosts=localhost)/d' pyproject.toml + +%if %{with tests} # tests expect wheels in here -ln -s %{python_wheeldir} tests/data/common_wheels +mkdir tests/data/common_wheels +cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} tests/data/common_wheels +%endif + + +%if %{with tests} +%generate_buildrequires +# we only use this to generate test requires +# the "pyproject" part is explicitly disabled as it generates a requirement on pip +%pyproject_buildrequires -N -g test +%endif %build -%py3_build_wheel - -%if %{with doc} export PYTHONPATH=./src/ -# from tox.ini -sphinx-build-3 -b html docs/html docs/build/html -sphinx-build-3 -b man docs/man docs/build/man -c docs/html -rm -rf docs/build/html/{.doctrees,.buildinfo} +%pyproject_wheel + +%if %{with man} +sphinx-build -t man -b man -d docs/build/doctrees/man -c docs/html docs/man docs/build/man %endif %install +export PYTHONPATH=./src/ +%pyproject_install +%pyproject_save_files -l pip -# The following is similar to %%py3_install_wheel, but we don't have -# /usr/bin/pip yet, so we install using the wheel directly. -# (This is not standard wheel usage, but the pip wheel supports it -- see -# pip/__main__.py) -%{__python3} dist/%{python_wheelname}/pip install \ - -I 'dist/%{python_wheelname}' \ - --root %{buildroot} \ - --no-deps +# We'll install pip as pip3.X +# Later we'll provide symbolic links, manpage links and bashcompletion fixes for alternative names +%if "%{python3_pkgversion}" == "3" +%global alternate_names pip-%{python3_version} pip-3 pip3 pip +%else +%global alternate_names pip-%{python3_version} +%endif -%if %{with doc} +# Provide symlinks to executables +mv %{buildroot}%{_bindir}/pip %{buildroot}%{_bindir}/pip%{python3_version} +rm %{buildroot}%{_bindir}/pip3 +for pip in %{alternate_names}; do +ln -s ./pip%{python3_version} %{buildroot}%{_bindir}/$pip +done + +%if %{with man} pushd docs/build/man install -d %{buildroot}%{_mandir}/man1 for MAN in *1; do -install -pm0644 $MAN %{buildroot}%{_mandir}/man1/$MAN -for pip in "pip3" "pip-3" "pip%{python3_version}" "pip-%{python3_version}"; do -echo ".so $MAN" > %{buildroot}%{_mandir}/man1/${MAN/pip/$pip} +install -pm0644 $MAN %{buildroot}%{_mandir}/man1/${MAN/pip/pip%{python3_version}} +for pip in %{alternate_names}; do +echo ".so ${MAN/pip/pip%{python3_version}}" > %{buildroot}%{_mandir}/man1/${MAN/pip/$pip} done done popd %endif -# before we ln -s anything, we apply Source10 patch to all pips: -for PIP in %{buildroot}%{_bindir}/pip*; do - patch -p1 --no-backup-if-mismatch $PIP < %{SOURCE10} -done - - -mkdir -p %{buildroot}%{bashcompdir} +mkdir -p %{buildroot}%{bash_completions_dir} PYTHONPATH=%{buildroot}%{python3_sitelib} \ - %{buildroot}%{_bindir}/pip completion --bash \ - > %{buildroot}%{bashcompdir}/pip3 + %{buildroot}%{_bindir}/pip%{python3_version} completion --bash \ + > %{buildroot}%{bash_completions_dir}/pip%{python3_version} -# Make bash completion apply to all the 5 symlinks we install -sed -i -e "s/^\\(complete.*\\) pip\$/\\1 pip pip{,-}{3,%{python3_version}}/" \ - -e s/_pip_completion/_pip3_completion/ \ - %{buildroot}%{bashcompdir}/pip3 +# Make bash completion apply to all alternate names symlinks we install +sed -i -e "s/^\\(complete.*\\) pip%{python3_version}\$/\\1 pip%{python3_version} %{alternate_names}/" \ + -e s/_pip_completion/_pip%{python3_version_nodots}_completion/ \ + %{buildroot}%{bash_completions_dir}/pip%{python3_version} + +# Install the built wheel and inject SBOM into it (if the macro is available) +mkdir -p %{buildroot}%{python_wheel_dir} +install -p %{_pyproject_wheeldir}/%{python_wheel_name} -t %{buildroot}%{python_wheel_dir} +%{?python_wheel_inject_sbom:%python_wheel_inject_sbom %{buildroot}%{python_wheel_dir}/%{python_wheel_name}} -# Provide symlinks to executables to comply with Fedora guidelines for Python -ln -s ./pip%{python3_version} %{buildroot}%{_bindir}/pip-%{python3_version} -ln -s ./pip-%{python3_version} %{buildroot}%{_bindir}/pip-3 +%check +# Verify bundled provides are up to date +%{_rpmconfigdir}/pythonbundles.py src/pip/_vendor/vendor.txt --compare-with '%{bundled 3}' +# Verify no unwanted files are present in the package +grep "exe$" %{pyproject_files} && exit 1 || true +grep "pem$" %{pyproject_files} && exit 1 || true -# Make sure the INSTALLER is not pip, otherwise Patch2 won't work -# TODO Maybe we should make all our python packages have this? -echo rpm > %{buildroot}%{python3_sitelib}/pip-%{version}.dist-info/INSTALLER - -mkdir -p %{buildroot}%{python_wheeldir} -install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} - +# Verify we can at least run basic commands without crashing +%{py3_test_envvars} %{buildroot}%{_bindir}/pip%{python3_version} --help +%{py3_test_envvars} %{buildroot}%{_bindir}/pip%{python3_version} list +%{py3_test_envvars} %{buildroot}%{_bindir}/pip%{python3_version} show pip %if %{with tests} -%check +# Upstream tests # bash completion tests only work from installed package -# needs unaltered sys.path and we cannot do that in %%check -# test_pep517_and_build_options -# test_config_file_venv_option -# TODO investigate failures -# test_uninstall_non_local_distutils -pytest_k='not completion and - not test_pep517_and_build_options and - not test_config_file_venv_option and - not test_uninstall_non_local_distutils' +pytest_k='not completion' +# this clashes with our PYTHONPATH +pytest_k="$pytest_k and not environments_with_no_pip" +# this seems to require internet (despite no network marker) +# added in https://github.com/pypa/pip/pull/13378 TODO drop this in the next release +pytest_k="$pytest_k and not test_prompt_for_keyring_if_needed and not test_double_install_fail and not test_install_sdist_links and not test_lock_vcs and not test_lock_archive and not test_backend_sees_config_via_sdist" +# this cannot import breezy, TODO investigate +pytest_k="$pytest_k and not (functional and bazaar)" +# failures to investigate +pytest_k="$pytest_k and not test_all_fields and not test_report_mixed_not_found and not test_basic_show" # "Editable project location" missing +pytest_k="$pytest_k and not test_basic_install_from_wheel" +pytest_k="$pytest_k and not test_check_unsupported" -mkdir _bin -export PATH="$PWD/_bin:$PATH" - -export PYTHONPATH=%{buildroot}%{python3_sitelib} -ln -sf %{buildroot}%{_bindir}/pip3 _bin/pip -%{__python3} -m pytest -m 'not network' -k "$(echo $pytest_k)" +%pytest -n auto -m 'not network' -k "$(echo $pytest_k)" \ + --ignore tests/functional/test_proxy.py # no proxy.py in Fedora %endif -%files -n python%{python3_pkgversion}-%{srcname} -%license LICENSE.txt +%files -n python%{python3_pkgversion}-%{srcname} -f %{pyproject_files} %doc README.rst -%if %{with doc} -%{_mandir}/man1/pip.* -%{_mandir}/man1/pip-*.* -%{_mandir}/man1/pip3.* -%{_mandir}/man1/pip3-*.* +%if %{with man} +%if "%{python3_pkgversion}" == "3" +%{_mandir}/man1/pip{,3,-3}.1.* +%{_mandir}/man1/pip{,3,-3}-[^3]*.1.* %endif +%{_mandir}/man1/pip{,-}%{python3_version}.1.* +%{_mandir}/man1/pip{,-}%{python3_version}-*.1.* +%endif +%if "%{python3_pkgversion}" == "3" %{_bindir}/pip %{_bindir}/pip3 %{_bindir}/pip-3 +%endif %{_bindir}/pip%{python3_version} %{_bindir}/pip-%{python3_version} -%{python3_sitelib}/pip* -%dir %{bashcompdir} -%{bashcompdir}/pip3 +%dir %{bash_completions_dir} +%{bash_completions_dir}/pip%{python3_version} -%if %{with doc} -%files doc -%license LICENSE.txt -%doc README.rst -%doc docs/build/html -%endif -%files wheel +%files -n %{python_wheel_pkg_prefix}-%{srcname}-wheel %license LICENSE.txt # we own the dir for simplicity -%dir %{python_wheeldir}/ -%{python_wheeldir}/%{python_wheelname} +%dir %{python_wheel_dir}/ +%{python_wheel_dir}/%{python_wheel_name} %changelog -* Tue Aug 11 2020 Miro Hrončok - 19.3.1-4 -- Only ask for keyring password once (#1859476) - -* Fri Apr 10 2020 Miro Hrončok - 19.3.1-3 -- Allow setting $TMPDIR to $PWD/... during pip wheel (#1806625) - -* Thu Jan 30 2020 Fedora Release Engineering - 19.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Nov 04 2019 Tomas Orsava - 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 - 19.2.3-2 -- Make /usr/bin/pip(3) work with user-installed pip 19.3+ (#1767212) - -* Mon Sep 02 2019 Miro Hrončok - 19.2.3-1 -- Update to 19.2.3 (#1742230) -- Drop patch that should strip path prefixes from RECORD files, the paths are relative - -* Wed Aug 21 2019 Petr Viktorin - 19.1.1-8 -- Remove python2-pip -- Make pip bootstrap itself, rather than with an extra bootstrap RPM build - -* Sat Aug 17 2019 Miro Hrončok - 19.1.1-7 -- Rebuilt for Python 3.8 - -* Wed Aug 14 2019 Miro Hrončok - 19.1.1-6 -- Bootstrap for Python 3.8 - -* Wed Aug 14 2019 Miro Hrončok - 19.1.1-5 -- Bootstrap for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 19.1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 15 2019 Petr Viktorin - 19.1.1-3 -- Recommend libcrypt.so.1 for manylinux1 compatibility -- Make /usr/bin/pip Python 3 - -* Mon Jun 10 2019 Miro Hrončok - 19.1.1-2 -- Fix root warning when pip is invoked via python -m pip -- Remove a redundant second WARNING prefix form the abovementioned warning - -* Wed May 15 2019 Miro Hrončok - 19.1.1-1 -- Update to 19.1.1 (#1706995) - -* Thu Apr 25 2019 Miro Hrončok - 19.1-1 -- Update to 19.1 (#1702525) - -* Wed Mar 06 2019 Miro Hrončok - 19.0.3-1 -- Update to 19.0.3 (#1679277) - -* Wed Feb 13 2019 Miro Hrončok - 19.0.2-1 -- Update to 19.0.2 (#1668492) - -* Sat Feb 02 2019 Fedora Release Engineering - 18.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Dec 03 2018 Miro Hrončok - 18.1-2 -- Use the system level root certificate instead of the one bundled in certifi - -* Thu Nov 22 2018 Miro Hrončok - 18.1-1 -- Update to 18.1 (#1652089) - -* Tue Sep 18 2018 Victor Stinner - 18.0-4 -- Prevent removing of the system packages installed under /usr/lib - when pip install -U is executed. Original patch by Michal Cyprian. - Resolves: rhbz#1550368. - -* Wed Aug 08 2018 Miro Hrončok - 18.0-3 -- Create python-pip-wheel package with the wheel - -* Tue Jul 31 2018 Miro Hrončok - 18.0-2 -- Remove redundant "Unicode"" from License - -* Mon Jul 23 2018 Marcel Plch - 18.0-7 -- Update to 18.0 - -* Sat Jul 14 2018 Fedora Release Engineering - 9.0.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jun 18 2018 Miro Hrončok - 9.0.3-5 -- Rebuilt for Python 3.7 - -* Wed Jun 13 2018 Miro Hrončok - 9.0.3-4 -- Bootstrap for Python 3.7 - -* Wed Jun 13 2018 Miro Hrončok - 9.0.3-3 -- Bootstrap for Python 3.7 - -* Fri May 04 2018 Miro Hrončok - 9.0.3-2 -- Allow to import pip10's main from pip9's /usr/bin/pip -- Do not show the "new version of pip" warning outside of venv -Resolves: rhbz#1569488 -Resolves: rhbz#1571650 -Resolves: rhbz#1573755 - -* Thu Mar 29 2018 Charalampos Stratakis - 9.0.3-1 -- Update to 9.0.3 - -* Wed Feb 21 2018 Lumír Balhar - 9.0.1-16 -- Include built HTML documentation (in the new -doc subpackage) and man page - -* Fri Feb 09 2018 Fedora Release Engineering - 9.0.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Dec 04 2017 Charalampos Stratakis - 9.0.1-14 -- Reintroduce the ipaddress module in the python3 subpackage. - -* Mon Nov 20 2017 Charalampos Stratakis - 9.0.1-13 -- Add virtual provides for the bundled libraries. (rhbz#1096912) - -* Tue Aug 29 2017 Tomas Orsava - 9.0.1-12 -- Switch macros to bcond's and make Python 2 optional to facilitate building - the Python 2 and Python 3 modules - -* Thu Jul 27 2017 Fedora Release Engineering - 9.0.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue May 23 2017 Tomas Orsava - 9.0.1-10 -- Modernized package descriptions -Resolves: rhbz#1452568 - -* Tue Mar 21 2017 Tomas Orsava - 9.0.1-9 -- Fix typo in the sudo pip warning - -* Fri Mar 03 2017 Tomas Orsava - 9.0.1-8 -- Patch 1 update: No sudo pip warning in venv or virtualenv - -* Thu Feb 23 2017 Tomas Orsava - 9.0.1-7 -- Patch 1 update: Customize the warning with the proper version of the pip - command - -* Tue Feb 14 2017 Tomas Orsava - 9.0.1-6 -- Added patch 1: Emit a warning when running with root privileges - -* Sat Feb 11 2017 Fedora Release Engineering - 9.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jan 02 2017 Tomas Orsava - 9.0.1-4 -- Provide symlinks to executables to comply with Fedora guidelines for Python -Resolves: rhbz#1406922 - -* Fri Dec 09 2016 Charalampos Stratakis - 9.0.1-3 -- Rebuild for Python 3.6 with wheel - -* Fri Dec 09 2016 Charalampos Stratakis - 9.0.1-2 -- Rebuild for Python 3.6 without wheel - -* Fri Nov 18 2016 Orion Poplawski - 9.0.1-1 -- Update to 9.0.1 - -* Fri Nov 18 2016 Orion Poplawski - 8.1.2-5 -- Enable EPEL Python 3 builds -- Use new python macros -- Cleanup spec - -* Fri Aug 05 2016 Tomas Orsava - 8.1.2-4 -- Updated the test sources - -* Fri Aug 05 2016 Tomas Orsava - 8.1.2-3 -- Moved python-pip into the python2-pip subpackage -- Added the python_provide macro - -* Tue Jul 19 2016 Fedora Release Engineering - 8.1.2-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Tue May 17 2016 Tomas Orsava - 8.1.2-1 -- Update to 8.1.2 -- Moved to a new PyPI URL format -- Updated the prefix-stripping patch because of upstream changes in pip/wheel.py - -* Mon Feb 22 2016 Slavek Kabrda - 8.0.2-1 -- Update to 8.0.2 - -* Thu Feb 04 2016 Fedora Release Engineering - 7.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Oct 14 2015 Robert Kuska - 7.1.0-3 -- Rebuilt for Python3.5 rebuild -- With wheel set to 1 - -* Tue Oct 13 2015 Robert Kuska - 7.1.0-2 -- Rebuilt for Python3.5 rebuild - -* Wed Jul 01 2015 Slavek Kabrda - 7.1.0-1 -- Update to 7.1.0 - -* Tue Jun 30 2015 Ville Skyttä - 7.0.3-3 -- Install bash completion -- Ship LICENSE.txt as %%license where available - -* Thu Jun 18 2015 Fedora Release Engineering - 7.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Jun 04 2015 Matej Stuchlik - 7.0.3-1 -- Update to 7.0.3 - -* Fri Mar 06 2015 Matej Stuchlik - 6.0.8-1 -- Update to 6.0.8 - -* Thu Dec 18 2014 Slavek Kabrda - 1.5.6-5 -- Only enable tests on Fedora. - -* Mon Dec 01 2014 Matej Stuchlik - 1.5.6-4 -- Add tests -- Add patch skipping tests requiring Internet access - -* Tue Nov 18 2014 Matej Stuchlik - 1.5.6-3 -- Added patch for local dos with predictable temp dictionary names - (http://seclists.org/oss-sec/2014/q4/655) - -* Sat Jun 07 2014 Fedora Release Engineering - 1.5.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun May 25 2014 Matej Stuchlik - 1.5.6-1 -- Update to 1.5.6 - -* Fri Apr 25 2014 Matej Stuchlik - 1.5.4-4 -- Rebuild as wheel for Python 3.4 - -* Thu Apr 24 2014 Matej Stuchlik - 1.5.4-3 -- Disable build_wheel - -* Thu Apr 24 2014 Matej Stuchlik - 1.5.4-2 -- Rebuild as wheel for Python 3.4 - -* Mon Apr 07 2014 Matej Stuchlik - 1.5.4-1 -- Updated to 1.5.4 - -* Mon Oct 14 2013 Tim Flink - 1.4.1-1 -- Removed patch for CVE 2013-2099 as it has been included in the upstream 1.4.1 release -- Updated version to 1.4.1 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.3.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 16 2013 Toshio Kuratomi - 1.3.1-4 -- Fix for CVE 2013-2099 - -* Thu May 23 2013 Tim Flink - 1.3.1-3 -- undo python2 executable rename to python-pip. fixes #958377 -- fix summary to match upstream - -* Mon May 06 2013 Kevin Kofler - 1.3.1-2 -- Fix main package Summary, it's for Python 2, not 3 (#877401) - -* Fri Apr 26 2013 Jon Ciesla - 1.3.1-1 -- Update to 1.3.1, fix for CVE-2013-1888. - -* Thu Feb 14 2013 Fedora Release Engineering - 1.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Oct 09 2012 Tim Flink - 1.2.1-2 -- Fixing files for python3-pip - -* Thu Oct 04 2012 Tim Flink - 1.2.1-1 -- Update to upstream 1.2.1 -- Change binary from pip-python to python-pip (RHBZ#855495) -- Add alias from python-pip to pip-python, to be removed at a later date - -* Tue May 15 2012 Tim Flink - 1.1.0-1 -- Update to upstream 1.1.0 - -* Sat Jan 14 2012 Fedora Release Engineering - 1.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sat Oct 22 2011 Tim Flink - 1.0.2-1 -- update to 1.0.2 and added python3 subpackage - -* Wed Jun 22 2011 Tim Flink - 0.8.3-1 -- update to 0.8.3 and project home page - -* Tue Feb 08 2011 Fedora Release Engineering - 0.8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Dec 20 2010 Luke Macken - 0.8.2-1 -- update to 0.8.2 of pip -* Mon Aug 30 2010 Peter Halliday - 0.8-1 -- update to 0.8 of pip -* Thu Jul 22 2010 David Malcolm - 0.7.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Wed Jul 7 2010 Peter Halliday - 0.7.2-1 -- update to 0.7.2 of pip -* Sun May 23 2010 Peter Halliday - 0.7.1-1 -- update to 0.7.1 of pip -* Fri Jan 1 2010 Peter Halliday - 0.6.1.4 -- fix dependency issue -* Fri Dec 18 2009 Peter Halliday - 0.6.1-2 -- fix spec file -* Thu Dec 17 2009 Peter Halliday - 0.6.1-1 -- upgrade to 0.6.1 of pip -* Mon Aug 31 2009 Peter Halliday - 0.4-1 -- Initial package - +%autochangelog diff --git a/remove-existing-dist-only-if-path-conflicts.patch b/remove-existing-dist-only-if-path-conflicts.patch index ec44270..d280f34 100644 --- a/remove-existing-dist-only-if-path-conflicts.patch +++ b/remove-existing-dist-only-if-path-conflicts.patch @@ -1,94 +1,115 @@ -From 8c58a99221415ca7c3d5ce50dcffefa14e421928 Mon Sep 17 00:00:00 2001 -From: Tomas Orsava -Date: Tue, 12 Nov 2019 17:24:20 +0100 -Subject: [PATCH] Subject: Prevent removing of the system packages installed - under /usr/lib - -when pip install -U is executed. +From d5cb806a14bb50a96484bca6536e81f2ac316b9d Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Wed, 16 Feb 2022 08:36:21 +0100 +Subject: [PATCH] Prevent removing of the system packages installed under + /usr/lib when pip install --upgrade is executed. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Resolves: rhbz#1550368 Co-Authored-By: Michal Cyprian Co-Authored-By: Victor Stinner +Co-Authored-By: Petr Viktorin +Co-Authored-By: Lumir Balhar +Co-Authored-By: Miro Hrončok +Co-Authored-By: Karolina Surma --- - src/pip/_internal/legacy_resolve.py | 5 ++++- - src/pip/_internal/req/req_install.py | 3 ++- - src/pip/_internal/utils/misc.py | 11 +++++++++++ - 3 files changed, 17 insertions(+), 2 deletions(-) + src/pip/_internal/metadata/base.py | 12 +++++++++++- + src/pip/_internal/req/req_install.py | 2 +- + src/pip/_internal/resolution/legacy/resolver.py | 4 +++- + src/pip/_internal/resolution/resolvelib/factory.py | 12 ++++++++++++ + 4 files changed, 27 insertions(+), 3 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/metadata/base.py b/src/pip/_internal/metadata/base.py +index 230e114..8bd5d31 100644 +--- a/src/pip/_internal/metadata/base.py ++++ b/src/pip/_internal/metadata/base.py +@@ -23,7 +23,7 @@ from pip._vendor.packaging.utils import NormalizedName, canonicalize_name + from pip._vendor.packaging.version import Version + from pip._internal.exceptions import NoneMetadataError +-from pip._internal.locations import site_packages, user_site ++from pip._internal.locations import get_scheme, site_packages, user_site + from pip._internal.models.direct_url import ( + DIRECT_URL_METADATA_NAME, + DirectUrl, +@@ -575,6 +575,16 @@ class BaseDistribution(Protocol): + for extra in self._iter_egg_info_extras(): + metadata["Provides-Extra"] = extra + ++ @property ++ def in_install_path(self) -> bool: ++ """ ++ Return True if given Distribution is installed in ++ path matching distutils_scheme layout. ++ """ ++ norm_path = normalize_path(self.installed_location) ++ return norm_path.startswith(normalize_path( ++ get_scheme("").purelib.split('python')[0])) ++ + + class BaseEnvironment: + """An environment containing distributions to introspect.""" diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py -index 5a8c0dc..f80ba87 100644 +index c9f6bff..c101826 100644 --- a/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 ( - ask_path_exists, - backup_dir, - display_path, -+ dist_in_install_path, - dist_in_site_packages, - dist_in_usersite, - ensure_dir, -@@ -461,7 +462,7 @@ class InstallRequirement(object): - "lack sys.path precedence to %s in %s" % - (existing_dist.project_name, existing_dist.location) +@@ -453,7 +453,7 @@ class InstallRequirement: + f"lack sys.path precedence to {existing_dist.raw_name} " + f"in {existing_dist.location}" ) - else: -+ elif dist_in_install_path(existing_dist): - self.conflicts_with = existing_dist - return True ++ elif existing_dist.in_install_path: + self.should_reinstall = True + else: + if self.editable: +diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py +index 33a4fdc..1fe886e 100644 +--- a/src/pip/_internal/resolution/legacy/resolver.py ++++ b/src/pip/_internal/resolution/legacy/resolver.py +@@ -322,7 +322,9 @@ class Resolver(BaseResolver): + # Don't uninstall the conflict if doing a user install and the + # conflict is not a user install. + assert req.satisfied_by is not None +- if not self.use_user_site or req.satisfied_by.in_usersite: ++ if ((not self.use_user_site ++ or req.satisfied_by.in_usersite) ++ and req.satisfied_by.in_install_path): + req.should_reinstall = True + req.satisfied_by = None -diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py -index b848263..5b75fed 100644 ---- a/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 - from pip import __version__ - from pip._internal.exceptions import CommandError - from pip._internal.locations import ( -+ distutils_scheme, - get_major_minor_version, - site_packages, - user_site, -@@ -389,6 +390,16 @@ def dist_in_site_packages(dist): - return dist_location(dist).startswith(normalize_path(site_packages)) +diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py +index f23e4cd..1bada79 100644 +--- a/src/pip/_internal/resolution/resolvelib/factory.py ++++ b/src/pip/_internal/resolution/resolvelib/factory.py +@@ -3,6 +3,8 @@ from __future__ import annotations + import contextlib + import functools + import logging ++import sys ++import sysconfig + from collections.abc import Iterable, Iterator, Mapping, Sequence + from typing import ( + TYPE_CHECKING, +@@ -615,6 +617,16 @@ class Factory: + if dist is None: # Not installed, no uninstallation required. + return None - -+def dist_in_install_path(dist): -+ """ -+ Return True if given Distribution is installed in -+ path matching distutils_scheme layout. -+ """ -+ norm_path = normalize_path(dist_location(dist)) -+ return norm_path.startswith(normalize_path( -+ distutils_scheme("")['purelib'].split('python')[0])) ++ # Prevent uninstalling packages from /usr ++ try: ++ if dist.installed_location in ( ++ sysconfig.get_path('purelib', scheme='posix_prefix', vars={'base': sys.base_prefix}), ++ sysconfig.get_path('platlib', scheme='posix_prefix', vars={'platbase': sys.base_prefix}), ++ ): ++ return None ++ except KeyError: # this Python doesn't have 'rpm_prefix' scheme yet ++ pass + -+ - def dist_is_editable(dist): - # type: (Distribution) -> bool - """ + # We're installing into global site. The current installation must + # be uninstalled, no matter it's in global or user site, because the + # user site installation has precedence over global. -- -2.20.1 +2.50.1 diff --git a/skip-network-tests.patch b/skip-network-tests.patch deleted file mode 100644 index 9dec67e..0000000 --- a/skip-network-tests.patch +++ /dev/null @@ -1,1055 +0,0 @@ -diff -up pip-1.5.6/tests/functional/test_freeze.py.orig pip-1.5.6/tests/functional/test_freeze.py ---- pip-1.5.6/tests/functional/test_freeze.py.orig 2014-11-27 11:23:19.947665742 +0100 -+++ pip-1.5.6/tests/functional/test_freeze.py 2014-11-27 11:30:45.937308998 +0100 -@@ -1,6 +1,7 @@ - import sys - import re - import textwrap -+import pytest - from doctest import OutputChecker, ELLIPSIS - - from tests.lib.local_repos import local_checkout, local_repo -@@ -58,6 +59,7 @@ def test_freeze_basic(script): - _check_output(result, expected) - - -+@pytest.mark.skipif(True, reason='No network') - def test_freeze_svn(script, tmpdir): - """Test freezing a svn checkout""" - -@@ -79,6 +81,7 @@ def test_freeze_svn(script, tmpdir): - _check_output(result, expected) - - -+@pytest.mark.skipif(True, reason='No network') - def test_freeze_git_clone(script, tmpdir): - """ - Test freezing a Git clone. -@@ -109,6 +112,7 @@ def test_freeze_git_clone(script, tmpdir - _check_output(result, expected) - - -+@pytest.mark.skipif(True, reason='No network') - def test_freeze_mercurial_clone(script, tmpdir): - """ - Test freezing a Mercurial clone. -@@ -140,6 +144,7 @@ def test_freeze_mercurial_clone(script, - _check_output(result, expected) - - -+@pytest.mark.skipif(True, reason='No network') - def test_freeze_bazaar_clone(script, tmpdir): - """ - Test freezing a Bazaar clone. -@@ -175,6 +180,7 @@ def test_freeze_bazaar_clone(script, tmp - _check_output(result, expected) - - -+@pytest.mark.skipif(True, reason='No network') - def test_freeze_with_local_option(script): - """ - Test that wsgiref (from global site-packages) is reported normally, but not with --local. -@@ -205,6 +211,7 @@ def test_freeze_with_local_option(script - _check_output(result, expected) - - -+@pytest.mark.skipif(True, reason='No network') - def test_freeze_with_requirement_option(script): - """ - Test that new requirements are created correctly with --requirement hints -diff -up pip-1.5.6/tests/functional/test_install_cleanup.py.orig pip-1.5.6/tests/functional/test_install_cleanup.py ---- pip-1.5.6/tests/functional/test_install_cleanup.py.orig 2014-11-27 11:23:20.863671103 +0100 -+++ pip-1.5.6/tests/functional/test_install_cleanup.py 2014-11-27 14:25:05.086297126 +0100 -@@ -1,4 +1,5 @@ - import os -+import pytest - - from os.path import abspath, exists, join - -@@ -20,6 +21,7 @@ def test_cleanup_after_install(script, d - script.assert_no_temp() - - -+@pytest.mark.skipif(True, reason='No network') - def test_no_clean_option_blocks_cleaning_after_install(script, data): - """ - Test --no-clean option blocks cleaning after install -@@ -29,6 +31,7 @@ def test_no_clean_option_blocks_cleaning - assert exists(build), "build/simple should still exist %s" % str(result) - - -+@pytest.mark.skipif(True, reason='No network') - def test_cleanup_after_install_editable_from_hg(script, tmpdir): - """ - Test clean up after cloning from Mercurial. -@@ -87,6 +90,7 @@ def test_cleanup_req_satisifed_no_name(s - script.assert_no_temp() - - -+@pytest.mark.skipif(True, reason='No network') - def test_download_should_not_delete_existing_build_dir(script): - """ - It should not delete build/ if existing before run the command -@@ -123,6 +127,7 @@ def test_cleanup_after_egg_info_exceptio - script.assert_no_temp() - - -+@pytest.mark.skipif(True, reason='No network') - def test_cleanup_prevented_upon_build_dir_exception(script, data): - """ - Test no cleanup occurs after a PreviousBuildDirError -diff -up pip-1.5.6/tests/functional/test_install_compat.py.orig pip-1.5.6/tests/functional/test_install_compat.py ---- pip-1.5.6/tests/functional/test_install_compat.py.orig 2014-11-27 11:23:20.912671389 +0100 -+++ pip-1.5.6/tests/functional/test_install_compat.py 2014-11-27 11:30:36.533251976 +0100 -@@ -3,9 +3,11 @@ Tests for compatibility workarounds. - - """ - import os -+import pytest - from tests.lib import pyversion, assert_all_changes - - -+@pytest.mark.skipif(True, reason='No network') - def test_debian_egg_name_workaround(script): - """ - We can uninstall packages installed with the pyversion removed from the -diff -up pip-1.5.6/tests/functional/test_install_config.py.orig pip-1.5.6/tests/functional/test_install_config.py ---- pip-1.5.6/tests/functional/test_install_config.py.orig 2014-11-27 11:23:20.920671436 +0100 -+++ pip-1.5.6/tests/functional/test_install_config.py 2014-11-27 11:30:03.530051860 +0100 -@@ -1,7 +1,7 @@ - import os - import tempfile - import textwrap -- -+import pytest - - def test_options_from_env_vars(script): - """ -@@ -28,6 +28,7 @@ def test_command_line_options_override_e - assert "Getting page http://download.zope.org/ppix" in result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_env_vars_override_config_file(script, virtualenv): - """ - Test that environmental variables override settings in config files. -@@ -62,6 +63,7 @@ def _test_env_vars_override_config_file( - assert "Successfully installed INITools" in result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_command_line_append_flags(script, virtualenv, data): - """ - Test command line flags that append to defaults set by environmental variables. -@@ -76,6 +78,7 @@ def test_command_line_append_flags(scrip - assert "Skipping link %s" % data.find_links in result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_command_line_appends_correctly(script, data): - """ - Test multiple appending options set by environmental variables. -diff -up pip-1.5.6/tests/functional/test_install_download.py.orig pip-1.5.6/tests/functional/test_install_download.py ---- pip-1.5.6/tests/functional/test_install_download.py.orig 2014-11-27 11:23:20.970671729 +0100 -+++ pip-1.5.6/tests/functional/test_install_download.py 2014-11-27 11:29:42.503924368 +0100 -@@ -1,9 +1,11 @@ - import os - import textwrap -+import pytest - - from tests.lib.path import Path - - -+@pytest.mark.skipif(True, reason='No network') - def test_download_if_requested(script): - """ - It should download (in the scratch path) and not install if requested. -@@ -13,6 +15,7 @@ def test_download_if_requested(script): - assert script.site_packages/ 'initools' not in result.files_created - - -+@pytest.mark.skipif(True, reason='No network') - def test_download_wheel(script): - """ - Test using "pip install --download" to download a *.whl archive. -@@ -26,6 +29,7 @@ def test_download_wheel(script): - assert script.site_packages/ 'piptestpackage' not in result.files_created - - -+@pytest.mark.skipif(True, reason='No network') - def test_single_download_from_requirements_file(script): - """ - It should support download (in the scratch path) from PyPi from a requirements file -@@ -38,6 +42,7 @@ def test_single_download_from_requiremen - assert script.site_packages/ 'initools' not in result.files_created - - -+@pytest.mark.skipif(True, reason='No network') - def test_download_should_download_dependencies(script): - """ - It should download dependencies (in the scratch path) -@@ -77,6 +82,7 @@ def test_download_should_download_wheel_ - assert Path('scratch') / dep_filename in result.files_created - - -+@pytest.mark.skipif(True, reason='No network') - def test_download_should_skip_existing_files(script): - """ - It should not download files already existing in the scratch dir -diff -up pip-1.5.6/tests/functional/test_install_extras.py.orig pip-1.5.6/tests/functional/test_install_extras.py ---- pip-1.5.6/tests/functional/test_install_extras.py.orig 2014-11-27 11:23:21.066672291 +0100 -+++ pip-1.5.6/tests/functional/test_install_extras.py 2014-11-27 11:31:01.854405511 +0100 -@@ -1,6 +1,8 @@ -+import pytest - from os.path import join - - -+@pytest.mark.skipif(True, reason='No network') - def test_simple_extras_install_from_pypi(script): - """ - Test installing a package from PyPI using extras dependency Paste[openid]. -@@ -10,6 +12,7 @@ def test_simple_extras_install_from_pypi - assert initools_folder in result.files_created, result.files_created - - -+@pytest.mark.skipif(True, reason='No network') - def test_no_extras_uninstall(script): - """ - No extras dependency gets uninstalled when the root package is uninstalled -diff -up pip-1.5.6/tests/functional/test_install.py.orig pip-1.5.6/tests/functional/test_install.py ---- pip-1.5.6/tests/functional/test_install.py.orig 2014-11-27 11:23:20.227667380 +0100 -+++ pip-1.5.6/tests/functional/test_install.py 2014-11-27 11:23:20.825670880 +0100 -@@ -13,6 +13,7 @@ from tests.lib.local_repos import local_ - from tests.lib.path import Path - - -+@pytest.mark.skipif(True, reason='No network') - def test_without_setuptools(script): - script.run("pip", "uninstall", "setuptools", "-y") - result = script.run( -@@ -26,6 +27,7 @@ def test_without_setuptools(script): - ) - - -+@pytest.mark.skipif(True, reason='No network') - def test_pip_second_command_line_interface_works(script): - """ - Check if ``pip`` commands behaves equally -@@ -39,6 +41,7 @@ def test_pip_second_command_line_interfa - assert initools_folder in result.files_created, str(result) - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_from_pypi(script): - """ - Test installing a package from PyPI. -@@ -60,6 +63,7 @@ def test_editable_install(script): - assert not result.files_updated, result.files_updated - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_editable_from_svn(script, tmpdir): - """ - Test checking out from svn. -@@ -71,6 +75,7 @@ def test_install_editable_from_svn(scrip - result.assert_installed('INITools', with_files=['.svn']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_download_editable_to_custom_path(script, tmpdir): - """ - Test downloading an editable using a relative custom src folder. -@@ -94,6 +99,7 @@ def test_download_editable_to_custom_pat - assert customdl_files_created - - -+@pytest.mark.skipif(True, reason='No network') - def test_editable_no_install_followed_by_no_download(script, tmpdir): - """ - Test installing an editable in two steps (first with --no-install, then with --no-download). -@@ -113,6 +119,7 @@ def test_editable_no_install_followed_by - result.assert_installed('INITools', without_files=[curdir, '.svn']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_no_install_followed_by_no_download(script): - """ - Test installing in two steps (first with --no-install, then with --no-download). -@@ -143,6 +150,7 @@ def test_bad_install_with_no_download(sc - "an equivalent install with --no-install?" in result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_dev_version_from_pypi(script): - """ - Test using package==dev. -@@ -154,6 +162,7 @@ def test_install_dev_version_from_pypi(s - assert (script.site_packages / 'initools') in result.files_created, str(result.stdout) - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_editable_from_git(script, tmpdir): - """ - Test cloning from Git. -@@ -166,6 +175,7 @@ def test_install_editable_from_git(scrip - result.assert_installed('pip-test-package', with_files=['.git']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_editable_from_hg(script, tmpdir): - """ - Test cloning from Mercurial. -@@ -177,6 +187,7 @@ def test_install_editable_from_hg(script - result.assert_installed('ScriptTest', with_files=['.hg']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_vcs_url_final_slash_normalization(script, tmpdir): - """ - Test that presence or absence of final slash in VCS URL is normalized. -@@ -188,6 +199,7 @@ def test_vcs_url_final_slash_normalizati - assert 'pip-log.txt' not in result.files_created, result.files_created['pip-log.txt'].bytes - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_editable_from_bazaar(script, tmpdir): - """ - Test checking out from Bazaar. -@@ -199,6 +211,7 @@ def test_install_editable_from_bazaar(sc - result.assert_installed('django-wikiapp', with_files=['.bzr']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_vcs_url_urlquote_normalization(script, tmpdir): - """ - Test that urlquoted characters are normalized for repo URL comparison. -@@ -295,6 +308,7 @@ def test_install_pardir(script, data): - assert egg_info_folder in result.files_created, str(result) - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_global_option(script): - """ - Test using global distutils options. -@@ -320,6 +334,7 @@ def test_install_with_hacked_egg_info(sc - assert 'Successfully installed hackedegginfo\n' in result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_using_install_option_and_editable(script, tmpdir): - """ - Test installing a tool using -e and --install-option -@@ -334,6 +349,7 @@ def test_install_using_install_option_an - assert virtualenv_bin in result.files_created - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_global_option_using_editable(script, tmpdir): - """ - Test using global distutils options, but in an editable installation -@@ -345,6 +361,7 @@ def test_install_global_option_using_edi - assert '0.2.5\n' in result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_package_with_same_name_in_curdir(script): - """ - Test installing a package with the same name of a local folder -@@ -398,6 +415,7 @@ def test_install_folder_using_relative_p - assert egg_folder in result.files_created, str(result) - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_package_which_contains_dev_in_name(script): - """ - Test installing package from pypi which contains 'dev' in name -@@ -409,6 +427,7 @@ def test_install_package_which_contains_ - assert egg_info_folder in result.files_created, str(result) - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_package_with_target(script): - """ - Test installing a package using pip install --target -@@ -481,6 +500,7 @@ def test_url_req_case_mismatch(script, d - assert egg_folder not in result.files_created, str(result) - - -+@pytest.mark.skipif(True, reason='No network') - def test_compiles_pyc(script): - """ - Test installing with --compile on -@@ -501,6 +521,7 @@ def test_compiles_pyc(script): - assert any(exists) - - -+@pytest.mark.skipif(True, reason='No network') - def test_no_compiles_pyc(script, data): - """ - Test installing from wheel with --compile on -diff -up pip-1.5.6/tests/functional/test_install_reqs.py.orig pip-1.5.6/tests/functional/test_install_reqs.py ---- pip-1.5.6/tests/functional/test_install_reqs.py.orig 2014-11-27 11:23:21.114672571 +0100 -+++ pip-1.5.6/tests/functional/test_install_reqs.py 2014-11-27 14:25:42.443560282 +0100 -@@ -13,6 +13,7 @@ from tests.lib.local_repos import local_ - from tests.lib.path import Path - - -+@pytest.mark.skipif(True, reason='No network') - def test_requirements_file(script): - """ - Test installing from a requirements file. -@@ -59,6 +60,7 @@ def test_relative_requirements_file(scri - assert (script.site_packages/'fspkg') in result.files_created, str(result.stdout) - - -+@pytest.mark.skipif(True, reason='No network') - def test_multiple_requirements_files(script, tmpdir): - """ - Test installing from multiple nested requirements files. -@@ -110,6 +112,7 @@ def test_install_local_editable_with_ext - assert script.site_packages/'simple' in res.files_created, str(result) - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_local_editable_with_subdirectory(script): - version_pkg_path = _create_test_package_with_subdirectory(script, - 'version_subpkg') -diff -up pip-1.5.6/tests/functional/test_install_upgrade.py.orig pip-1.5.6/tests/functional/test_install_upgrade.py ---- pip-1.5.6/tests/functional/test_install_upgrade.py.orig 2014-11-27 11:23:21.159672835 +0100 -+++ pip-1.5.6/tests/functional/test_install_upgrade.py 2014-11-27 11:23:21.743676253 +0100 -@@ -22,6 +22,7 @@ def test_no_upgrade_unless_requested(scr - assert not result.files_created, 'pip install INITools upgraded when it should not have' - - -+@pytest.mark.skipif(True, reason='No network') - def test_upgrade_to_specific_version(script): - """ - It does upgrade to specific version requested. -@@ -34,6 +35,7 @@ def test_upgrade_to_specific_version(scr - assert script.site_packages/'INITools-0.2-py%s.egg-info' % pyversion in result.files_created - - -+@pytest.mark.skipif(True, reason='No network') - def test_upgrade_if_requested(script): - """ - And it does upgrade if requested. -@@ -56,6 +58,7 @@ def test_upgrade_with_newest_already_ins - assert 'already up-to-date' in result.stdout, result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_upgrade_force_reinstall_newest(script): - """ - Force reinstallation of a package even if it is already at its newest -@@ -69,6 +72,7 @@ def test_upgrade_force_reinstall_newest( - assert_all_changes(result, result3, [script.venv/'build', 'cache']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_uninstall_before_upgrade(script): - """ - Automatic uninstall-before-upgrade. -@@ -82,6 +86,7 @@ def test_uninstall_before_upgrade(script - assert_all_changes(result, result3, [script.venv/'build', 'cache']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_uninstall_before_upgrade_from_url(script): - """ - Automatic uninstall-before-upgrade from URL. -@@ -95,6 +100,7 @@ def test_uninstall_before_upgrade_from_u - assert_all_changes(result, result3, [script.venv/'build', 'cache']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_upgrade_to_same_version_from_url(script): - """ - When installing from a URL the same version that is already installed, no -@@ -109,6 +115,7 @@ def test_upgrade_to_same_version_from_ur - assert_all_changes(result, result3, [script.venv/'build', 'cache']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_upgrade_from_reqs_file(script): - """ - Upgrade from a requirements file. -@@ -161,6 +168,7 @@ def test_editable_git_upgrade(script): - assert 'some different version' in version2.stdout, "Output: %s" % (version2.stdout) - - -+@pytest.mark.skipif(True, reason='No network') - def test_should_not_install_always_from_cache(script): - """ - If there is an old cached package, pip should download the newer version -@@ -173,6 +181,7 @@ def test_should_not_install_always_from_ - assert script.site_packages/'INITools-0.1-py%s.egg-info' % pyversion in result.files_created - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_with_ignoreinstalled_requested(script): - """ - Test old conflicting package is completely ignored -@@ -185,6 +194,7 @@ def test_install_with_ignoreinstalled_re - assert os.path.exists(script.site_packages_path/'INITools-0.3-py%s.egg-info' % pyversion) - - -+@pytest.mark.skipif(True, reason='No network') - def test_upgrade_vcs_req_with_no_dists_found(script, tmpdir): - """It can upgrade a VCS requirement that has no distributions otherwise.""" - req = "%s#egg=pip-test-package" % local_checkout( -@@ -194,6 +204,7 @@ def test_upgrade_vcs_req_with_no_dists_f - assert not result.returncode - - -+@pytest.mark.skipif(True, reason='No network') - def test_upgrade_vcs_req_with_dist_found(script): - """It can upgrade a VCS requirement that has distributions on the index.""" - # TODO(pnasrat) Using local_checkout fails on windows - oddness with the test path urls/git. -diff -up pip-1.5.6/tests/functional/test_install_user.py.orig pip-1.5.6/tests/functional/test_install_user.py ---- pip-1.5.6/tests/functional/test_install_user.py.orig 2014-11-27 11:23:21.750676293 +0100 -+++ pip-1.5.6/tests/functional/test_install_user.py 2014-11-27 11:23:22.157678676 +0100 -@@ -42,7 +42,8 @@ def _patch_dist_in_site_packages(script) - @pytest.mark.skipif("hasattr(sys, 'pypy_version_info')") - class Tests_UserSite: - -- def test_reset_env_system_site_packages_usersite(self, script, virtualenv): -+ @pytest.mark.skipif(True, reason='No network') -+ def test_reset_env_system_site_packages_usersite(self, script, virtualenv): - """ - reset_env(system_site_packages=True) produces env where a --user install can be found using pkg_resources - """ -@@ -53,7 +54,8 @@ class Tests_UserSite: - assert 'INITools'== project_name, "'%s' should be 'INITools'" %project_name - - -- def test_install_subversion_usersite_editable_with_distribute(self, script, virtualenv, tmpdir): -+ @pytest.mark.skipif(True, reason='No network') -+ def test_install_subversion_usersite_editable_with_distribute(self, script, virtualenv, tmpdir): - """ - Test installing current directory ('.') into usersite after installing distribute - """ -@@ -85,7 +87,8 @@ class Tests_UserSite: - result = script.pip('install', '--user', curdir, cwd=run_from, expect_error=True) - assert "Can not perform a '--user' install. User site-packages are not visible in this virtualenv." in result.stdout - -- def test_install_user_conflict_in_usersite(self, script, virtualenv): -+ @pytest.mark.skipif(True, reason='No network') -+ def test_install_user_conflict_in_usersite(self, script, virtualenv): - """ - Test user install with conflict in usersite updates usersite. - """ -@@ -99,7 +102,8 @@ class Tests_UserSite: - assert egg_info_folder in result2.files_created, str(result2) - assert not isfile(initools_v3_file), initools_v3_file - -- def test_install_user_conflict_in_globalsite(self, script, virtualenv): -+ @pytest.mark.skipif(True, reason='No network') -+ def test_install_user_conflict_in_globalsite(self, script, virtualenv): - """ - Test user install with conflict in global site ignores site and installs to usersite - """ -@@ -129,7 +133,8 @@ class Tests_UserSite: - assert isdir(egg_info_folder) - assert isdir(initools_folder) - -- def test_upgrade_user_conflict_in_globalsite(self, script, virtualenv): -+ @pytest.mark.skipif(True, reason='No network') -+ def test_upgrade_user_conflict_in_globalsite(self, script, virtualenv): - """ - Test user install/upgrade with conflict in global site ignores site and installs to usersite - """ -@@ -159,7 +164,8 @@ class Tests_UserSite: - assert isdir(egg_info_folder), result2.stdout - assert isdir(initools_folder) - -- def test_install_user_conflict_in_globalsite_and_usersite(self, script, virtualenv): -+ @pytest.mark.skipif(True, reason='No network') -+ def test_install_user_conflict_in_globalsite_and_usersite(self, script, virtualenv): - """ - Test user install with conflict in globalsite and usersite ignores global site and updates usersite. - """ -@@ -190,7 +196,8 @@ class Tests_UserSite: - assert isdir(egg_info_folder) - assert isdir(initools_folder) - -- def test_install_user_in_global_virtualenv_with_conflict_fails(self, script, virtualenv): -+ @pytest.mark.skipif(True, reason='No network') -+ def test_install_user_in_global_virtualenv_with_conflict_fails(self, script, virtualenv): - """ - Test user install in --system-site-packages virtualenv with conflict in site fails. - """ -diff -up pip-1.5.6/tests/functional/test_install_vcs_git.py.orig pip-1.5.6/tests/functional/test_install_vcs_git.py ---- pip-1.5.6/tests/functional/test_install_vcs_git.py.orig 2014-11-27 14:27:33.238340755 +0100 -+++ pip-1.5.6/tests/functional/test_install_vcs_git.py 2014-11-27 14:28:28.154727603 +0100 -@@ -36,6 +36,7 @@ def test_get_refs_should_return_branch_n - assert result['branch0.1'] == commit, result - - -+@pytest.mark.skipif(True, reason='No network') - def test_get_refs_should_ignore_no_branch(script): - version_pkg_path = _create_test_package(script) - script.run('git', 'branch', 'branch0.1', cwd=version_pkg_path) -@@ -79,6 +80,7 @@ def test_check_rev_options_should_handle - - # TODO(pnasrat) fix all helpers to do right things with paths on windows. - @pytest.mark.skipif("sys.platform == 'win32'") -+@pytest.mark.skipif(True, reason='No network') - def test_check_submodule_addition(script): - """ - Submodules are pulled in on install and updated on upgrade. -diff -up pip-1.5.6/tests/functional/test_install_vcs.py.orig pip-1.5.6/tests/functional/test_install_vcs.py ---- pip-1.5.6/tests/functional/test_install_vcs.py.orig 2014-11-27 11:23:22.169678746 +0100 -+++ pip-1.5.6/tests/functional/test_install_vcs.py 2014-11-27 14:27:14.133206173 +0100 -@@ -1,7 +1,9 @@ -+import pytest - from tests.lib import _create_test_package, _change_test_package_version - from tests.lib.local_repos import local_checkout - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_editable_from_git_with_https(script, tmpdir): - """ - Test cloning from Git with https. -@@ -13,6 +15,7 @@ def test_install_editable_from_git_with_ - result.assert_installed('pip-test-package', with_files=['.git']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_git_with_sha1_revisions(script): - """ - Git backend should be able to install from SHA1 revisions -@@ -25,6 +28,7 @@ def test_git_with_sha1_revisions(script) - assert '0.1' in version.stdout, version.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_git_with_branch_name_as_revision(script): - """ - Git backend should be able to install from branch names -@@ -37,6 +41,7 @@ def test_git_with_branch_name_as_revisio - assert 'some different version' in version.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_git_with_tag_name_as_revision(script): - """ - Git backend should be able to install from tag names -@@ -49,6 +54,7 @@ def test_git_with_tag_name_as_revision(s - assert '0.1' in version.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_git_with_tag_name_and_update(script, tmpdir): - """ - Test cloning a git repository and updating to a different version. -@@ -64,6 +70,7 @@ def test_git_with_tag_name_and_update(sc - assert '0.1.2' in result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_git_branch_should_not_be_changed(script, tmpdir): - """ - Editable installations should not change branch -@@ -77,6 +84,7 @@ def test_git_branch_should_not_be_change - assert '* master' in result.stdout, result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_git_with_non_editable_unpacking(script, tmpdir): - """ - Test cloning a git repository from a non-editable URL with a given tag. -@@ -88,6 +96,7 @@ def test_git_with_non_editable_unpacking - assert '0.1.2' in result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_git_with_editable_where_egg_contains_dev_string(script, tmpdir): - """ - Test cloning a git repository from an editable url which contains "dev" string -@@ -97,6 +106,7 @@ def test_git_with_editable_where_egg_con - result.assert_installed('django-devserver', with_files=['.git']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_git_with_non_editable_where_egg_contains_dev_string(script, tmpdir): - """ - Test cloning a git repository from a non-editable url which contains "dev" string -@@ -107,6 +117,7 @@ def test_git_with_non_editable_where_egg - assert devserver_folder in result.files_created, str(result) - - -+@pytest.mark.skipif(True, reason='No network') - def test_git_with_ambiguous_revs(script): - """ - Test git with two "names" (tag/branch) pointing to the same commit -@@ -121,6 +132,7 @@ def test_git_with_ambiguous_revs(script) - result.assert_installed('version-pkg', with_files=['.git']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_git_works_with_editable_non_origin_repo(script): - # set up, create a git repo and install it as editable from a local directory path - version_pkg_path = _create_test_package(script) -diff -up pip-1.5.6/tests/functional/test_install_vcs_svn.py.orig pip-1.5.6/tests/functional/test_install_vcs_svn.py ---- pip-1.5.6/tests/functional/test_install_vcs_svn.py.orig 2014-11-27 14:30:00.551378474 +0100 -+++ pip-1.5.6/tests/functional/test_install_vcs_svn.py 2014-11-27 14:30:03.217397254 +0100 -@@ -1,7 +1,8 @@ -+import pytest - from mock import patch - from pip.vcs.subversion import Subversion - -- -+@pytest.mark.skipif(True, reason='No network') - @patch('pip.vcs.subversion.call_subprocess') - def test_obtain_should_recognize_auth_info_url(call_subprocess_mock, script): - svn = Subversion(url='svn+http://username:password@svn.example.com/') -@@ -11,6 +12,7 @@ def test_obtain_should_recognize_auth_in - 'http://username:password@svn.example.com/', script.scratch_path/'test']) - - -+@pytest.mark.skipif(True, reason='No network') - @patch('pip.vcs.subversion.call_subprocess') - def test_export_should_recognize_auth_info_url(call_subprocess_mock, script): - svn = Subversion(url='svn+http://username:password@svn.example.com/') -diff -up pip-1.5.6/tests/functional/test_install_wheel.py.orig pip-1.5.6/tests/functional/test_install_wheel.py ---- pip-1.5.6/tests/functional/test_install_wheel.py.orig 2014-11-27 11:23:22.371679928 +0100 -+++ pip-1.5.6/tests/functional/test_install_wheel.py 2014-11-27 11:23:22.372679934 +0100 -@@ -92,6 +92,7 @@ def test_install_from_wheel_with_headers - result.stdout) - - -+@pytest.mark.skipif(True, reason='No network') - def test_install_wheel_with_target(script, data): - """ - Test installing a wheel using pip install --target -diff -up pip-1.5.6/tests/functional/test_list.py.orig pip-1.5.6/tests/functional/test_list.py ---- pip-1.5.6/tests/functional/test_list.py.orig 2014-11-27 11:23:22.379679974 +0100 -+++ pip-1.5.6/tests/functional/test_list.py 2014-11-27 11:31:06.129431433 +0100 -@@ -1,6 +1,7 @@ - import os - import re - import textwrap -+import pytest - - from tests.lib.local_repos import local_checkout - -@@ -26,6 +27,7 @@ def test_local_flag(script, data): - assert 'simple (1.0)' in result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_uptodate_flag(script, data): - """ - Test the behavior of --uptodate flag in the list command -@@ -39,6 +41,7 @@ def test_uptodate_flag(script, data): - assert 'simple2 (3.0)' in result.stdout, str(result) - - -+@pytest.mark.skipif(True, reason='No network') - def test_outdated_flag(script, data): - """ - Test the behavior of --outdated flag in the list command -@@ -52,6 +55,7 @@ def test_outdated_flag(script, data): - assert 'simple2' not in result.stdout, str(result) #3.0 is latest - - -+@pytest.mark.skipif(True, reason='No network') - def test_editables_flag(script, data): - """ - Test the behavior of --editables flag in the list command -diff -up pip-1.5.6/tests/functional/test_search.py.orig pip-1.5.6/tests/functional/test_search.py ---- pip-1.5.6/tests/functional/test_search.py.orig 2014-11-27 11:23:22.903683041 +0100 -+++ pip-1.5.6/tests/functional/test_search.py 2014-11-27 11:30:57.397378486 +0100 -@@ -1,3 +1,4 @@ -+import pytest - import pip.download - from pip.commands.search import (compare_versions, - highest_version, -@@ -53,6 +54,7 @@ def test_invalid_pypi_transformation(): - assert transform_hits(pypi_hits) == expected - - -+@pytest.mark.skipif(True, reason='No network') - def test_search(script): - """ - End to end test of search command. -@@ -62,6 +64,7 @@ def test_search(script): - assert 'A tool for installing and managing Python packages' in output.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_multiple_search(script): - """ - Test searching for multiple packages at once. -@@ -80,6 +83,7 @@ def test_search_missing_argument(script) - assert 'ERROR: Missing required argument (search query).' in result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_run_method_should_return_sucess_when_find_packages(): - """ - Test SearchCommand.run for found package -@@ -91,6 +95,7 @@ def test_run_method_should_return_sucess - assert status == SUCCESS - - -+@pytest.mark.skipif(True, reason='No network') - def test_run_method_should_return_no_matches_found_when_does_not_find_packages(): - """ - Test SearchCommand.run for no matches -@@ -102,6 +107,7 @@ def test_run_method_should_return_no_mat - assert status == NO_MATCHES_FOUND, status - - -+@pytest.mark.skipif(True, reason='No network') - def test_search_should_exit_status_code_zero_when_find_packages(script): - """ - Test search exit status code for package found -@@ -110,6 +116,7 @@ def test_search_should_exit_status_code_ - assert result.returncode == SUCCESS - - -+@pytest.mark.skipif(True, reason='No network') - def test_search_exit_status_code_when_finds_no_package(script): - """ - Test search exit status code for no matches -diff -up pip-1.5.6/tests/functional/test_show.py.orig pip-1.5.6/tests/functional/test_show.py ---- pip-1.5.6/tests/functional/test_show.py.orig 2014-11-27 11:23:23.160684545 +0100 -+++ pip-1.5.6/tests/functional/test_show.py 2014-11-27 11:30:52.417348289 +0100 -@@ -1,4 +1,5 @@ - import re -+import pytest - from pip import __version__ - from pip.commands.show import search_packages_info - -@@ -34,6 +35,7 @@ def test_show_with_files_not_found(scrip - assert lines[6] == 'Cannot locate installed-files.txt', lines[5] - - -+@pytest.mark.skipif(True, reason='No network') - def test_show_with_all_files(script): - """ - Test listing all files in the show command. -diff -up pip-1.5.6/tests/functional/test_uninstall.py.orig pip-1.5.6/tests/functional/test_uninstall.py ---- pip-1.5.6/tests/functional/test_uninstall.py.orig 2014-11-27 11:23:23.168684592 +0100 -+++ pip-1.5.6/tests/functional/test_uninstall.py 2014-11-27 11:30:22.367166080 +0100 -@@ -3,6 +3,7 @@ from __future__ import with_statement - import textwrap - import os - import sys -+import pytest - from os.path import join, abspath, normpath - from tempfile import mkdtemp - from mock import patch -@@ -12,6 +13,7 @@ from tests.lib.local_repos import local_ - from pip.util import rmtree - - -+@pytest.mark.skipif(True, reason='No network') - def test_simple_uninstall(script): - """ - Test simple install and uninstall. -@@ -25,6 +27,7 @@ def test_simple_uninstall(script): - assert_all_changes(result, result2, [script.venv/'build', 'cache']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_uninstall_with_scripts(script): - """ - Uninstall an easy_installed package with scripts. -@@ -38,6 +41,7 @@ def test_uninstall_with_scripts(script): - assert_all_changes(result, result2, [script.venv/'build', 'cache', easy_install_pth]) - - -+@pytest.mark.skipif(True, reason='No network') - def test_uninstall_easy_install_after_import(script): - """ - Uninstall an easy_installed package after it's been imported -@@ -50,6 +54,7 @@ def test_uninstall_easy_install_after_im - assert_all_changes(result, result2, [script.venv/'build', 'cache', script.site_packages/'easy-install.pth']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_uninstall_namespace_package(script): - """ - Uninstall a distribution with a namespace package without clobbering -@@ -90,6 +95,7 @@ def test_uninstall_overlapping_package(s - assert_all_changes(result2, result3, []) - - -+@pytest.mark.skipif(True, reason='No network') - def test_uninstall_console_scripts(script): - """ - Test uninstalling a package with more files (console_script entry points, extra directories). -@@ -102,6 +108,7 @@ def test_uninstall_console_scripts(scrip - assert_all_changes(result, result2, [script.venv/'build', 'cache']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_uninstall_easy_installed_console_scripts(script): - """ - Test uninstalling package with console_scripts that is easy_installed. -@@ -114,6 +121,7 @@ def test_uninstall_easy_installed_consol - assert_all_changes(result, result2, [script.venv/'build', 'cache', script.site_packages/'easy-install.pth']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_uninstall_editable_from_svn(script, tmpdir): - """ - Test uninstalling an editable installation from svn. -@@ -126,6 +134,7 @@ def test_uninstall_editable_from_svn(scr - assert_all_changes(result, result2, [script.venv/'src', script.venv/'build', script.site_packages/'easy-install.pth']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_uninstall_editable_with_source_outside_venv(script, tmpdir): - """ - Test uninstalling editable install from existing source outside the venv. -@@ -149,6 +158,7 @@ def _test_uninstall_editable_with_source - assert_all_changes(result, result3, [script.venv/'build', script.site_packages/'easy-install.pth']) - - -+@pytest.mark.skipif(True, reason='No network') - def test_uninstall_from_reqs_file(script, tmpdir): - """ - Test uninstall from a requirements file. -diff -up pip-1.5.6/tests/functional/test_uninstall_user.py.orig pip-1.5.6/tests/functional/test_uninstall_user.py ---- pip-1.5.6/tests/functional/test_uninstall_user.py.orig 2014-11-27 11:23:23.590687062 +0100 -+++ pip-1.5.6/tests/functional/test_uninstall_user.py 2014-11-27 11:29:55.413002643 +0100 -@@ -17,7 +17,8 @@ from tests.functional.test_install_user - @pytest.mark.skipif("hasattr(sys, 'pypy_version_info')") - class Tests_UninstallUserSite: - -- def test_uninstall_from_usersite(self, script, virtualenv): -+ @pytest.mark.skipif(True, reason='No network') -+ def test_uninstall_from_usersite(self, script, virtualenv): - """ - Test uninstall from usersite - """ -diff -up pip-1.5.6/tests/functional/test_wheel.py.orig pip-1.5.6/tests/functional/test_wheel.py ---- pip-1.5.6/tests/functional/test_wheel.py.orig 2014-11-27 11:23:23.598687109 +0100 -+++ pip-1.5.6/tests/functional/test_wheel.py 2014-11-27 11:30:30.345214455 +0100 -@@ -2,6 +2,7 @@ - import os - import sys - import textwrap -+import pytest - - from os.path import exists - -@@ -20,6 +21,7 @@ def test_pip_wheel_fails_without_wheel(s - assert "'pip wheel' requires the 'wheel' package" in result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_pip_wheel_success(script, data): - """ - Test 'pip wheel' success. -@@ -32,6 +34,7 @@ def test_pip_wheel_success(script, data) - assert "Successfully built simple" in result.stdout, result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_pip_wheel_downloads_wheels(script, data): - """ - Test 'pip wheel' downloads wheels -@@ -46,6 +49,7 @@ def test_pip_wheel_downloads_wheels(scri - assert "Saved" in result.stdout, result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_pip_wheel_fail(script, data): - """ - Test 'pip wheel' failure. -@@ -59,6 +63,7 @@ def test_pip_wheel_fail(script, data): - assert "Failed to build wheelbroken" in result.stdout, result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_pip_wheel_ignore_wheels_editables(script, data): - """ - Test 'pip wheel' ignores editables -@@ -85,6 +90,7 @@ def test_pip_wheel_ignore_wheels_editabl - assert ignore_editable in result.stdout, result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_no_clean_option_blocks_cleaning_after_wheel(script, data): - """ - Test --no-clean option blocks cleaning after wheel build -@@ -95,6 +101,7 @@ def test_no_clean_option_blocks_cleaning - assert exists(build), "build/simple should still exist %s" % str(result) - - -+@pytest.mark.skipif(True, reason='No network') - def test_pip_wheel_source_deps(script, data): - """ - Test 'pip wheel --use-wheel' finds and builds source archive dependencies of wheels -@@ -108,6 +115,7 @@ def test_pip_wheel_source_deps(script, d - assert "Successfully built source" in result.stdout, result.stdout - - -+@pytest.mark.skipif(True, reason='No network') - def test_pip_wheel_fail_cause_of_previous_build_dir(script, data): - """Test when 'pip wheel' tries to install a package that has a previous build directory""" - -diff -up pip-1.5.6/tests/unit/test_finder.py.orig pip-1.5.6/tests/unit/test_finder.py ---- pip-1.5.6/tests/unit/test_finder.py.orig 2014-11-27 11:23:23.937689093 +0100 -+++ pip-1.5.6/tests/unit/test_finder.py 2014-11-27 14:30:48.597716927 +0100 -@@ -71,6 +71,7 @@ def test_finder_detects_latest_already_s - finder.find_requirement(req, True) - - -+@pytest.mark.skipif(True, reason='No network') - def test_finder_detects_latest_already_satisfied_pypi_links(): - """Test PackageFinder detects latest already satisified using pypi links""" - req = InstallRequirement.from_line('initools', None) -@@ -199,6 +200,7 @@ def test_finder_priority_file_over_page( - assert link.url.startswith("file://") - - -+@pytest.mark.skipif(True, reason='No network') - def test_finder_priority_page_over_deplink(): - """Test PackageFinder prefers page links over equivalent dependency links""" - req = InstallRequirement.from_line('gmpy==1.15', None) -diff -up pip-1.5.6/tests/unit/test_req.py.orig pip-1.5.6/tests/unit/test_req.py ---- pip-1.5.6/tests/unit/test_req.py.orig 2014-11-27 11:23:23.946689145 +0100 -+++ pip-1.5.6/tests/unit/test_req.py 2014-11-27 11:23:23.947689151 +0100 -@@ -149,6 +149,7 @@ def test_parse_editable_local_extras(isd - normcase_mock.return_value = "/some/path/foo" - assert parse_editable('foo[bar,baz]', 'git') == (None, 'file:///some/path/foo', ('bar', 'baz')) - -+@pytest.mark.skipif(True, reason='No network') - def test_remote_reqs_parse(): - """ - Test parsing a simple remote requirements file -diff -up pip-1.5.6/tests/functional/test_install_cleanup.py.orig pip-1.5.6/tests/functional/test_install_cleanup.py ---- pip-1.5.6/tests/functional/test_install_cleanup.py.orig 2014-12-01 13:31:24.075490830 +0100 -+++ pip-1.5.6/tests/functional/test_install_cleanup.py 2014-12-01 13:30:59.208326741 +0100 -@@ -62,6 +62,7 @@ def test_cleanup_after_install_from_loca - script.assert_no_temp() - - -+@pytest.mark.skipif(True, reason='No network') - def test_no_install_and_download_should_not_leave_build_dir(script): - """ - It should remove build/ dir if it was pip that created -diff -up pip-1.5.6/tests/functional/test_install_vcs_git.py.orig pip-1.5.6/tests/functional/test_install_vcs_git.py ---- pip-1.5.6/tests/functional/test_install_vcs_git.py.orig 2014-12-01 13:32:11.419803237 +0100 -+++ pip-1.5.6/tests/functional/test_install_vcs_git.py 2014-12-01 13:32:30.298927814 +0100 -@@ -13,6 +13,7 @@ from tests.lib.git_submodule_helpers imp - ) - - -+@pytest.mark.skipif(True, reason='No network') - def test_get_refs_should_return_tag_name_and_commit_pair(script): - version_pkg_path = _create_test_package(script) - script.run('git', 'tag', '0.1', cwd=version_pkg_path) -@@ -25,6 +26,7 @@ def test_get_refs_should_return_tag_name - assert result['0.2'] == commit, result - - -+@pytest.mark.skipif(True, reason='No network') - def test_get_refs_should_return_branch_name_and_commit_pair(script): - version_pkg_path = _create_test_package(script) - script.run('git', 'branch', 'branch0.1', cwd=version_pkg_path) diff --git a/sources b/sources index bbd8d89..48867fb 100644 --- a/sources +++ b/sources @@ -1,3 +1,5 @@ -SHA512 (pip-19.3.1.tar.gz) = 39446c0ab6e4495d98f22923a2a76901b024d9047b60d92580b21d447a718e5285cfd66f8ad0c20befcfe1abc7f06be29b6a5644d1b30265d3b67399fe76e033 -SHA512 (d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz) = fc7b11c5cbf6322469ce2eaca2a8d7eb60b17398d316f7465ab5d3d38dabd00ee22a3da7437a28f6312f0115f77f2df0d8bf0abc671e055eef06356c94283409 -SHA512 (2018.2.tar.gz) = 4c09c43a70ecb3ca3bc9445b01bf209eb382e41d9c969145696dea38551992ed88fd9b725a1264380f3dbdf8acdaf5ada3ef86b44255cdfbdbe4a01a1630912d +SHA512 (pip-25.3.tar.gz) = f50db092213ec3bb819d3da5669f73d119b5ec7f7ac5e8a587a17c27eafa32bc17a057df09389c526a3769ef3577f5553187d54ceffa89aed63f4b4498ff044e +SHA512 (setuptools-79.0.1-py3-none-any.whl) = fef6cfc6f95a5bb7320f1680e1c665cb8d9a4e4227cde4d8aab8a50bed4bcf04320085b9d7d5343359f887008db5c5a861e57f3d08b7b0b2311a28adaeee6b4a +SHA512 (wheel-0.45.1-py3-none-any.whl) = 86c16248ec804ee0ac95d43b03d47351dceb534d0cdc4025ca1eb073e39e539de44c870b9261f0373144e1537f0e42675a759a318a8d5d346bbd9efcb704061d +SHA512 (flit_core-3.12.0-py3-none-any.whl) = 790c12b1f43201e365fb3f8f2f0a54e1a578876799dfdf8bfeea679a25ea096bf62946d006618c1458ae6e37ce6d00998f37e9aba426d5ab80d32ef2d75da4e0 +SHA512 (coverage-0-py3-none-any.whl) = e734192565347010efe68f8ba600254259c9b647f3c553fd4e5d87b1d7f955cb15d6f7d807716f4a6415d239beed945fbec7210feaf502e9cc849c332845926e diff --git a/tests/bash_completion/main.fmf b/tests/bash_completion/main.fmf new file mode 100644 index 0000000..cde6f68 --- /dev/null +++ b/tests/bash_completion/main.fmf @@ -0,0 +1,35 @@ +summary: PIP bash completion functionality smoke test +description: | + Comprehensive test for pip bash completion functionality on Fedora/RHEL systems. + + The test performs the following steps: + 1. Finds the bash completion script in the given (e.g. python3-pip) RPM package + 2. Discovers all pip executables in the package (e.g. /usr/bin/pip and /usr/bin/pip3.14) + 3. Sources the completion script and verifies completion for all executables is registered + 4. Runs functional TAB completion tests using expect (for regular and POSIX mode of Bash) + 5. Validates that completion works for basic pip commands + + This is a smoke test to ensure pip bash completion is properly + installed and functional after package installation. + +component: + - python3-pip + +test: ./pip_completion_full_test.sh + +framework: shell + +duration: 5m +tier: 1 + + +require: + - python3-pip + - bash-completion + - expect + - rpm + - bash + + +environment: + PACKAGE: python3-pip diff --git a/tests/bash_completion/pip_completion_full_test.sh b/tests/bash_completion/pip_completion_full_test.sh new file mode 100755 index 0000000..94fcdb9 --- /dev/null +++ b/tests/bash_completion/pip_completion_full_test.sh @@ -0,0 +1,88 @@ +#!/bin/bash + +# Comprehensive PIP bash completion test for RHEL +# Finds completion scripts from RPM, tests all pip binaries, and runs functional tests + +PACKAGE="${PACKAGE:-python3-pip}" + + +# Step 1: Find bash completion scripts in python3-pip RPM package +echo "Step 1: Finding bash completion scripts in $PACKAGE RPM package..." + +COMPLETION_FILE=$(rpm -ql $PACKAGE 2>/dev/null | grep -E "/usr/share/bash-completion/completions/" || true) + +if [[ -z "$COMPLETION_FILE" ]]; then + echo "✗ No bash completion files found in $PACKAGE package" + exit 1 +fi + +# Check if there's exactly one completion file +COMPLETION_FILE_COUNT=$(echo "$COMPLETION_FILE" | wc -l) + +if [[ $COMPLETION_FILE_COUNT -gt 1 ]]; then + echo "✗ Multiple bash completion files found in $PACKAGE package:" + echo "$COMPLETION_FILE" | sed 's/^/ - /' + echo "Expected exactly one completion file, found $COMPLETION_FILE_COUNT" + exit 1 +fi + + +echo "✓ Found completion file from $PACKAGE package:" +echo "$COMPLETION_FILE" | sed 's/^/ - /' + +# Step 2: Find all pip binaries +echo +echo "Step 2: Finding all pip binaries..." +PIP_BINARIES=() +PIP_FILES=$(rpm -ql $PACKAGE | grep /bin/p) +for pip_file in $PIP_FILES; do + if [[ -x "$pip_file" ]]; then + pip_cmd=$(basename "$pip_file") + PIP_BINARIES+=("$pip_cmd") + echo "✓ Found: $pip_cmd -> $pip_file" + fi +done + +if [[ ${#PIP_BINARIES[@]} -eq 0 ]]; then + echo "✗ No pip binaries found" + exit 1 +fi + +echo "Total pip binaries found: ${#PIP_BINARIES[@]}" + +# Step 3: Source completion scripts and test each binary +echo +echo "Step 3: Testing completion for each pip binary..." + +for AS_POSIX in 0 1; do + if [[ $AS_POSIX -eq 1 ]]; then + echo "Testing in POSIX mode" + POSIX="--posix" + else + echo "Testing in non-POSIX mode" + POSIX="" + fi + + echo "Sourcing: $COMPLETION_FILE" + if bash --norc $POSIX -c "source $COMPLETION_FILE" ; then + echo "✓ Successfully sourced $COMPLETION_FILE" + else + echo "! Warning: Failed to source $COMPLETION_FILE" + exit 1 + fi + + export AS_POSIX + for pip_exec in "${PIP_BINARIES[@]}"; do + echo "Running expect test with $COMPLETION_FILE and $pip_exec..." + if ./test_pip_completion.exp "$COMPLETION_FILE" "$pip_exec"; then + echo "✓ Functional test passed" + else + echo "✗ Functional test failed" + exit 1 + fi + done + +done + + +echo "✓ All tests completed successfully!" diff --git a/tests/bash_completion/test_pip_completion.exp b/tests/bash_completion/test_pip_completion.exp new file mode 100755 index 0000000..4389174 --- /dev/null +++ b/tests/bash_completion/test_pip_completion.exp @@ -0,0 +1,117 @@ +#!/usr/bin/expect -f + +# PIP bash completion smoke test using expect +# Tests actual TAB completion functionality +# Usage: test_pip_completion.exp [completion_file] [pip_binary] + +set timeout 5 + + +set completion_file [lindex $argv 0] +set pip_exec [lindex $argv 1] + + +puts "=== PIP Bash Completion Test (using expect) ===" +puts "Testing completion file: $completion_file" +puts "Testing pip binary: $pip_exec" + +# Check if completion file exists first +if {![file exists $completion_file]} { + puts "✗ Completion file not found: $completion_file" + exit 1 +} +puts "✓ Completion file found: $completion_file" + +# Start bash shell +if {[info exists env(AS_POSIX)] && $env(AS_POSIX) == "1"} { + spawn bash --norc --posix +} else { + spawn bash --norc +} +expect "$ " + +# Source the completion file +send "source $completion_file\r" +expect "$ " +puts "Attempted to source completion file" + +# Test 1: Basic pip command completion +puts "\nTest 1: Testing '$pip_exec ' + TAB completion..." +send "$pip_exec " +sleep 0.1 +# Send TAB TAB using hex codes +send "\x09\x09" +expect { + -re "(install|uninstall|list|show)" { + puts "✓ Basic pip commands found in completion" + expect "$ " + } + -re "Display all" { + puts "✓ Completion showing options menu" + send "n\r" + expect "$ " + } + timeout { + puts "✗ Timeout waiting for completion - test failed" + exit 1 + } +} + +# Clear the line and ensure clean prompt +send "\x03" +expect "$ " +send "\r" +expect "$ " + +# Test 2: Test partial command completion (simpler test) +puts "\nTest 2: Testing '$pip_exec insta' + TAB completion..." +send "$pip_exec insta" +sleep 0.1 +# Single TAB for completion +send "\x09" +expect { + -re "install" { + puts "✓ Partial command completion works (insta -> install)" + expect "$ " + } + timeout { + puts "✗ Timeout on partial completion test - test failed" + exit 1 + } +} + +# Clear the line and ensure clean prompt +send "\x03" +expect "$ " +send "\r" +expect "$ " + +# Test 3: Test help completion +puts "\nTest 3: Testing '$pip_exec --' + TAB completion..." +send "$pip_exec --" +sleep 0.1 +send "\x09\x09" +expect { + -re "(--help|--version)" { + puts "✓ Command options found in completion" + expect "$ " + } + timeout { + puts "✗ Timeout on options completion test - test failed" + exit 1 + } +} + +# Final cleanup - make sure we're at clean prompt +send "\x03" +expect "$ " +send "\r" +expect "$ " + +# Exit bash cleanly +send "exit\r" +expect eof + +puts "\n=== Completion Test Complete ===" +puts "PIP bash completion functionality tested!" + diff --git a/tests/pip_install_upgrade/runtest.sh b/tests/pip_install_upgrade/runtest.sh new file mode 100755 index 0000000..4c520f5 --- /dev/null +++ b/tests/pip_install_upgrade/runtest.sh @@ -0,0 +1,40 @@ +#!/bin/sh -eux +# This script requires root privileges and you should never run it on your own machine +test $EUID -eq 0 + +PYTHON_VERSION=$(/usr/bin/python3 -c 'import sys; print("{}.{}".format(*sys.version_info))') +RPM_SITELIB="/usr/lib/python${PYTHON_VERSION}/site-packages" +LOCAL_SITELIB="/usr/local/lib/python${PYTHON_VERSION}/site-packages" +USER_SITELIB="/home/fedora-test-user/.local/lib/python${PYTHON_VERSION}/site-packages" + +# First, let's install older Pello with pip as if it was installed by RPM +# This is an approximation, but it usually works +RPM_BUILD_ROOT=/ /usr/bin/pip install 'Pello==1.0.1' + +# Now, we'll upgrade it with regular pip +/usr/bin/pip install --upgrade 'Pello==1.0.2' + +# pip should see it +/usr/bin/pip freeze | grep '^Pello==1\.0\.2$' + +# Both installations should still exist +test -d "${RPM_SITELIB}/pello-1.0.1.dist-info" +test -d "${LOCAL_SITELIB}/Pello-1.0.2.dist-info" + +# Let's ditch the local one +/usr/bin/pip uninstall --yes Pello + +# It should only remove one of them +test -d "${RPM_SITELIB}/pello-1.0.1.dist-info" +! test -d "${LOCAL_SITELIB}/Pello-1.0.2.dist-info" + +# And pip should still see the RPM-installed one +/usr/bin/pip freeze | grep '^Pello==1\.0\.1$' + +# Again, but as regular user +useradd fedora-test-user +su fedora-test-user -c '/usr/bin/pip install "Pello==1.0.2"' +test -d "${USER_SITELIB}/Pello-1.0.2.dist-info" +su fedora-test-user -c '/usr/bin/pip freeze' | grep '^Pello==1\.0\.2$' +su fedora-test-user -c '/usr/bin/pip uninstall --yes Pello' +su fedora-test-user -c '/usr/bin/pip freeze' | grep '^Pello==1\.0\.1$' diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index e53bda5..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,75 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - repositories: - - repo: "https://src.fedoraproject.org/tests/python.git" - dest: "python" - - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git" - dest: "pyproject-rpm-macros" - tests: - - smoke34: - dir: python/smoke - run: VERSION=3.4 ./venv.sh - - smoke35: - dir: python/smoke - run: VERSION=3.5 ./venv.sh - - smoke36: - dir: python/smoke - run: VERSION=3.6 ./venv.sh - - smoke37: - dir: python/smoke - run: VERSION=3.7 ./venv.sh - - smoke38: - dir: python/smoke - run: VERSION=3.8 ./venv.sh - - smoke27: - dir: python/smoke - run: VERSION=2.7 METHOD=virtualenv ./venv.sh - - smoke34_virtualenv: - dir: python/smoke - run: VERSION=3.4 METHOD=virtualenv ./venv.sh - - smoke35_virtualenv: - dir: python/smoke - run: VERSION=3.5 METHOD=virtualenv ./venv.sh - - smoke36_virtualenv: - dir: python/smoke - run: VERSION=3.6 METHOD=virtualenv ./venv.sh - - smoke37_virtualenv: - dir: python/smoke - run: VERSION=3.7 METHOD=virtualenv ./venv.sh - - smoke38_virtualenv: - dir: python/smoke - run: VERSION=3.8 METHOD=virtualenv ./venv.sh - - pipenv: - run: pipenv --three && pipenv install six - - pyproject_pytest: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-pytest - - pyproject_entrypoints: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-entrypoints - - pyproject_pluggy: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-pluggy - - pyproject_clikit: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-clikit - required_packages: - - gcc - - virtualenv - - python27 - - python34 - - python35 - - python36 - - python37 - - python38 - - python2-devel - - python3-devel - - python3-tox - - pipenv - - mock - - rpmdevtools - - rpm-build diff --git a/urllib3-CVE-2025-50181.patch b/urllib3-CVE-2025-50181.patch new file mode 100644 index 0000000..05e6353 --- /dev/null +++ b/urllib3-CVE-2025-50181.patch @@ -0,0 +1,51 @@ +From b3d543d7e16af844394316360ef1bf0b9d10f1b1 Mon Sep 17 00:00:00 2001 +From: Illia Volochii +Date: Wed, 18 Jun 2025 16:25:01 +0300 +Subject: [PATCH] Security fix for CVE-2025-50181 + +Co-authored-by: Seth Michael Larson +Co-authored-by: Quentin Pradet +Co-authored-by: Seth Michael Larson +--- + src/pip/_vendor/urllib3/poolmanager.py | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/src/pip/_vendor/urllib3/poolmanager.py b/src/pip/_vendor/urllib3/poolmanager.py +index fb51bf7..a8de7c6 100644 +--- a/src/pip/_vendor/urllib3/poolmanager.py ++++ b/src/pip/_vendor/urllib3/poolmanager.py +@@ -170,6 +170,22 @@ class PoolManager(RequestMethods): + + def __init__(self, num_pools=10, headers=None, **connection_pool_kw): + RequestMethods.__init__(self, headers) ++ if "retries" in connection_pool_kw: ++ retries = connection_pool_kw["retries"] ++ if not isinstance(retries, Retry): ++ # When Retry is initialized, raise_on_redirect is based ++ # on a redirect boolean value. ++ # But requests made via a pool manager always set ++ # redirect to False, and raise_on_redirect always ends ++ # up being False consequently. ++ # Here we fix the issue by setting raise_on_redirect to ++ # a value needed by the pool manager without considering ++ # the redirect boolean. ++ raise_on_redirect = retries is not False ++ retries = Retry.from_int(retries, redirect=False) ++ retries.raise_on_redirect = raise_on_redirect ++ connection_pool_kw = connection_pool_kw.copy() ++ connection_pool_kw["retries"] = retries + self.connection_pool_kw = connection_pool_kw + self.pools = RecentlyUsedContainer(num_pools) + +@@ -389,7 +405,7 @@ class PoolManager(RequestMethods): + kw["body"] = None + kw["headers"] = HTTPHeaderDict(kw["headers"])._prepare_for_method_change() + +- retries = kw.get("retries") ++ retries = kw.get("retries", response.retries) + if not isinstance(retries, Retry): + retries = Retry.from_int(retries, redirect=redirect) + +-- +2.51.0 + diff --git a/vendor_meta.sh b/vendor_meta.sh deleted file mode 100755 index 3ae5204..0000000 --- a/vendor_meta.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/bash -eu - -if [ $# -ne 1 ]; then - echo "Usage: ./vendor_meta.sh pip-10.0.0/src/pip/_vendor/vendor.txt" - exit 1 -fi - -licenses='' - -while read req; do - req=$(echo $req | cut -f1 -d' ') - name=$(echo $req | cut -f1 -d'=') - version=$(echo $req | cut -f3 -d'=' | tr -d '\r') - echo "Provides: bundled(python%{1}dist($name)) = $version" - license="$(pyp2rpm -v ${version} --no-venv ${name} | grep '^License:' | sed -e 's/License:\s*//')" - licenses="$licenses\n$name: $license" -done < $1 - -echo -echo -echo -e "$licenses"