From 6f3cd188949bb187db4d5df8f9cdd0423d8573da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 18 Nov 2020 19:24:31 +0100 Subject: [PATCH] Extend the wheel Tag regex in tests to match cp3_10 and cp310 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1898727 --- cp3_10-tag.patch | 41 +++++++++++++++++++++++++++++++++++++++++ python-poetry-core.spec | 4 ++++ 2 files changed, 45 insertions(+) create mode 100644 cp3_10-tag.patch diff --git a/cp3_10-tag.patch b/cp3_10-tag.patch new file mode 100644 index 0000000..7b80f81 --- /dev/null +++ b/cp3_10-tag.patch @@ -0,0 +1,41 @@ +From bf2747df921ebc70bdbba2aac79f161ebf4df46c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Wed, 18 Nov 2020 11:10:26 +0100 +Subject: [PATCH] Extend the wheel Tag regex in tests to match cp3_10 and cp310 + +Fixes https://github.com/python-poetry/poetry-core/issues/110 +--- + tests/masonry/builders/test_complete.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/masonry/builders/test_complete.py b/tests/masonry/builders/test_complete.py +index 467ffdd4..4248a87a 100644 +--- a/tests/masonry/builders/test_complete.py ++++ b/tests/masonry/builders/test_complete.py +@@ -79,7 +79,7 @@ def test_wheel_c_extension(): + Wheel-Version: 1.0 + Generator: poetry {} + Root-Is-Purelib: false +-Tag: cp[23]\\d-cp[23]\\dm?u?-.+ ++Tag: cp[23]_?\\d+-cp[23]_?\\d+m?u?-.+ + $""".format( + __version__ + ), +@@ -136,7 +136,7 @@ def test_wheel_c_extension_with_no_setup(): + Wheel-Version: 1.0 + Generator: poetry {} + Root-Is-Purelib: false +-Tag: cp[23]\\d-cp[23]\\dm?u?-.+ ++Tag: cp[23]_?\\d+-cp[23]_?\\d+m?u?-.+ + $""".format( + __version__ + ), +@@ -193,7 +193,7 @@ def test_wheel_c_extension_src_layout(): + Wheel-Version: 1.0 + Generator: poetry {} + Root-Is-Purelib: false +-Tag: cp[23]\\d-cp[23]\\dm?u?-.+ ++Tag: cp[23]_?\\d+-cp[23]_?\\d+m?u?-.+ + $""".format( + __version__ + ), diff --git a/python-poetry-core.spec b/python-poetry-core.spec index bd85845..756d59b 100644 --- a/python-poetry-core.spec +++ b/python-poetry-core.spec @@ -11,6 +11,10 @@ Source0: %{url}/archive/%{version}/poetry-core-%{version}.tar.gz # Intentionally contains the removed hunk to prevent patch aging Patch1: poetry-core-1.0.0-devendor.patch +# The test regex for Python wheel tag fails with Python 3.10 +# https://github.com/python-poetry/poetry-core/issues/110 +Patch2: %{url}/pull/111.patch#/cp3_10-tag.patch + BuildArch: noarch BuildRequires: python3-devel BuildRequires: pyproject-rpm-macros