diff --git a/.gitignore b/.gitignore index 6715cb6..be18e39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/poetry-core-*.tar.gz -/poetry-core-*/ -/results_*/ -*.rpm +SOURCES/poetry-core-1.8.1.tar.gz diff --git a/.python-poetry-core.metadata b/.python-poetry-core.metadata new file mode 100644 index 0000000..faf0052 --- /dev/null +++ b/.python-poetry-core.metadata @@ -0,0 +1 @@ +1bec31015264ab194b76e1c11595a4f03e4b04ee SOURCES/poetry-core-1.8.1.tar.gz diff --git a/SOURCES/poetry-core-1.8.1-devendor.patch b/SOURCES/poetry-core-1.8.1-devendor.patch new file mode 100644 index 0000000..18d7afc --- /dev/null +++ b/SOURCES/poetry-core-1.8.1-devendor.patch @@ -0,0 +1,29 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 04c1b78..56688d2 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -27,6 +27,12 @@ include = [ + [tool.poetry.dependencies] + python = "^3.8" + ++# moved here from vendors/pyproject.toml ++fastjsonschema = "^2.18.0" ++lark = "^1.1.3" ++packaging = ">=22.0" ++tomli = {version = "^2.0.1", python = "<3.11"} ++ + [tool.poetry.group.dev.dependencies] + pre-commit = ">=2.15.0" + vendoring = ">=1.0" +diff --git a/vendors/pyproject.toml b/vendors/pyproject.toml +index 47f7099..24fc1ae 100644 +--- a/vendors/pyproject.toml ++++ b/vendors/pyproject.toml +@@ -21,7 +21,3 @@ classifiers = [ + [tool.poetry.dependencies] + python = "^3.8" + +-fastjsonschema = "^2.18.0" +-lark = "^1.1.3" +-packaging = ">=22.0" +-tomli = "^2.0.1" diff --git a/SOURCES/python-poetry-core-c99.patch b/SOURCES/python-poetry-core-c99.patch new file mode 100644 index 0000000..e54d205 --- /dev/null +++ b/SOURCES/python-poetry-core-c99.patch @@ -0,0 +1,56 @@ +commit c08cd149e272e23c2dd77564bd5a2a8ed97098f7 +Author: Sergei Trofimovich +Date: Sat Dec 9 06:36:34 2023 +0000 + + tests: fix test failures on upcoming `gcc-14` (#671) + + Upcoming `gcc-14` enabled a few warnings into errors, like + `-Wint-conversion`. This caused `shadow` build to fail as: + + src/extended/extended.c:13:9: error: + initialization of ‘int’ from ‘void *’ makes integer from pointer + without a cast [-Wint-conversion] + 13 | NULL, + | ^~~~ + + The change fixes `int ml_flags;` to take `int` instead of pointer. + +diff --git a/tests/masonry/builders/fixtures/extended/extended/extended.c b/tests/masonry/builders/fixtures/extended/extended/extended.c +index 25a028e..8980ea3 100644 +--- a/tests/masonry/builders/fixtures/extended/extended/extended.c ++++ b/tests/masonry/builders/fixtures/extended/extended/extended.c +@@ -10,7 +10,7 @@ static PyMethodDef module_methods[] = { + { + "hello", + (PyCFunction) hello, +- NULL, ++ 0, + PyDoc_STR("Say hello.") + }, + {NULL} +diff --git a/tests/masonry/builders/fixtures/extended_with_no_setup/extended/extended.c b/tests/masonry/builders/fixtures/extended_with_no_setup/extended/extended.c +index 25a028e..8980ea3 100644 +--- a/tests/masonry/builders/fixtures/extended_with_no_setup/extended/extended.c ++++ b/tests/masonry/builders/fixtures/extended_with_no_setup/extended/extended.c +@@ -10,7 +10,7 @@ static PyMethodDef module_methods[] = { + { + "hello", + (PyCFunction) hello, +- NULL, ++ 0, + PyDoc_STR("Say hello.") + }, + {NULL} +diff --git a/tests/masonry/builders/fixtures/src_extended/src/extended/extended.c b/tests/masonry/builders/fixtures/src_extended/src/extended/extended.c +index 25a028e..8980ea3 100644 +--- a/tests/masonry/builders/fixtures/src_extended/src/extended/extended.c ++++ b/tests/masonry/builders/fixtures/src_extended/src/extended/extended.c +@@ -10,7 +10,7 @@ static PyMethodDef module_methods[] = { + { + "hello", + (PyCFunction) hello, +- NULL, ++ 0, + PyDoc_STR("Say hello.") + }, + {NULL} diff --git a/python-poetry-core.spec b/SPECS/python-poetry-core.spec similarity index 79% rename from python-poetry-core.spec rename to SPECS/python-poetry-core.spec index d921e28..fec6ded 100644 --- a/python-poetry-core.spec +++ b/SPECS/python-poetry-core.spec @@ -2,34 +2,19 @@ %bcond tests %{undefined rhel} Name: python-poetry-core -Version: 1.6.1 -Release: 1%{?dist} +Version: 1.8.1 +Release: 5%{?dist} Summary: Poetry PEP 517 Build Backend - -# We bundle a lot of libraries with poetry, which itself is under MIT license. -# Here is the list of the libraries with corresponding licenses: - -# attrs: MIT -# jsonschema: MIT -# lark: MIT -# packaging: ASL 2.0 or BSD -# pkgutil-resolve-name: MIT -# pyparsing: MIT -# pyrsistent: MIT -# tomlkit: MIT -# typing-extensions: Python - -License: MIT and (ASL 2.0 or BSD) and Python +# SPDX +License: MIT URL: https://github.com/python-poetry/poetry-core Source0: %{url}/archive/%{version}/poetry-core-%{version}.tar.gz # This patch moves the vendored requires definition # from vendors/pyproject.toml to pyproject.toml # Intentionally contains the removed hunk to prevent patch aging - -# poetry is broken with packaging 21+ (https://github.com/python-poetry/poetry/issues/4264). -# We are temporarily disabling this patch so installed poetry works again. -#Patch1: poetry-core-1.0.2-devendor.patch +Patch1: poetry-core-1.8.1-devendor.patch +Patch2: python-poetry-core-c99.patch BuildArch: noarch BuildRequires: python3-devel @@ -62,13 +47,6 @@ Summary: %{summary} # Previous versions of poetry included poetry-core in it Conflicts: python%{python3_version}dist(poetry) < 1.1 -# The bundled versions are taken from src/poetry/core/_vendor/vendor.txt -Provides: bundled(python3dist(attrs)) = 23.1.0 -Provides: bundled(python3dist(jsonschema)) = 4.17.3 -Provides: bundled(python3dist(lark)) = 1.1.5 -Provides: bundled(python3dist(packaging)) = 23.1 -Provides: bundled(python3dist(pyrsistent)) = 0.19.3 -Provides: bundled(python3dist(tomli)) = 2.0.1 %description -n python3-poetry-core %_description @@ -83,7 +61,7 @@ Provides: bundled(python3dist(tomli)) = 2.0.1 %build # we debundle the deps after we use the bundled deps in previous step to parse the deps 🤯 -#rm -r poetry/core/_vendor +rm -r src/poetry/core/_vendor %pyproject_wheel @@ -109,6 +87,36 @@ Provides: bundled(python3dist(tomli)) = 2.0.1 %changelog +* Mon Dec 16 2024 Arkady L. Shane - 1.8.1-5 +- Rebuilt for MSVSphere 10 + +* Tue Oct 29 2024 Troy Dawson - 1.8.1-5 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.8.1-4 +- Bump release for June 2024 mass rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 1.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 18 2024 Tomáš Hrnčiar - 1.8.1-1 +- Update to 1.8.1 +- Fixes: rhbz#2247249 + +* Thu Jan 04 2024 Florian Weimer - 1.7.0-2 +- Backport upstream patch to fix C compatibility issue + +* Fri Sep 01 2023 Tomáš Hrnčiar - 1.7.0-1 +- Update to 1.7.0 +- Fixes: rhbz#2232934 + +* Wed Aug 23 2023 Yaakov Selkowitz - 1.6.1-2 +- Drop unwanted tomli dependency + * Wed Jul 26 2023 Tomáš Hrnčiar - 1.6.1-1 - Update to 1.6.1 - Fixes: rhbz#2144878 diff --git a/poetry-core-1.0.2-devendor.patch b/poetry-core-1.0.2-devendor.patch deleted file mode 100644 index c33054e..0000000 --- a/poetry-core-1.0.2-devendor.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index d55b844..822c584 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -43,6 +43,13 @@ enum34 = {version = "^1.1.10", python = "~2.7"} - # required by tomlkit, jsonschema - functools32 = {version = "^3.2.3-2", python = "~2.7"} - -+# moved here from vendors/pyproject.toml -+jsonschema = "^3.2.0" -+lark-parser = "^0.9.0" -+packaging = "*" -+pyrsistent = ">=0.16.0,<0.19.0" -+tomlkit = ">=0.7.0,<1.0.0" -+ - [tool.poetry.dev-dependencies] - pre-commit = "^1.10" - pyrsistent = "^0.16.0" -diff --git a/vendors/pyproject.toml b/vendors/pyproject.toml -index 2671380..fb0b28e 100644 ---- a/vendors/pyproject.toml -+++ b/vendors/pyproject.toml -@@ -20,9 +20,3 @@ classifiers = [ - - [tool.poetry.dependencies] - python = "^3.6" -- --jsonschema = "^3.2.0" --lark-parser = "^0.9.0" --packaging = "^20.9" --pyrsistent = "^0.16.0" --tomlkit = ">=0.7.0,<1.0.0" diff --git a/sources b/sources deleted file mode 100644 index 863d580..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (poetry-core-1.6.1.tar.gz) = 53db0e4f4d5bc6ed2b201cd88a84e07dc6421e910292b8b5efb0dcce1af6e8c62836458a6409aac0394b5063b7c4a6be93784b0bce8592d74f61800f54916706