[gentoo-commits] repo/gentoo:master commit in: dev-python/pip/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pip/files/

[Aaron Bauman]

commit:     cb5cf2ce8ce40aa822738015d7c3b4e897c4788b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu May  2 17:38:52 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri May  3 00:40:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb5cf2ce

dev-python/pip: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11879
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-python/pip/files/pip-7.1.2-unbundle.patch | 34 ---------------------------
 1 file changed, 34 deletions(-)

diff --git a/dev-python/pip/files/pip-7.1.2-unbundle.patch b/dev-python/pip/files/pip-7.1.2-unbundle.patch
deleted file mode 100644
index 70adc20ead5..00000000000
--- a/dev-python/pip/files/pip-7.1.2-unbundle.patch
+++ /dev/null
@@ -1,34 +0,0 @@
- pip/_vendor/__init__.py | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
-index ef8851d..349d022 100644
---- a/pip/_vendor/__init__.py
-+++ b/pip/_vendor/__init__.py
-@@ -14,7 +14,7 @@ import sys
- # Downstream redistributors which have debundled our dependencies should also
- # patch this value to be true. This will trigger the additional patching
- # to cause things like "six" to be available as pip.
--DEBUNDLED = False
-+DEBUNDLED = True
- 
- # By default, look in this directory for a bunch of .whl files which we will
- # add to the beginning of sys.path before attempting to import anything. This
-@@ -29,13 +29,10 @@ WHEEL_DIR = os.path.abspath(os.path.dirname(__file__))
- def vendored(modulename):
-     vendored_name = "{0}.{1}".format(__name__, modulename)
- 
--    try:
--        __import__(vendored_name, globals(), locals(), level=0)
--    except ImportError:
--        __import__(modulename, globals(), locals(), level=0)
--        sys.modules[vendored_name] = sys.modules[modulename]
--        base, head = vendored_name.rsplit(".", 1)
--        setattr(sys.modules[base], head, sys.modules[modulename])
-+    __import__(modulename, globals(), locals(), level=0)
-+    sys.modules[vendored_name] = sys.modules[modulename]
-+    base, head = vendored_name.rsplit(".", 1)
-+    setattr(sys.modules[base], head, sys.modules[modulename])
- 
- 
- # If we're operating in a debundled setup, then we want to go ahead and trigger

[gentoo-commits] repo/gentoo:master commit in: dev-python/pip/files/

[Aaron Bauman]

commit:     3337a7e797eece0249d3549e0dda293371139442
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Mar 30 16:20:28 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu May 14 22:19:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3337a7e7

dev-python/pip: remove unused patch

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../pip/files/pip-19.3.1-disable-system-install.patch   | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/dev-python/pip/files/pip-19.3.1-disable-system-install.patch b/dev-python/pip/files/pip-19.3.1-disable-system-install.patch
deleted file mode 100644
index 70583957bd7..00000000000
--- a/dev-python/pip/files/pip-19.3.1-disable-system-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-install: Raise an error to avoid breaking python-exec
-
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
-
---- pip-19.1/src/pip/_internal/commands/install.py
-+++ pip-19.1/src/pip/_internal/commands/install.py
-@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
-         if options.upgrade:
-             upgrade_strategy = options.upgrade_strategy
-
-+        if not any((options.use_user_site, options.target_dir, options.root_path, options.prefix_path)):
-+            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
-+
-         if options.build_dir:
-             options.build_dir = os.path.abspath(options.build_dir)

[gentoo-commits] repo/gentoo:master commit in: dev-python/pip/files/

[Michał Górny]

commit:     3db16f64fdfa6fde20bc062e43b7c0b3388c0afa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 07:54:25 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 08:02:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db16f64

dev-python/pip: Unblock --prefix installs

Closes: https://bugs.gentoo.org/692960
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../pip/files/pip-20.0.2-disable-system-install.patch    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
index c6b5354bc68..e0b0034e407 100644
--- a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
+++ b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
@@ -1,29 +1,29 @@
-From 57d610bbcc721c2e58fd2e9f3197bb3e3acbd935 Mon Sep 17 00:00:00 2001
+From 3aee04cbb93c0e479b040e682b2aef676629c9a2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Sat, 1 Feb 2020 09:14:46 +0100
 Subject: [PATCH] install: Raise an error to avoid breaking python-exec
 
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
+Running pip without --target, --prefix, --root, or --user will result
+in packages being installed systemwide. This has a tendency to break
+python-exec if setuptools gets installed or upgraded.
 ---
  src/pip/_internal/commands/install.py | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
