From eff4f1d505da4f50e0c1402cdbcc014ca7fa315a Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 30 Oct 2020 08:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201030083007637392 - https://github.com/pypa/pip/commit/8ae1bd607e9fa84d6640909dc9998a0c61a10da6 --- ...bd607e9fa84d6640909dc9998a0c61a10da6.patch | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 8ae1bd607e9fa84d6640909dc9998a0c61a10da6.patch diff --git a/8ae1bd607e9fa84d6640909dc9998a0c61a10da6.patch b/8ae1bd607e9fa84d6640909dc9998a0c61a10da6.patch new file mode 100644 index 0000000..409618e --- /dev/null +++ b/8ae1bd607e9fa84d6640909dc9998a0c61a10da6.patch @@ -0,0 +1,87 @@ +diff --git a/src/pip/_internal/resolution/resolvelib/reporter.py b/src/pip/_internal/resolution/resolvelib/reporter.py +index 65c4373731..07ce399acc 100644 +--- a/src/pip/_internal/resolution/resolvelib/reporter.py ++++ b/src/pip/_internal/resolution/resolvelib/reporter.py +@@ -6,9 +6,9 @@ + from pip._internal.utils.typing import MYPY_CHECK_RUNNING + + if MYPY_CHECK_RUNNING: +- from typing import DefaultDict ++ from typing import Any, DefaultDict + +- from .base import Candidate ++ from .base import Candidate, Requirement + + + logger = getLogger(__name__) +@@ -50,3 +50,35 @@ def backtracking(self, candidate): + + message = self._messages_at_backtrack[count] + logger.info("INFO: %s", message) ++ ++ ++class PipDebuggingReporter(BaseReporter): ++ """A reporter that does an info log for every event it sees.""" ++ ++ def starting(self): ++ # type: () -> None ++ logger.info("Reporter.starting()") ++ ++ def starting_round(self, index): ++ # type: (int) -> None ++ logger.info("Reporter.starting_round(%r)", index) ++ ++ def ending_round(self, index, state): ++ # type: (int, Any) -> None ++ logger.info("Reporter.ending_round(%r, state)", index) ++ ++ def ending(self, state): ++ # type: (Any) -> None ++ logger.info("Reporter.ending(%r)", state) ++ ++ def adding_requirement(self, requirement, parent): ++ # type: (Requirement, Candidate) -> None ++ logger.info("Reporter.adding_requirement(%r, %r)", requirement, parent) ++ ++ def backtracking(self, candidate): ++ # type: (Candidate) -> None ++ logger.info("Reporter.backtracking(%r)", candidate) ++ ++ def pinning(self, candidate): ++ # type: (Candidate) -> None ++ logger.info("Reporter.pinning(%r)", candidate) +diff --git a/src/pip/_internal/resolution/resolvelib/resolver.py b/src/pip/_internal/resolution/resolvelib/resolver.py +index 65d0874121..e2e164d12c 100644 +--- a/src/pip/_internal/resolution/resolvelib/resolver.py ++++ b/src/pip/_internal/resolution/resolvelib/resolver.py +@@ -1,5 +1,6 @@ + import functools + import logging ++import os + + from pip._vendor import six + from pip._vendor.packaging.utils import canonicalize_name +@@ -11,7 +12,10 @@ + from pip._internal.req.req_set import RequirementSet + from pip._internal.resolution.base import BaseResolver + from pip._internal.resolution.resolvelib.provider import PipProvider +-from pip._internal.resolution.resolvelib.reporter import PipReporter ++from pip._internal.resolution.resolvelib.reporter import ( ++ PipDebuggingReporter, ++ PipReporter, ++) + from pip._internal.utils.misc import dist_is_editable + from pip._internal.utils.typing import MYPY_CHECK_RUNNING + +@@ -104,7 +108,10 @@ def resolve(self, root_reqs, check_supported_wheels): + upgrade_strategy=self.upgrade_strategy, + user_requested=user_requested, + ) +- reporter = PipReporter() ++ if "PIP_RESOLVER_DEBUG" in os.environ: ++ reporter = PipDebuggingReporter() ++ else: ++ reporter = PipReporter() + resolver = RLResolver(provider, reporter) + + try: -- Gitee From 513d92b9788555c6fb1f468734858e2ffa167cf9 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Fri, 30 Oct 2020 08:30:12 +0800 Subject: [PATCH 2/2] [patch tracking] 20201030083007637392 - update spec file --- python-pip.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index 05f810a..8d532d6 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -7,7 +7,7 @@ pip is the package installer for Python. You can use pip to install packages fro %global bashcompdir %(b=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null); echo ${b:-%{_sysconfdir}/bash_completion.d}) Name: python-%{srcname} Version: 20.2.2 -Release: 2 +Release: 3 Summary: A tool for installing and managing Python packages License: MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD) URL: http://www.pip-installer.org @@ -17,6 +17,7 @@ Patch1: allow-stripping-given-prefix-from-wheel-RECORD-files.patch Patch2: emit-a-warning-when-running-with-root-privileges.patch Patch3: remove-existing-dist-only-if-path-conflicts.patch Patch6000: dummy-certifi.patch +Patch6001: 8ae1bd607e9fa84d6640909dc9998a0c61a10da6.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -140,6 +141,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201030083007637392 patch-tracking 20.2.2-3 +- append patch file of upstream repository from <8ae1bd607e9fa84d6640909dc9998a0c61a10da6> to <8ae1bd607e9fa84d6640909dc9998a0c61a10da6> + * Tue Sep 1 2020 wenzhanli - 20.2.2-2 - add pip-allow-older-versions.patch @@ -183,4 +187,4 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} - DESC: Synchronize a patch * Mon Sep 23 2019 openEuler Buildteam - 18.0-6 -- Package init +- Package init \ No newline at end of file -- Gitee