From fa28697dc387c3d44254cb0ae646d212fa3e6d9a Mon Sep 17 00:00:00 2001
From: zacharyburnett <zburnett@stsci.edu>
Date: Fri, 17 Jun 2022 10:15:14 -0400
Subject: [PATCH] remove `flake8-pyproject`

---
 .github/workflows/ci.yml |  4 ++--
 pyproject.toml           | 18 ------------------
 setup.cfg                | 10 ++++++++++
 setup.py                 |  3 ---
 4 files changed, 12 insertions(+), 23 deletions(-)
 create mode 100644 setup.cfg
 delete mode 100644 setup.py

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d61a4be7..bfdf0b8c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,8 +28,8 @@ jobs:
         with:
           path: ${{ env.pythonLocation }}
           key: style-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('**/pyproject.toml', '**/setup.*') }}
-      - run: pip install flake8-pyproject
-      - run: flake8p --count src
+      - run: pip install flake8
+      - run: flake8 --count src
   audit:
     name: Bandit security audit
     runs-on: ubuntu-latest
diff --git a/pyproject.toml b/pyproject.toml
index 805d7c40..5a117c31 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,9 +28,6 @@ docs = [
     'stsci-rtd-theme',
     'toml',
 ]
-lint = [
-    'flake8-pyproject',
-]
 test = [
     'pytest >=4.6.0',
     'pytest-doctestplus',
@@ -62,21 +59,6 @@ zip-safe = true
 [tool.setuptools.packages.find]
 where = ['src']
 
-[tool.flake8]
-select = ['F', 'W', 'E101', 'E111', 'E112', 'E113', 'E401', 'E402', 'E501', 'E711', 'E722']
-# We should set max line length lower eventually
-max-line-length = 130
-exclude = [
-    'docs',
-    'src/stpipe/extern',
-]
-ignore = [
-    'E203',
-    'E503',
-    'W504',
-    'W605',
-]
-
 [tool.pytest.ini_options]
 minversion = 4.6
 doctest_plus = true
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..0cb7af96
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,10 @@
+# this file exists to support an editable PEP517 install and for `flake8` (https://github.com/PyCQA/flake8/issues/234)
+
+[flake8]
+select = F, W, E101, E111, E112, E113, E401, E402, E501, E711, E722
+# We should set max line length to 88 eventually
+max-line-length = 130
+exclude =
+    docs,
+    src/stpipe/extern,
+ignore = E203, W503, W504, W605
\ No newline at end of file
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 60684932..00000000
--- a/setup.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from setuptools import setup
-
-setup()