-index 02a187c8..025b824b 100644
+index 8c2c32fd..41bac878 100644
 --- a/src/pip/_internal/commands/install.py
 +++ b/src/pip/_internal/commands/install.py
-@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
+@@ -238,6 +238,9 @@ class InstallCommand(RequirementCommand):
          if options.upgrade:
              upgrade_strategy = options.upgrade_strategy
  
-+        if not options.use_user_site and not options.target_dir and not options.root_path and not os.getenv('GENTOO_PIP_TESTING'):
++        if not options.use_user_site and not options.target_dir and not options.root_path and not options.prefix_path and not os.getenv('GENTOO_PIP_TESTING'):
 +            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
 +
          cmdoptions.check_dist_restriction(options, check_target=True)
  
          install_options = options.install_options or []
 -- 
-2.25.0
+2.28.0
 

[gentoo-commits] repo/gentoo:master commit in: dev-python/pip/files/

[Louis Sautier]

commit:     a84b6cf2d28766686b31ad16dc970095d44f760e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Feb 26 16:51:13 2021 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 20:37:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a84b6cf2

dev-python/pip: remove unused patch

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19670
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>

 dev-python/pip/files/pip-20.2-no-coverage.patch | 163 ------------------------
 1 file changed, 163 deletions(-)

diff --git a/dev-python/pip/files/pip-20.2-no-coverage.patch b/dev-python/pip/files/pip-20.2-no-coverage.patch
deleted file mode 100644
index 55be5b8c971..00000000000
--- a/dev-python/pip/files/pip-20.2-no-coverage.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 43389903a55a5432ca8556f42fb2252c91c7ca45 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 29 Jul 2020 07:42:25 +0200
-Subject: [PATCH] Revert "Add basic test coverage configuration"
-
-This is just PITA since coverage uses native C extensions.
----
- .coveragerc                                |  4 +++
- setup.cfg                                  | 38 ----------------------
- tests/conftest.py                          | 16 +--------
- tools/requirements/tests-common_wheels.txt |  2 --
- tox.ini                                    | 16 ++-------
- 5 files changed, 7 insertions(+), 69 deletions(-)
- create mode 100644 .coveragerc
-
-diff --git a/.coveragerc b/.coveragerc
-new file mode 100644
-index 00000000..5f833c94
---- /dev/null
-+++ b/.coveragerc
-@@ -0,0 +1,4 @@
-+[run]
-+branch = True
-+omit =
-+  src/pip/_vendor/*
-diff --git a/setup.cfg b/setup.cfg
-index 45fd58a3..e40596e9 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -67,44 +67,6 @@ markers =
-     yaml: yaml based tests
-     fails_on_new_resolver: Does not yet work on the new resolver
- 
--[coverage:run]
--branch = True
--# Do not gather coverage for vendored libraries.
--omit = */_vendor/*
--# Centralized absolute file prefix for coverage files.
--data_file = ${COVERAGE_OUTPUT_DIR}/.coverage
--# By default, each covered process will try to truncate and then write to
--# `data_file`, but with `parallel`, they will write to separate files suffixed
--# with hostname, pid, and a timestamp.
--parallel = True
--# If not set, then at the termination of each worker (when using pytest-xdist),
--# the following is traced: "Coverage.py warning: Module pip was previously
--# imported, but not measured (module-not-measured)"
--disable_warnings = module-not-measured
--
--[coverage:paths]
--# We intentionally use "source0" here because pytest-cov unconditionally sets
--# "source" after loading the config.
--source0 =
--    # The primary source code path which other paths will be combined into.
--    src/pip/
--    # Unit test source directory e.g.
--    # `.tox/coverage-py3/lib/pythonX.Y/site-packages/pip/...`
--    */site-packages/pip/
--    # Functional test virtual environment directories, which look like
--    # `tmpdir/pip0/pip/src/pip/...`
--    */pip/src/pip/
--
--[coverage:report]
--exclude_lines =
--    # We must re-state the default because the `exclude_lines` option overrides
--    # it.
--    pragma: no cover
--    # This excludes typing-specific code, which will be validated by mypy anyway.
--    if MYPY_CHECK_RUNNING
--    # Can be set to exclude e.g. `if PY2:` on Python 3
--    ${PIP_CI_COVERAGE_EXCLUDES}
--
- [bdist_wheel]
- universal = 1
- 
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 2aab5020..0db6d967 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -294,13 +294,6 @@ def wheel_install(tmpdir_factory, common_wheels):
-                                           'wheel')
- 
- 
--@pytest.fixture(scope='session')
--def coverage_install(tmpdir_factory, common_wheels):
--    return _common_wheel_editable_install(tmpdir_factory,
--                                          common_wheels,
--                                          'coverage')
--
--
- def install_egg_link(venv, project_name, egg_info_dir):
-     with open(venv.site / 'easy-install.pth', 'a') as fp:
-         fp.write(str(egg_info_dir.resolve()) + '\n')
-@@ -310,7 +303,7 @@ def install_egg_link(venv, project_name, egg_info_dir):
- 
- @pytest.fixture(scope='session')
- def virtualenv_template(request, tmpdir_factory, pip_src,
--                        setuptools_install, coverage_install):
-+                        setuptools_install, common_wheels):
- 
-     if six.PY3 and request.config.getoption('--use-venv'):
-         venv_type = 'venv'
-@@ -334,13 +327,6 @@ def virtualenv_template(request, tmpdir_factory, pip_src,
-     subprocess.check_call([venv.bin / 'python', 'setup.py', '-q', 'develop'],
-                           cwd=pip_editable)
- 
--    # Install coverage and pth file for executing it in any spawned processes
--    # in this virtual environment.
--    install_egg_link(venv, 'coverage', coverage_install)
--    # zz prefix ensures the file is after easy-install.pth.
--    with open(venv.site / 'zz-coverage-helper.pth', 'a') as f:
--        f.write('import coverage; coverage.process_startup()')
--
-     # Drop (non-relocatable) launchers.
-     for exe in os.listdir(venv.bin):
-         if not (
-diff --git a/tools/requirements/tests-common_wheels.txt b/tools/requirements/tests-common_wheels.txt
-index f0edf0b0..6703d606 100644
---- a/tools/requirements/tests-common_wheels.txt
-+++ b/tools/requirements/tests-common_wheels.txt
-@@ -7,5 +7,3 @@
- 
- setuptools >= 40.8.0
- wheel
--# As required by pytest-cov.
--coverage >= 4.4
-diff --git a/tox.ini b/tox.ini
-index 82e9abc6..7a19ca61 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -8,7 +8,6 @@ envlist =
- # Wrapper for calls to pip that make sure the version being used is the
- # original virtualenv (stable) version, and not the code being tested.
- pip = python {toxinidir}/tools/tox_pip.py
--mkdirp = python -c 'import os, sys; os.path.exists(sys.argv[1]) or os.mkdir(sys.argv[1])'
- 
- [testenv]
- # Remove USERNAME once we drop PY2.
-@@ -31,20 +30,9 @@ commands = pytest --timeout 300 []
- install_command = {[helpers]pip} install {opts} {packages}
- list_dependencies_command = {[helpers]pip} freeze --all
- 
--[testenv:coverage]
-+[testenv:coverage-py3]
- basepython = python3
--commands =
--    {[helpers]mkdirp} {toxinidir}/.coverage-output
--    pytest --timeout 300 --cov=pip --cov-config={toxinidir}/setup.cfg []
--
--setenv =
--    # Used in coverage configuration in setup.cfg.
--    COVERAGE_OUTPUT_DIR = {toxinidir}/.coverage-output
--    # Ensure coverage is enabled in child processes in virtual environments
--    # since they won't already have been enabled by pytest-cov.
--    COVERAGE_PROCESS_START = {toxinidir}/setup.cfg
--    # Used in coverage configuration in setup.cfg.
--    PIP_CI_COVERAGE_EXCLUDES = if PY2
-+commands = pytest --timeout 300 --cov=pip --cov-report=term-missing --cov-report=xml --cov-report=html tests/unit {posargs}
- 
- [testenv:docs]
- # Don't skip install here since pip_sphinxext uses pip's internals.
--- 
-2.28.0
-

[gentoo-commits] repo/gentoo:master commit in: dev-python/pip/files/

[Conrad Kostecki]

commit:     6d3800de1a35cbcb1da14d093bfd31319d248a71
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue May 16 16:10:07 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May 22 21:26:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d3800de

dev-python/pip: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31063
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/pip-20.0.2-disable-system-install.patch  | 29 ------------
 dev-python/pip/files/pip-22.2.1-no-coverage.patch  | 52 ----------------------
 2 files changed, 81 deletions(-)

diff --git a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
deleted file mode 100644
index e0b0034e407a..000000000000
--- a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3aee04cbb93c0e479b040e682b2aef676629c9a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 1 Feb 2020 09:14:46 +0100
-Subject: [PATCH] install: Raise an error to avoid breaking python-exec
-
-Running pip without --target, --prefix, --root, or --user will result
-in packages being installed systemwide. This has a tendency to break
-python-exec if setuptools gets installed or upgraded.
----
- src/pip/_internal/commands/install.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
-index 8c2c32fd..41bac878 100644
---- a/src/pip/_internal/commands/install.py
-+++ b/src/pip/_internal/commands/install.py
-@@ -238,6 +238,9 @@ class InstallCommand(RequirementCommand):
-         if options.upgrade:
-             upgrade_strategy = options.upgrade_strategy
- 
-+        if not options.use_user_site and not options.target_dir and not options.root_path and not options.prefix_path and not os.getenv('GENTOO_PIP_TESTING'):
-+            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
-+
-         cmdoptions.check_dist_restriction(options, check_target=True)
- 
-         install_options = options.install_options or []
--- 
-2.28.0
-

diff --git a/dev-python/pip/files/pip-22.2.1-no-coverage.patch b/dev-python/pip/files/pip-22.2.1-no-coverage.patch
deleted file mode 100644
index bd9523956ca8..000000000000
--- a/dev-python/pip/files/pip-22.2.1-no-coverage.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From fe4438ee999938da3b6f67b4dd53d6676d67c3e7 Mon Sep 17 00:00:00 2001
-From: Arthur Zamarin <arthurzam@gentoo.org>
-Date: Fri, 29 Jul 2022 14:06:03 +0300
-Subject: [PATCH] Disable coverage testing support inside test venvs
-
----
- tests/conftest.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index c9ab292..e7c14df 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -403,13 +403,6 @@ def wheel_install(tmpdir_factory: pytest.TempPathFactory, common_wheels: Path) -
-     return _common_wheel_editable_install(tmpdir_factory, common_wheels, "wheel")
- 
- 
--@pytest.fixture(scope="session")
--def coverage_install(
--    tmpdir_factory: pytest.TempPathFactory, common_wheels: Path
--) -> Path:
--    return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage")
--
--
- def install_pth_link(
-     venv: VirtualEnvironment, project_name: str, lib_dir: Path
- ) -> None:
-@@ -424,7 +417,6 @@ def virtualenv_template(
-     tmpdir_factory: pytest.TempPathFactory,
-     pip_src: Path,
-     setuptools_install: Path,
--    coverage_install: Path,
- ) -> Iterator[VirtualEnvironment]:
- 
-     venv_type: VirtualEnvironmentType
-@@ -451,13 +443,6 @@ def virtualenv_template(
-         [os.fspath(venv.bin / "python"), "setup.py", "-q", "develop"], cwd=pip_editable
-     )
- 
--    # Install coverage and pth file for executing it in any spawned processes
--    # in this virtual environment.
--    install_pth_link(venv, "coverage", coverage_install)
--    # zz prefix ensures the file is after easy-install.pth.
--    with open(venv.site / "zz-coverage-helper.pth", "a") as f:
--        f.write("import coverage; coverage.process_startup()")
--
-     # Drop (non-relocatable) launchers.
-     for exe in os.listdir(venv.bin):
-         if not (
--- 
-2.35.1
-