From 7a709b6d30dac9409707b1b9bf50cd7022e35118 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 1 Dec 2019 09:14:49 -0500 Subject: [PATCH 1/3] Restore build-backend and remove switch to avoid pep517. Ref #1644. --- pyproject.toml | 3 ++- tools/tox_pip.py | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 07c23bb5f5..5a2d7d3b67 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,6 @@ [build-system] -requires = ["wheel"] +requires = ["setuptools >= 40.8", "wheel"] +build-backend = "setuptools.build_meta" [tool.towncrier] package = "setuptools" diff --git a/tools/tox_pip.py b/tools/tox_pip.py index 5aeca80503..63518f927e 100644 --- a/tools/tox_pip.py +++ b/tools/tox_pip.py @@ -21,12 +21,6 @@ def pip(args): pypath = pypath.split(os.pathsep) if pypath is not None else [] pypath.insert(0, TOX_PIP_DIR) os.environ['PYTHONPATH'] = os.pathsep.join(pypath) - # Disable PEP 517 support when using editable installs. - for n, a in enumerate(args): - if not a.startswith('-'): - if a in 'install' and '-e' in args[n:]: - args.insert(n + 1, '--no-use-pep517') - break # Fix call for setuptools editable install. for n, a in enumerate(args): if a == '.': From dea5858f1ecf042a17e94a3e26a10bbc78fd2f35 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 29 Dec 2019 11:59:05 -0500 Subject: [PATCH 2/3] Add backend-path for future Pips Co-Authored-By: Paul Ganssle --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 5a2d7d3b67..f0fd8521ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,7 @@ [build-system] requires = ["setuptools >= 40.8", "wheel"] build-backend = "setuptools.build_meta" +backend-path = ["."] [tool.towncrier] package = "setuptools" From 8495fb9c59cc9af3a770b7b5ea5f950790e782ed Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 29 Dec 2019 12:21:15 -0500 Subject: [PATCH 3/3] Add changelog entry. Ref #1927. --- changelog.d/1927.change.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/1927.change.rst diff --git a/changelog.d/1927.change.rst b/changelog.d/1927.change.rst new file mode 100644 index 0000000000..3b293d6343 --- /dev/null +++ b/changelog.d/1927.change.rst @@ -0,0 +1 @@ +Setuptools once again declares 'setuptools' in the ``build-system.requires`` and adds PEP 517 build support by declaring itself as the ``build-backend``. It additionally specifies ``build-system.backend-path`` to rely on itself for those builders that support it.