From db236490855e6f94ac85276f9dd4b94163bf4492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 3 Apr 2023 04:41:08 +0200 Subject: [PATCH 1/4] Remove redundant wheel dep from pyproject.toml Remove the redundant `wheel` dependency, as it is added by the backend automatically. Listing it explicitly in the documentation was a historical mistake and has been fixed since, see: https://github.com/pypa/setuptools/commit/f7d30a9529378cf69054b5176249e5457aaf640a --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d288e68e..faff244b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,6 @@ requires = [ # sync with setup.py until we discard non-pep-517/518 "setuptools", "setuptools-scm", - "wheel", "build", ] build-backend = "setuptools.build_meta" From ca6615397cccab239410b2eacfa319dfe94e74f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 3 Apr 2023 04:41:39 +0200 Subject: [PATCH 2/4] Remove incorrect build dep from pyproject.toml Remove the dependency on `build` that is irrelevant to backend dependencies. `build` is one of the PEP517 frontends, and as such it needs to be installed on the system starting PEP517 build rather than inside the virtual environment used to perform the builds. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index faff244b..e611abc4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,6 @@ requires = [ # sync with setup.py until we discard non-pep-517/518 "setuptools", "setuptools-scm", - "build", ] build-backend = "setuptools.build_meta" From 050eac13db5963cbfbaa52553639731a25e6810d Mon Sep 17 00:00:00 2001 From: Tom Schraitle Date: Mon, 3 Apr 2023 07:47:58 +0200 Subject: [PATCH 3/4] Adapt dependencies for tox.ini --- tox.ini | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index b71ae78e..ca5cf79c 100644 --- a/tox.ini +++ b/tox.ini @@ -99,10 +99,11 @@ commands = make -C docs man description = Prepare for TestPyPI basepython = python3 deps = - wheel twine - # PEP 517 build frontend - build +allowlist_externals = + # PEP 517 build frontend, automatically installed by setuptools + pyproject-build + twine commands = # Same as python3 -m build pyproject-build From 73e79db451f2219da604a85e8e802b65156edc7d Mon Sep 17 00:00:00 2001 From: Tom Schraitle Date: Mon, 3 Apr 2023 16:10:21 +0200 Subject: [PATCH 4/4] Add build into deps (prepare-dist) --- tox.ini | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index ca5cf79c..fb91a518 100644 --- a/tox.ini +++ b/tox.ini @@ -100,10 +100,7 @@ description = Prepare for TestPyPI basepython = python3 deps = twine -allowlist_externals = - # PEP 517 build frontend, automatically installed by setuptools - pyproject-build - twine + build commands = # Same as python3 -m build pyproject-build