Eliminated pyproject.toml entirely

Even with the [build-system] section gone, pip would still use the PEP 517 process, leading to a chicken and egg problem with setuptools.

4 files changed, 25 insertions, 29 deletions

diff --git a/.github/workflows/codeqa-test.yml b/.github/workflows/codeqa-test.yml
index 84efd64..a954191 100644
--- a/.github/workflows/codeqa-test.yml
+++ b/.github/workflows/codeqa-test.yml
@@ -18,13 +18,13 @@ jobs:
         path: ~/.cache/pip
         key: pip-lint
     - name: Install dependencies
-      run: pip install black isort pyproject-flake8
+      run: pip install black isort flake8
     - name: Run black
-      run: black --check --diff src tests
+      run: black --check --diff -t py37 src tests
     - name: Run isort
       run: isort -c --diff src tests
     - name: Run flake8
-      run: pflake8 src tests
+      run: flake8 src tests
 
   test:
     strategy:
diff --git a/pyproject.toml b/pyproject.toml
deleted file mode 100644
index d4e12ae..0000000
--- a/pyproject.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[tool.black]
-target-version = ['py37']
-extend-exclude = '''
-^/src/wheel/vendored/
-'''
-
-[tool.isort]
-src_paths = ["src"]
-profile = "black"
-skip_gitignore = true
-
-[tool.flake8]
-max-line-length = 88
-
-[tool.pytest.ini_options]
-testpaths = "tests"
-
-[tool.coverage.run]
-source = ["wheel"]
-omit = ["*/vendored/*"]
-
-[tool.coverage.report]
-show_missing = true
diff --git a/setup.cfg b/setup.cfg
index b5bd717..e944864 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -46,3 +46,22 @@ console_scripts =
     wheel = wheel.cli:main
 distutils.commands =
     bdist_wheel = wheel.bdist_wheel:bdist_wheel
+
+[tool:isort]
+src_paths = src
+profile = black
+skip_gitignore = true
+
+[tool:flake8]
+max-line-length = 88
+
+[tool:pytest]
+addopts = --cov --cov-config=setup.cfg
+testpaths = tests
+
+[coverage:run]
+source = wheel
+omit = */vendored/*
+
+[coverage:report]
+show_missing = true
diff --git a/tox.ini b/tox.ini
index a60b21e..39cbaae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ extras = test
 [testenv:black]
 basepython = python3
 deps = black
-commands = black src tests
+commands = black -t py37 src tests
 skip_install = true
 
 [testenv:isort]
@@ -26,6 +26,6 @@ skip_install = true
 
 [testenv:flake8]
 basepython = python3
-deps = pyproject-flake8
-commands = pflake8 src tests
+deps = flake8
+commands = flake8 src tests
 skip_install = true