Skip to content

Commit

Permalink
remove flake8-pyproject
Browse files Browse the repository at this point in the history
  • Loading branch information
zacharyburnett committed Jun 17, 2022
1 parent 5b1adbb commit e5f7177
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,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
Expand Down
22 changes: 0 additions & 22 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ docs = [
'stsci-rtd-theme',
'toml',
]
lint = [
'flake8',
'flake8-pyproject',
]
test = [
'psutil',
'pytest >=4.6.0',
Expand Down Expand Up @@ -61,24 +57,6 @@ zip-safe = true
[tool.setuptools.packages.find]
where = ['src']

[tool.flake8]
select = ['F', 'W', 'E', 'C']
# We should set max line length lower eventually
max-line-length = 110
exclude = [
'docs',
'build',
'dist',
'.tox',
'.eggs',
]
ignore = [
'E231', # Missing whitespace after ',', ';', or ':'
'E241', # Multiple spaces after ','
'W503', # Line break occurred before a binary operator
'W504', # Line break occurred after a binary operator
]

[tool.pytest]
minversion = 4.6
doctest_plus = true
Expand Down
17 changes: 17 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# this file exists to support an editable PEP517 install and for `flake8` (https://github.com/PyCQA/flake8/issues/234)

[flake8]
select = F, W, E, C
# We should set max line length to 88 eventually
max-line-length = 110
exclude =
docs,
build,
dist,
.tox,
.eggs
ignore =
E231, # Missing whitespace after ',', ';', or ':'
E241, # Multiple spaces after ','
W503, # Line break occurred before a binary operator
W504, # Line break occurred after a binary operator
3 changes: 0 additions & 3 deletions setup.py

This file was deleted.

0 comments on commit e5f7177

Please sign in to comment.