Merge pull request #1927 from pypa/bugfix/1644-build-backend

Restore build-backend and remove switch to avoid pep517.

3 files changed, 4 insertions, 7 deletions

diff --git a/changelog.d/1927.change.rst b/changelog.d/1927.change.rst
new file mode 100644
index 00000000..3b293d63
--- /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.
diff --git a/pyproject.toml b/pyproject.toml
index 07c23bb5..f0fd8521 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,7 @@
 [build-system]
-requires = ["wheel"]
+requires = ["setuptools >= 40.8", "wheel"]
+build-backend = "setuptools.build_meta"
+backend-path = ["."]
 
 [tool.towncrier]
     package = "setuptools"
diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index 5aeca805..63518f92 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 == '.':