diff --git a/15871707f614469716c9bfe3059d15d848ff7927.patch b/15871707f614469716c9bfe3059d15d848ff7927.patch new file mode 100644 index 0000000000000000000000000000000000000000..9e97c944d215bed46502f61a0ea6c138cd4ced84 --- /dev/null +++ b/15871707f614469716c9bfe3059d15d848ff7927.patch @@ -0,0 +1,57 @@ +diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py +index 4c16b9caed..38f9f063de 100644 +--- a/src/pip/_internal/commands/install.py ++++ b/src/pip/_internal/commands/install.py +@@ -529,14 +529,16 @@ def _warn_about_conflicts(self, conflict_details, resolver_variant): + parts = [] # type: List[str] + if resolver_variant == "legacy": + parts.append( +- "After October 2020 you may experience errors when installing " +- "or updating packages. This is because pip will change the " +- "way that it resolves dependency conflicts.\n" ++ "pip's legacy dependency resolver does not consider dependency " ++ "conflicts when selecting packages. This behaviour is the " ++ "source of the following dependency conflicts." + ) ++ else: ++ assert resolver_variant == "2020-resolver" + parts.append( +- "We recommend you use --use-feature=2020-resolver to test " +- "your packages with the new resolver before it becomes the " +- "default.\n" ++ "pip's dependency resolver does not currently take into account " ++ "all the packages that are installed. This behaviour is the " ++ "source of the following dependency conflicts." + ) + + # NOTE: There is some duplication here, with commands/check.py +@@ -557,7 +559,7 @@ def _warn_about_conflicts(self, conflict_details, resolver_variant): + version = package_set[project_name][0] + for dep_name, dep_version, req in conflicting[project_name]: + message = ( +- "{name} {version} requires {requirement}, but you'll have " ++ "{name} {version} requires {requirement}, but {you} have " + "{dep_name} {dep_version} which is incompatible." + ).format( + name=project_name, +@@ -565,6 +567,7 @@ def _warn_about_conflicts(self, conflict_details, resolver_variant): + requirement=req, + dep_name=dep_name, + dep_version=dep_version, ++ you=("you" if resolver_variant == "2020-resolver" else "you'll") + ) + parts.append(message) + +diff --git a/tests/functional/test_install_check.py b/tests/functional/test_install_check.py +index a173cb5504..56ac7daf65 100644 +--- a/tests/functional/test_install_check.py ++++ b/tests/functional/test_install_check.py +@@ -89,7 +89,7 @@ def test_check_install_does_not_warn_for_out_of_graph_issues(script): + assert_contains_expected_lines(result.stderr, [ + "broken 1.0 requires missing, which is not installed.", + "broken 1.0 requires conflict<1.0, " +- "but you'll have conflict 1.0 which is incompatible." ++ "but you have conflict 1.0 which is incompatible." + ]) + + # Install unrelated package diff --git a/python-pip.spec b/python-pip.spec index 3d035b59a33f24b5c58f6925acf4d9cb6a79f840..20ae0eaa947b67d4e0286c9a66326f65b1af23fc 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,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: 15871707f614469716c9bfe3059d15d848ff7927.patch Source10: pip-allow-older-versions.patch %description %{_description} @@ -112,6 +113,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %{python_wheeldir}/%{python_wheelname} %changelog +* 20201119183007636686 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <15871707f614469716c9bfe3059d15d848ff7927> to <15871707f614469716c9bfe3059d15d848ff7927> + * Wed Nov 4 2020 wangjie -20.2.2-3 - Type:NA - ID:NA @@ -161,4 +165,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