From 402ee8dca454862f8a867231ebabf6c9372cc615 Mon Sep 17 00:00:00 2001 From: desert-sailor Date: Mon, 8 Apr 2024 15:08:28 +0800 Subject: [PATCH] Fix test result format compatible (cherry picked from commit d126dc3baa839dcdcb9cc77c947eecdb4bb02e52) --- 0002-Fix-test-result-format-compatible.patch | 25 ++++++++++++++++++++ python-pyproject-api.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0002-Fix-test-result-format-compatible.patch diff --git a/0002-Fix-test-result-format-compatible.patch b/0002-Fix-test-result-format-compatible.patch new file mode 100644 index 0000000..35a0218 --- /dev/null +++ b/0002-Fix-test-result-format-compatible.patch @@ -0,0 +1,25 @@ +From cfac1a98a6c931cfc9901b783ea03a4ffbe40340 Mon Sep 17 00:00:00 2001 +From: desert-sailor +Date: Mon, 8 Apr 2024 15:04:49 +0800 +Subject: [PATCH] Fix test result format compatible + +--- + tests/test_frontend_setuptools.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_frontend_setuptools.py b/tests/test_frontend_setuptools.py +index ab6b3dc..7ed6817 100644 +--- a/tests/test_frontend_setuptools.py ++++ b/tests/test_frontend_setuptools.py +@@ -76,7 +76,7 @@ def test_setuptools_prepare_metadata_for_build_wheel(frontend_setuptools: Subpro + assert dist.metadata["Name"] == "demo" + values = [v for k, v in dist.metadata.items() if k == "Requires-Dist"] # type: ignore[attr-defined] + # ignore because "PackageMetadata" has no attribute "items" +- assert sorted(values) == ["magic >3", "requests >2"] ++ assert sorted(values) in [["magic >3", "requests >2"], ["magic (>3)", "requests (>2)"]] + assert isinstance(result.out, str) + assert isinstance(result.err, str) + +-- +2.43.0 + diff --git a/python-pyproject-api.spec b/python-pyproject-api.spec index 27944b1..c627688 100644 --- a/python-pyproject-api.spec +++ b/python-pyproject-api.spec @@ -2,13 +2,14 @@ Name: python-pyproject-api Version: 1.6.1 -Release: 2 +Release: 3 Summary: API to interact with the python pyproject.toml based projects License: MIT URL: https://pyproject-api.readthedocs.org Source0: https://files.pythonhosted.org/packages/source/p/pyproject-api/pyproject_api-%{version}.tar.gz Patch1: 0001-Fix-test-result-missing.patch +Patch2: 0002-Fix-test-result-format-compatible.patch BuildArch: noarch BuildRequires: python3-devel @@ -60,6 +61,9 @@ PYTEST_XDIST_AUTO_NUM_WORKERS=%{_smp_build_ncpus}} \ %{python3_sitelib}/pyproject_api*.dist-info/ %changelog +* Mon Apr 8 2024 Dongxing Wang - 1.6.1-3 +- Fix test result format compatible + * Sun Apr 7 2024 Dongxing Wang - 1.6.1-2 - Fix test result missing