From 8dad7207716f1b09624703f1ccc35468c5a691af Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Mar 17 2024 16:22:36 +0000 Subject: Update to 1.1.1 - Resolves: rhbz#2267099 --- diff --git a/.gitignore b/.gitignore index fce9aaf..8a55404 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /build-0.9.0.tar.gz /build-0.10.0.tar.gz /build-1.0.3.tar.gz +/build-1.1.1.tar.gz diff --git a/9f6e34228a0da7e5.patch b/9f6e34228a0da7e5.patch deleted file mode 100644 index 509caf1..0000000 --- a/9f6e34228a0da7e5.patch +++ /dev/null @@ -1,101 +0,0 @@ -From b3fc602f10ef40a3543d6d47a93ae0cda234fdad Mon Sep 17 00:00:00 2001 -From: Henry Schreiner -Date: Tue, 23 Jan 2024 12:58:30 +0100 -Subject: [PATCH] tests: support setuptools v69.0.3+ (#722) - -* tests: support setuptools v69.0.3+ - -Signed-off-by: Henry Schreiner - -* tests: missed one more normalization fix - -Signed-off-by: Henry Schreiner - -* fix: add MANIFEST.in for old setuptools in tests - -Signed-off-by: Henry Schreiner - -* tests: used the wrong name - -Signed-off-by: Henry Schreiner - ---------- - -Signed-off-by: Henry Schreiner ---- - tests/packages/test-setuptools/MANIFEST.in | 1 + - tests/test_projectbuilder.py | 6 ++++-- - tests/test_self_packaging.py | 1 + - tests/test_util.py | 6 ++++-- - 4 files changed, 10 insertions(+), 4 deletions(-) - create mode 100644 tests/packages/test-setuptools/MANIFEST.in - -diff --git a/tests/packages/test-setuptools/MANIFEST.in b/tests/packages/test-setuptools/MANIFEST.in -new file mode 100644 -index 0000000..e69e3cf ---- /dev/null -+++ b/tests/packages/test-setuptools/MANIFEST.in -@@ -0,0 +1 @@ -+include pyproject.toml setup.cfg -diff --git a/tests/test_projectbuilder.py b/tests/test_projectbuilder.py -index d424680..c55cd09 100644 ---- a/tests/test_projectbuilder.py -+++ b/tests/test_projectbuilder.py -@@ -502,7 +502,8 @@ def test_metadata_path_no_prepare(tmp_dir, package_test_no_prepare): - pathlib.Path(builder.metadata_path(tmp_dir)), - ).metadata - -- assert metadata['name'] == 'test-no-prepare' -+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes -+ assert metadata['name'].replace('-', '_') == 'test_no_prepare' - assert metadata['Version'] == '1.0.0' - - -@@ -513,7 +514,8 @@ def test_metadata_path_with_prepare(tmp_dir, package_test_setuptools): - pathlib.Path(builder.metadata_path(tmp_dir)), - ).metadata - -- assert metadata['name'] == 'test-setuptools' -+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes -+ assert metadata['name'].replace('-', '_') == 'test_setuptools' - assert metadata['Version'] == '1.0.0' - - -diff --git a/tests/test_self_packaging.py b/tests/test_self_packaging.py -index fb1d124..3a436ef 100644 ---- a/tests/test_self_packaging.py -+++ b/tests/test_self_packaging.py -@@ -27,6 +27,7 @@ sdist_files = { - 'tests/constraints.txt', - 'tests/packages/test-cant-build-via-sdist/some-file-that-is-needed-for-build.txt', - 'tests/packages/test-no-project/empty.txt', -+ 'tests/packages/test-setuptools/MANIFEST.in', - 'tox.ini', - } - -diff --git a/tests/test_util.py b/tests/test_util.py -index 74f2cf1..b6252e8 100644 ---- a/tests/test_util.py -+++ b/tests/test_util.py -@@ -12,7 +12,8 @@ import build.util - def test_wheel_metadata(package_test_setuptools, isolated): - metadata = build.util.project_wheel_metadata(package_test_setuptools, isolated) - -- assert metadata['name'] == 'test-setuptools' -+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes -+ assert metadata['name'].replace('-', '_') == 'test_setuptools' - assert metadata['version'] == '1.0.0' - - -@@ -39,6 +40,7 @@ def test_wheel_metadata_isolation(package_test_flit): - def test_with_get_requires(package_test_metadata): - metadata = build.util.project_wheel_metadata(package_test_metadata) - -- assert metadata['name'] == 'test-metadata' -+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes -+ assert metadata['name'].replace('-', '_') == 'test_metadata' - assert str(metadata['version']) == '1.0.0' - assert metadata['summary'] == 'hello!' --- -2.43.0 - diff --git a/python-build.spec b/python-build.spec index dcf82fd..901e01f 100644 --- a/python-build.spec +++ b/python-build.spec @@ -1,7 +1,7 @@ %global pypi_name build Name: python-%{pypi_name} -Version: 1.0.3 +Version: 1.1.1 Release: %autorelease Summary: A simple, correct PEP517 package builder @@ -9,9 +9,6 @@ License: MIT URL: https://github.com/pypa/build Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz -# Fix the build with setuptools 69.0.3 -Patch: https://github.com/pypa/build/commit/9f6e34228a0da7e5.patch - BuildArch: noarch BuildRequires: python3-devel @@ -33,9 +30,6 @@ A simple, correct PEP517 package builder. %prep %autosetup -p1 -n %{pypi_name}-%{version} -# deprecated python3-toml is not needed on Python 3.11+ -# upstream: https://github.com/pypa/build/pull/563 -sed -Ei '/\btoml\b/d' pyproject.toml # coverage is discouraged in Python packages # https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters sed -Ei '/\bpytest-cov\b/d' pyproject.toml diff --git a/sources b/sources index 5caa1fa..3fc5248 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (build-1.0.3.tar.gz) = c2c67ccf407bb1780c90e02bbc2692b8b10cfe441f445c05d38a675f3498d1d6f94306dcbe270c181e14471f1dd3712e2cba33a4792f6140e2e9f0aa3c8e7b81 +SHA512 (build-1.1.1.tar.gz) = 5fa64b07f2c22faca074d1447f5fcb12b7ad40e5fe897f034901d7932d8a9aa2c1dfa806d373503246255d7d9a2429b336384a980376f4ae7c810ae275b735da