diff --git a/build-0.10.0.tar.gz b/build-0.10.0.tar.gz new file mode 100644 index 0000000..23edba3 --- /dev/null +++ b/build-0.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cbeebaa6047cf8bfc82451038479e41d6cf1e196126a8a110991b1173b39390 +size 41509 diff --git a/build-0.9.0.tar.gz b/build-0.9.0.tar.gz deleted file mode 100644 index 4fbb13d..0000000 --- a/build-0.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6eac514275e6a6e6c88373cc536a8eefa446ad6260567ec6ee367519447d382b -size 41012 diff --git a/build-pr550-packaging22.patch b/build-pr550-packaging22.patch deleted file mode 100644 index faf1470..0000000 --- a/build-pr550-packaging22.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 6fd0b36eea39e9b8672962f3cca03f40aaa00089 Mon Sep 17 00:00:00 2001 -From: Henry Schreiner -Date: Fri, 9 Dec 2022 22:15:22 -0500 -Subject: [PATCH] tests: fix for PEP 685 in packaging 22 - -Signed-off-by: Henry Schreiner ---- - tests/test_projectbuilder.py | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) - -diff --git a/tests/test_projectbuilder.py b/tests/test_projectbuilder.py -index f25078a7..9c67e707 100644 ---- a/tests/test_projectbuilder.py -+++ b/tests/test_projectbuilder.py -@@ -60,13 +60,13 @@ def read_text(self, filename): - Metadata-Version: 2.2 - Name: extras_dep - Version: 1.0.0 -- Provides-Extra: extra_without_associated_deps -- Provides-Extra: extra_with_unmet_deps -- Requires-Dist: unmet_dep; extra == 'extra_with_unmet_deps' -- Provides-Extra: extra_with_met_deps -- Requires-Dist: extras_dep; extra == 'extra_with_met_deps' -- Provides-Extra: recursive_extra_with_unmet_deps -- Requires-Dist: recursive_dep; extra == 'recursive_extra_with_unmet_deps' -+ Provides-Extra: extra-without-associated-deps -+ Provides-Extra: extra-with_unmet-deps -+ Requires-Dist: unmet_dep; extra == 'extra-with-unmet-deps' -+ Provides-Extra: extra-with-met-deps -+ Requires-Dist: extras_dep; extra == 'extra-with-met-deps' -+ Provides-Extra: recursive-extra-with-unmet-deps -+ Requires-Dist: recursive_dep; extra == 'recursive-extra-with-unmet-deps' - """ - ).strip() - -@@ -142,27 +142,27 @@ def read_text(self, filename): - ('requireless_dep', None), - ('extras_dep[undefined_extra]', None), - # would the wheel builder filter this out? -- ('extras_dep[extra_without_associated_deps]', None), -+ ('extras_dep[extra-without-associated-deps]', None), - ( -- 'extras_dep[extra_with_unmet_deps]', -- ('extras_dep[extra_with_unmet_deps]', 'unmet_dep; extra == "extra_with_unmet_deps"'), -+ 'extras_dep[extra-with-unmet-deps]', -+ ('extras_dep[extra-with-unmet-deps]', 'unmet_dep; extra == "extra-with-unmet-deps"'), - ), - ( -- 'extras_dep[recursive_extra_with_unmet_deps]', -+ 'extras_dep[recursive-extra-with-unmet-deps]', - ( -- 'extras_dep[recursive_extra_with_unmet_deps]', -- 'recursive_dep; extra == "recursive_extra_with_unmet_deps"', -+ 'extras_dep[recursive-extra-with-unmet-deps]', -+ 'recursive_dep; extra == "recursive-extra-with-unmet-deps"', - 'recursive_unmet_dep', - ), - ), -- ('extras_dep[extra_with_met_deps]', None), -+ ('extras_dep[extra-with-met-deps]', None), - ('missing_dep; python_version>"10"', None), - ('missing_dep; python_version<="1"', None), - ('missing_dep; python_version>="1"', ('missing_dep; python_version >= "1"',)), - ('extras_dep == 1.0.0', None), - ('extras_dep == 2.0.0', ('extras_dep==2.0.0',)), -- ('extras_dep[extra_without_associated_deps] == 1.0.0', None), -- ('extras_dep[extra_without_associated_deps] == 2.0.0', ('extras_dep[extra_without_associated_deps]==2.0.0',)), -+ ('extras_dep[extra-without-associated-deps] == 1.0.0', None), -+ ('extras_dep[extra-without-associated-deps] == 2.0.0', ('extras_dep[extra-without-associated-deps]==2.0.0',)), - ('prerelease_dep >= 1.0.0', None), - ('circular_dep', None), - ], diff --git a/flit_core-2.3.0-py2.py3-none-any.whl b/flit_core-2.3.0-py2.py3-none-any.whl deleted file mode 100644 index db83957..0000000 --- a/flit_core-2.3.0-py2.py3-none-any.whl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8f8904b534966712390e0a2e434cd33f76037730a0aaed299a286f9e18cac2b -size 40020 diff --git a/flit_core-3.8.0-py3-none-any.whl b/flit_core-3.8.0-py3-none-any.whl new file mode 100644 index 0000000..0af9328 --- /dev/null +++ b/flit_core-3.8.0-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64a29ec845164a6abe1136bf4bc5ae012bdfe758ed42fc7571a9059a7c80bd83 +size 62566 diff --git a/python-build.changes b/python-build.changes index b5cd2c0..45f34d7 100644 --- a/python-build.changes +++ b/python-build.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Mar 21 19:16:14 UTC 2023 - Ben Greiner + +- Update to 0.10.0 + * Replace pep517 dependency with pyproject_hooks, into which + pep517 has been renamed (PR #539, Fixes #529) + * Change build backend from setuptools to flit (PR #470, Fixes + #394) + * Dropped support for Python 3.6 (PR #532) +- Avoid namespace clashes with build/ directory + * gh#python-rpm-macros#157 + ------------------------------------------------------------------- Sun Jan 1 18:26:09 UTC 2023 - Ben Greiner diff --git a/python-build.spec b/python-build.spec index fc5fc37..1661625 100644 --- a/python-build.spec +++ b/python-build.spec @@ -24,35 +24,30 @@ %define psuffix %{nil} %bcond_with test %endif +# wheeldir of name build does not work well with this packagename gh#python-rpm-macros#157 +%define _pyproject_wheeldir distwheel -%define skip_python2 1 Name: python-build%{psuffix} -Version: 0.9.0 +Version: 0.10.0 Release: 0 Summary: Simple PEP517 package builder License: MIT Group: Development/Languages/Python URL: https://github.com/pypa/build Source0: https://github.com/pypa/build/archive/%{version}.tar.gz#/build-%{version}.tar.gz -# Needs the wheels for wheel, flit-core (<3), pytoml, and tomli for testing +# Needs the wheels for wheel, flit-core, pytoml, and tomli for testing Source10: https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.37.1-py2.py3-none-any.whl -Source11: https://files.pythonhosted.org/packages/py2.py3/f/flit-core/flit_core-2.3.0-py2.py3-none-any.whl -Source12: https://files.pythonhosted.org/packages/py2.py3/p/pytoml/pytoml-0.1.21-py2.py3-none-any.whl -Source13: https://files.pythonhosted.org/packages/py3/t/tomli/tomli-2.0.1-py3-none-any.whl -# PATCH-FIX-UPSTREAM build-pr550-packaging22.patch gh#pypa/build#550 -Patch1: https://github.com/pypa/build/pull/550.patch#/build-pr550-packaging22.patch -BuildRequires: %{python_module base >= 3.6} -BuildRequires: %{python_module importlib-metadata >= 0.22 if %python-base < 3.8} -BuildRequires: %{python_module packaging >= 19.0} -BuildRequires: %{python_module pep517 >= 0.9.1} -BuildRequires: %{python_module setuptools >= 42} -BuildRequires: %{python_module tomli >= 1.0.0 if %python-base < 3.11} +Source11: https://files.pythonhosted.org/packages/py3/f/flit-core/flit_core-3.8.0-py3-none-any.whl +Source12: https://files.pythonhosted.org/packages/py3/t/tomli/tomli-2.0.1-py3-none-any.whl +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module flit-core >= 3.4} +BuildRequires: %{python_module pip} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-packaging >= 0.19.0 -Requires: python-pep517 >= 0.9.1 +Requires: python-pyproject-hooks Requires: (python-importlib-metadata >= 0.22 if python-base < 3.8) -Requires: (python-tomli if python-base < 3.11) +Requires: (python-tomli >= 1.1.0 if python-base < 3.11) Recommends: python-virtualenv >= 20.0.35 Requires(post): update-alternatives Requires(postun):update-alternatives @@ -64,6 +59,8 @@ BuildRequires: %{python_module pytest >= 6} BuildRequires: %{python_module pytest-mock >= 2} BuildRequires: %{python_module pytest-rerunfailures >= 9.1} BuildRequires: %{python_module pytest-xdist >= 1.34} +BuildRequires: %{python_module setuptools >= 42 if %python-base < 3.10} +BuildRequires: %{python_module setuptools >= 56 if %python-base >= 3.11} BuildRequires: %{python_module toml >= 0.10.0} BuildRequires: %{python_module wheel >= 0.36} BuildRequires: python3-setuptools-wheel @@ -79,10 +76,10 @@ It is a simple build tool and does not perform any dependency management. %if !%{with test} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/pyproject-build %python_expand %fdupes %{buildroot}%{$python_sitelib} %endif @@ -90,9 +87,11 @@ It is a simple build tool and does not perform any dependency management. %if %{with test} %check mkdir -p wheels -cp %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} wheels/ +cp %{SOURCE10} %{SOURCE11} %{SOURCE12} wheels/ export PIP_FIND_LINKS="%{python3_sitelib}/../wheels $PWD/wheels" -%pytest tests -n auto +pushd tests +%pytest -n auto -x +popd %endif %if !%{with test} diff --git a/pytoml-0.1.21-py2.py3-none-any.whl b/pytoml-0.1.21-py2.py3-none-any.whl deleted file mode 100644 index acf6bcf..0000000 --- a/pytoml-0.1.21-py2.py3-none-any.whl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57a21e6347049f73bfb62011ff34cd72774c031b9828cb628a752225136dfc33 -size 8537