From 0a8b0fbc15086a143fb0febeee6f8431e14e90bd Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 15 Dec 2020 18:58:55 +0800 Subject: [PATCH 1/2] [patch tracking] 20201215185849754891 - https://github.com/pypa/pip/commit/03d5f56b108fc820b0ab266a1dddce7da8130807 --- ...f56b108fc820b0ab266a1dddce7da8130807.patch | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 03d5f56b108fc820b0ab266a1dddce7da8130807.patch diff --git a/03d5f56b108fc820b0ab266a1dddce7da8130807.patch b/03d5f56b108fc820b0ab266a1dddce7da8130807.patch new file mode 100644 index 0000000..e9578a8 --- /dev/null +++ b/03d5f56b108fc820b0ab266a1dddce7da8130807.patch @@ -0,0 +1,116 @@ +diff --git a/setup.cfg b/setup.cfg +index 8d9edbcc06..84a959a32d 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -61,6 +61,7 @@ markers = + mercurial: VCS: Mercurial + git: VCS: git + yaml: yaml based tests ++ search: tests for 'pip search' + + [coverage:run] + branch = True +diff --git a/tests/conftest.py b/tests/conftest.py +index 6f7bd1a6cf..dc1fdb5140 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -51,6 +51,12 @@ def pytest_addoption(parser): + default=False, + help="use venv for virtual environment creation", + ) ++ parser.addoption( ++ "--run-search", ++ action="store_true", ++ default=False, ++ help="run 'pip search' tests", ++ ) + + + def pytest_collection_modifyitems(config, items): +@@ -58,6 +64,10 @@ def pytest_collection_modifyitems(config, items): + if not hasattr(item, 'module'): # e.g.: DoctestTextfile + continue + ++ if (item.get_closest_marker('search') and ++ not config.getoption('--run-search')): ++ item.add_marker(pytest.mark.skip('pip search test skipped')) ++ + if "CI" in os.environ: + # Mark network tests as flaky + if item.get_closest_marker('network') is not None: +diff --git a/tests/functional/test_search.py b/tests/functional/test_search.py +index 875e2e5d6d..b8bc6d51e2 100644 +--- a/tests/functional/test_search.py ++++ b/tests/functional/test_search.py +@@ -56,6 +56,7 @@ def test_pypi_xml_transformation(): + + + @pytest.mark.network ++@pytest.mark.search + def test_basic_search(script): + """ + End to end test of search command. +@@ -75,6 +76,7 @@ def test_basic_search(script): + "https://github.com/pypa/warehouse/issues/3717 for more " + "information."), + ) ++@pytest.mark.search + def test_multiple_search(script): + """ + Test searching for multiple packages at once. +@@ -88,6 +90,7 @@ def test_multiple_search(script): + assert 'Tools for parsing and using INI-style files' in output.stdout + + ++@pytest.mark.search + def test_search_missing_argument(script): + """ + Test missing required argument for search +@@ -97,6 +100,7 @@ def test_search_missing_argument(script): + + + @pytest.mark.network ++@pytest.mark.search + def test_run_method_should_return_success_when_find_packages(): + """ + Test SearchCommand.run for found package +@@ -110,6 +114,7 @@ def test_run_method_should_return_success_when_find_packages(): + + + @pytest.mark.network ++@pytest.mark.search + def test_run_method_should_return_no_matches_found_when_does_not_find_pkgs(): + """ + Test SearchCommand.run for no matches +@@ -123,6 +128,7 @@ def test_run_method_should_return_no_matches_found_when_does_not_find_pkgs(): + + + @pytest.mark.network ++@pytest.mark.search + def test_search_should_exit_status_code_zero_when_find_packages(script): + """ + Test search exit status code for package found +@@ -132,6 +138,7 @@ def test_search_should_exit_status_code_zero_when_find_packages(script): + + + @pytest.mark.network ++@pytest.mark.search + def test_search_exit_status_code_when_finds_no_package(script): + """ + Test search exit status code for no matches +@@ -140,6 +147,7 @@ def test_search_exit_status_code_when_finds_no_package(script): + assert result.returncode == NO_MATCHES_FOUND, result.returncode + + ++@pytest.mark.search + def test_latest_prerelease_install_message(caplog, monkeypatch): + """ + Test documentation for installing pre-release packages is displayed +@@ -168,6 +176,7 @@ def test_latest_prerelease_install_message(caplog, monkeypatch): + assert get_dist.calls == [pretend.call('ni')] + + ++@pytest.mark.search + def test_search_print_results_should_contain_latest_versions(caplog): + """ + Test that printed search results contain the latest package versions -- Gitee From d08c062ba95f6c0bec564e0a6dea84b93cfc13cb Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 15 Dec 2020 18:58:56 +0800 Subject: [PATCH 2/2] [patch tracking] 20201215185849754891 - 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 3d035b5..b745ff4 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: 03d5f56b108fc820b0ab266a1dddce7da8130807.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 +* 20201215185849754891 patch-tracking 20.2.2-4 +- append patch file of upstream repository from <03d5f56b108fc820b0ab266a1dddce7da8130807> to <03d5f56b108fc820b0ab266a1dddce7da8130807> + * 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 -- Gitee