diff --git a/cffc3a618edb74b5852e628afeb2ee9c097327b1.patch b/cffc3a618edb74b5852e628afeb2ee9c097327b1.patch new file mode 100644 index 0000000000000000000000000000000000000000..c770e5f190c8485e487da962f410fa297b560c54 --- /dev/null +++ b/cffc3a618edb74b5852e628afeb2ee9c097327b1.patch @@ -0,0 +1,56 @@ +diff --git a/.azure-pipelines/linux.yml b/.azure-pipelines/linux.yml +index 6965a15fc6..e559807434 100644 +--- a/.azure-pipelines/linux.yml ++++ b/.azure-pipelines/linux.yml +@@ -1,3 +1,6 @@ ++variables: ++ CI: true ++ + jobs: + - template: jobs/test.yml + parameters: +diff --git a/.azure-pipelines/macos.yml b/.azure-pipelines/macos.yml +index 85c2a0246a..9ad9edae86 100644 +--- a/.azure-pipelines/macos.yml ++++ b/.azure-pipelines/macos.yml +@@ -1,3 +1,6 @@ ++variables: ++ CI: true ++ + jobs: + - template: jobs/test.yml + parameters: +diff --git a/.azure-pipelines/windows.yml b/.azure-pipelines/windows.yml +index 9d1bf5385d..f56b8f5048 100644 +--- a/.azure-pipelines/windows.yml ++++ b/.azure-pipelines/windows.yml +@@ -1,3 +1,6 @@ ++variables: ++ CI: true ++ + jobs: + - template: jobs/test-windows.yml + parameters: +diff --git a/tests/conftest.py b/tests/conftest.py +index ffd9f42158..bf071c8de7 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -63,10 +63,10 @@ def pytest_collection_modifyitems(config, items): + if not hasattr(item, 'module'): # e.g.: DoctestTextfile + continue + +- # Mark network tests as flaky +- if (item.get_closest_marker('network') is not None and +- "CI" in os.environ): +- item.add_marker(pytest.mark.flaky(reruns=3)) ++ if "CI" in os.environ: ++ # Mark network tests as flaky ++ if item.get_closest_marker('network') is not None: ++ item.add_marker(pytest.mark.flaky(reruns=3, reruns_delay=2)) + + if (item.get_closest_marker('fails_on_new_resolver') and + config.getoption("--new-resolver") and +diff --git a/tests/unit/test_build_env.py b/tests/functional/test_build_env.py +similarity index 100% +rename from tests/unit/test_build_env.py +rename to tests/functional/test_build_env.py diff --git a/python-pip.spec b/python-pip.spec index 05f810a986da3034c3f240b38e74be80b2c67322..492a185e0627136d44edd0e51555e38e44319d7a 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: cffc3a618edb74b5852e628afeb2ee9c097327b1.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 +* 20201026123007637457 patch-tracking 20.2.2-3 +- append patch file of upstream repository from to + * 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