Skip to content

Commit b89807d

Browse files
committed
add flakehell for pyproject.toml compatibility
1 parent f91744f commit b89807d

File tree

5 files changed

+38
-65
lines changed

5 files changed

+38
-65
lines changed

=3.8.0

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Requirement already satisfied: flake8 in /home/zenon/.pyenv/versions/3.7.8/envs/renku-python/lib/python3.7/site-packages (4.0.1)
2+
Requirement already satisfied: importlib-metadata<4.3 in /home/zenon/.pyenv/versions/3.7.8/envs/renku-python/lib/python3.7/site-packages (from flake8) (4.2.0)
3+
Requirement already satisfied: pycodestyle<2.9.0,>=2.8.0 in /home/zenon/.pyenv/versions/3.7.8/envs/renku-python/lib/python3.7/site-packages (from flake8) (2.8.0)
4+
Requirement already satisfied: mccabe<0.7.0,>=0.6.0 in /home/zenon/.pyenv/versions/3.7.8/envs/renku-python/lib/python3.7/site-packages (from flake8) (0.6.1)
5+
Requirement already satisfied: pyflakes<2.5.0,>=2.4.0 in /home/zenon/.pyenv/versions/3.7.8/envs/renku-python/lib/python3.7/site-packages (from flake8) (2.4.0)
6+
Requirement already satisfied: typing-extensions>=3.6.4 in /home/zenon/.pyenv/versions/3.7.8/envs/renku-python/lib/python3.7/site-packages (from importlib-metadata<4.3->flake8) (3.10.0.2)
7+
Requirement already satisfied: zipp>=0.5 in /home/zenon/.pyenv/versions/3.7.8/envs/renku-python/lib/python3.7/site-packages (from importlib-metadata<4.3->flake8) (3.6.0)

poetry.lock

+15-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+15-31
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ docker-compose = { version = "==1.29.2", optional = true }
7777
environ-config = "<21.3.0,>=18.2.0"
7878
fakeredis = { version = "<1.6.2,>=1.4.1", optional = true }
7979
filelock = "<3.3.3,>=3.0.0"
80-
flake8 = { version = "<4.1,>=3.8", optional = true }
80+
flake8 = { version = "<4.0,>=3.8", optional = true }#wait for https://github.com/flakehell/flakehell/pull/23 to be merged before bumping
8181
flaky = { version = "==3.7.0", optional = true }
8282
flask = { version = "==2.0.2", optional = true }
8383
freezegun = { version = "<1.1.1,>=0.3.12", optional = true }
@@ -166,7 +166,6 @@ tests = [
166166
"coverage",
167167
"cwl-utils",
168168
"fakeredis",
169-
"flake8",
170169
"flaky",
171170
"freezegun",
172171
"isort",
@@ -184,12 +183,7 @@ tests = [
184183
"pytest-xdist",
185184
"responses",
186185
]
187-
docs = [
188-
"jinja2",
189-
"renku-sphinx-theme",
190-
"sphinx-rtd-theme",
191-
"sphinxcontrib-spelling",
192-
]
186+
docs = ["jinja2", "renku-sphinx-theme", "sphinx-rtd-theme", "sphinxcontrib-spelling"]
193187
all = [
194188
"apispec",
195189
"apispec-webframeworks",
@@ -200,7 +194,6 @@ all = [
200194
"cwl-utils",
201195
"docker-compose",
202196
"fakeredis",
203-
"flake8",
204197
"flaky",
205198
"flask",
206199
"freezegun",
@@ -243,7 +236,6 @@ nodocs = [
243236
"cwl-utils",
244237
"docker-compose",
245238
"fakeredis",
246-
"flake8",
247239
"flaky",
248240
"flask",
249241
"freezegun",
@@ -333,18 +325,7 @@ files = ["renku/version.py"]
333325
[tool.pytest.ini_options]
334326
addopts = "--flake8 --black --doctest-glob=\"*.rst\" --doctest-modules --cov=renku --cov-config .coveragerc --cov-report=term-missing"
335327
doctest_optionflags = "ALLOW_UNICODE"
336-
flake8-ignore = [
337-
"*.py",
338-
"E121",
339-
"E126",
340-
"E203",
341-
"E226",
342-
"E231",
343-
"W503",
344-
"W504",
345-
"docs/conf.py",
346-
"ALL",
347-
]
328+
flake8-ignore = ["*.py", "E121", "E126", "E203", "E226", "E231", "W503", "W504", "docs/conf.py", "ALL"]
348329
flake8-max-line-length = 120
349330
testpaths = ["docs", "tests", "renku", "conftest.py"]
350331
markers = [
@@ -357,16 +338,19 @@ markers = [
357338
]
358339

359340
[tool.coverage.run]
360-
omit = [
361-
"renku/conftest.py",
362-
"renku/data/*"
363-
]
341+
omit = ["renku/conftest.py", "renku/data/*"]
342+
343+
[tool.flakehell]
344+
max_line_length = 120
345+
show_source = true
346+
extended_default_ignore = []
347+
348+
[tool.flakehell.plugins]
349+
pycodestyle = ["+*", "-E121", "-E126", "-E203", "-E226", "-E231", "-W503", "-W504"]
350+
pyflakes = ["+*", "-E121", "-E126", "-E203", "-E226", "-E231", "-W503", "-W504"]
351+
pylint = ["+F*", "+E*", "-E121", "-E126", "-E203", "-E226", "-E231", "-W503", "-W504"]
364352

365353

366354
[build-system]
367-
requires = [
368-
"poetry>=1.1.11,<1.2.0",
369-
"poetry-dynamic-versioning",
370-
"gitpython==3.1.24",
371-
]
355+
requires = ["poetry>=1.1.11,<1.2.0", "poetry-dynamic-versioning", "gitpython==3.1.24"]
372356
build-backend = "poetry.masonry.api"

run-tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ check_styles(){
3939
pydocstyle renku tests conftest.py docs
4040
black --check --diff renku tests conftest.py
4141
isort -c --df .
42-
flake8 renku tests conftest.py build.py
42+
flakehell lint renku/ tests/ build.py conftest.py
4343
find . -path ./.eggs -prune -o -iname \*.sh -print0 | xargs -0 shellcheck
4444
}
4545

setup.cfg

-21
This file was deleted.

0 commit comments

Comments
 (0)