diff --git a/193267b417e33a0dc948b2bf1640a28d81c1c88a.patch b/193267b417e33a0dc948b2bf1640a28d81c1c88a.patch new file mode 100644 index 0000000000000000000000000000000000000000..1340839f6c0b6323ec61ce3e46e7f0c3d7a7452a --- /dev/null +++ b/193267b417e33a0dc948b2bf1640a28d81c1c88a.patch @@ -0,0 +1,16 @@ +diff --git a/news/a13640e3-bfd3-46ae-b4b6-bcb9784303b4.trivial.rst b/news/a13640e3-bfd3-46ae-b4b6-bcb9784303b4.trivial.rst +new file mode 100644 +index 0000000000..e69de29bb2 +diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py +index f780831188..39dc3d15f1 100644 +--- a/src/pip/_internal/resolution/resolvelib/factory.py ++++ b/src/pip/_internal/resolution/resolvelib/factory.py +@@ -68,8 +68,6 @@ + + C = TypeVar("C") + Cache = Dict[Link, C] +- VersionCandidates = Dict[_BaseVersion, Candidate] +- + + logger = logging.getLogger(__name__) + diff --git a/914b7c21656d4d1039524a9c9d4bfe74a6976cf3.patch b/914b7c21656d4d1039524a9c9d4bfe74a6976cf3.patch new file mode 100644 index 0000000000000000000000000000000000000000..a927f878fb16849d032ec5283faa1b33e68727df --- /dev/null +++ b/914b7c21656d4d1039524a9c9d4bfe74a6976cf3.patch @@ -0,0 +1,35 @@ +diff --git a/news/86c319cb-0539-41a0-871b-4ffe72765f6f.trivial.rst b/news/86c319cb-0539-41a0-871b-4ffe72765f6f.trivial.rst +new file mode 100644 +index 0000000000..e69de29bb2 +diff --git a/src/pip/_internal/operations/prepare.py b/src/pip/_internal/operations/prepare.py +index 853e2e7fbd..977d83a1b4 100644 +--- a/src/pip/_internal/operations/prepare.py ++++ b/src/pip/_internal/operations/prepare.py +@@ -38,9 +38,8 @@ + from pip._internal.vcs import vcs + + if MYPY_CHECK_RUNNING: +- from typing import Callable, Dict, Iterable, List, Optional, Tuple ++ from typing import Dict, Iterable, List, Optional, Tuple + +- from mypy_extensions import TypedDict + from pip._vendor.pkg_resources import Distribution + + from pip._internal.index.package_finder import PackageFinder +@@ -50,16 +49,6 @@ + from pip._internal.req.req_tracker import RequirementTracker + from pip._internal.utils.hashes import Hashes + +- CopytreeKwargs = TypedDict( +- 'CopytreeKwargs', +- { +- 'copy_function': Callable[[str, str], None], +- 'ignore': Callable[[str, List[str]], List[str]], +- 'ignore_dangling_symlinks': bool, +- 'symlinks': bool, +- }, +- total=False, +- ) + + logger = logging.getLogger(__name__) + diff --git a/python-pip.spec b/python-pip.spec index 3d035b59a33f24b5c58f6925acf4d9cb6a79f840..949cba1c3148712590c4d791ce874199852e700d 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -6,7 +6,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: 3 +Release: 4 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 @@ -16,6 +16,8 @@ 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: 193267b417e33a0dc948b2bf1640a28d81c1c88a.patch +Patch6002: 914b7c21656d4d1039524a9c9d4bfe74a6976cf3.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -112,6 +114,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201229165849754542 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <193267b417e33a0dc948b2bf1640a28d81c1c88a> to <914b7c21656d4d1039524a9c9d4bfe74a6976cf3> + * Wed Nov 4 2020 wangjie -20.2.2-3 - Type:NA - ID:NA @@ -161,4 +166,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