diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 53d11ad8349..99e41e9c93d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -32,7 +32,8 @@ repos: rev: v2.7 hooks: - id: vulture - exclude: "/tests/" + exclude: | + /tests/ - repo: https://github.com/psf/black rev: "23.1.0" @@ -48,12 +49,12 @@ repos: (?x)( ^boefjes/ | ^keiko/templates | - ^mula/whitelist.py$ | + ^mula/whitelist\.py$ | ^octopoes/ | ^rocky/ | /tests/ | - docs/source/conf.py$ | - setup.py$ + docs/source/conf\.py$ | + setup\.py$ ) - repo: https://github.com/charliermarsh/ruff-pre-commit diff --git a/boefjes/.flake8 b/boefjes/.flake8 deleted file mode 100644 index 58ca7c06859..00000000000 --- a/boefjes/.flake8 +++ /dev/null @@ -1,5 +0,0 @@ -[flake8] -max-line-length = 120 -ignore = E203, W503 -exclude = .git, __pycache__, venv -eradicate-whitelist-extend = Example: diff --git a/boefjes/.pre-commit-config.yaml b/boefjes/.pre-commit-config.yaml deleted file mode 100644 index 08ba644140c..00000000000 --- a/boefjes/.pre-commit-config.yaml +++ /dev/null @@ -1,34 +0,0 @@ -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 - hooks: - - id: trailing-whitespace - - id: check-yaml - - id: check-json - - id: debug-statements - - - repo: https://github.com/psf/black - rev: "22.10.0" - hooks: - - id: black - - - repo: https://github.com/PyCQA/flake8 - rev: "5.0.4" - hooks: - - id: flake8 - additional_dependencies: ["flake8-tidy-imports", "flake8-eradicate"] - - - repo: https://github.com/jendrikseipp/vulture - rev: v2.6 - hooks: - - id: vulture - - - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.10.1 - hooks: - - id: validate-pyproject - - - repo: https://github.com/ikamensh/flynt/ - rev: "0.76" - hooks: - - id: flynt diff --git a/bytes/.flake8 b/bytes/.flake8 deleted file mode 100644 index 5c0566ed489..00000000000 --- a/bytes/.flake8 +++ /dev/null @@ -1,10 +0,0 @@ -[flake8] -max-line-length = 120 - -# This is our goal -# ignore = E203, W503 - -# This is a conservative baseline setting, ignores bare excepts and unused imports -# E203 and W503 are recommended for compatibility with Black (https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#flake8) -ignore = E203, W503 -exclude = .git, __pycache__, old, build, dist, venv diff --git a/bytes/.pre-commit-config.yaml b/bytes/.pre-commit-config.yaml deleted file mode 100644 index eded4c1af1f..00000000000 --- a/bytes/.pre-commit-config.yaml +++ /dev/null @@ -1,45 +0,0 @@ -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 - hooks: - - id: trailing-whitespace - - id: mixed-line-ending - - id: detect-private-key - - id: check-case-conflict - - id: check-yaml - - id: check-json - - id: check-toml - - - repo: https://github.com/psf/black - rev: "22.10.0" - hooks: - - id: black - - - repo: https://github.com/myint/eradicate - rev: v2.1.0 - hooks: - - id: eradicate - args: [ "--error" ] # Do not automatically remove commented-out code - - - repo: https://github.com/jendrikseipp/vulture - rev: v2.6 - hooks: - - id: vulture - - - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.991 - hooks: - - id: mypy - additional_dependencies: ['types-PyYAML', 'types-requests', 'pydantic', 'pynacl'] - exclude: "^tests/" - - - repo: https://github.com/PyCQA/pylint - rev: v2.15.6 - hooks: - - id: pylint - exclude: "^(bytes/database|tests)/" - - - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 - hooks: - - id: flake8 diff --git a/keiko/.flake8 b/keiko/.flake8 deleted file mode 100644 index d358f5b8eac..00000000000 --- a/keiko/.flake8 +++ /dev/null @@ -1,4 +0,0 @@ -[flake8] -max-line-length = 120 -ignore = E203, W503 -exclude = .git, __pycache__, venv diff --git a/keiko/.pre-commit-config.yaml b/keiko/.pre-commit-config.yaml deleted file mode 100644 index a3d55cc8185..00000000000 --- a/keiko/.pre-commit-config.yaml +++ /dev/null @@ -1,57 +0,0 @@ -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 - hooks: - - id: trailing-whitespace - - id: mixed-line-ending - - id: detect-private-key - - id: check-case-conflict - - id: check-yaml - - id: check-json - - id: check-toml - - - repo: https://github.com/psf/black - rev: "22.10.0" - hooks: - - id: black - - - repo: https://github.com/MarketSquare/robotframework-tidy - rev: "3.3.2" - hooks: - - id: robotidy - - - repo: https://github.com/myint/eradicate - rev: v2.1.0 - hooks: - - id: eradicate - args: ["--error"] # Do not automatically remove commented-out code - - - repo: https://github.com/jendrikseipp/vulture - rev: v2.6 - hooks: - - id: vulture - - - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.991 - hooks: - - id: mypy - additional_dependencies: ['types-PyYAML', 'types-requests', 'pydantic', 'fastapi', 'click'] - exclude: "tests|templates" - - - repo: https://github.com/PyCQA/pylint - rev: v2.15.2 - hooks: - - id: pylint - exclude: "tests|templates" - additional_dependencies: ['types-PyYAML', 'types-requests', 'pydantic', 'fastapi', 'click', 'jinja2'] - - - repo: https://github.com/PyCQA/pydocstyle - rev: 6.1.1 - hooks: - - id: pydocstyle - exclude: "tests|templates|packaging" - - - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 - hooks: - - id: flake8 diff --git a/keiko/pyproject.toml b/keiko/pyproject.toml index e4408c0e14d..20098a0cee3 100644 --- a/keiko/pyproject.toml +++ b/keiko/pyproject.toml @@ -37,7 +37,6 @@ vulture = "^2.5" [tool.poetry.dev-dependencies] black = "^22.6.0" -flake8 = "^5.0.4" mypy = "^0.971" pylint = "^2.14.5" robotframework-tidy = "^3.2" diff --git a/keiko/requirements-check.txt b/keiko/requirements-check.txt index e45d7d70446..d60b295505d 100644 --- a/keiko/requirements-check.txt +++ b/keiko/requirements-check.txt @@ -6,7 +6,6 @@ click==8.1.3 ; python_version >= "3.8" and python_version < "4.0" colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" commonmark==0.9.1 ; python_version >= "3.8" and python_version < "4.0" dill==0.3.6 ; python_version >= "3.8" and python_version < "4.0" -flake8==5.0.4 ; python_version >= "3.8" and python_version < "4.0" idna==3.4 ; python_version >= "3.8" and python_version < "4" isort==5.10.1 ; python_version >= "3.8" and python_version < "4.0" lazy-object-proxy==1.8.0 ; python_version >= "3.8" and python_version < "4.0" diff --git a/keiko/requirements-dev.txt b/keiko/requirements-dev.txt index 9d50f488ab4..9b86a9b03ce 100644 --- a/keiko/requirements-dev.txt +++ b/keiko/requirements-dev.txt @@ -8,7 +8,6 @@ colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" commonmark==0.9.1 ; python_version >= "3.8" and python_version < "4.0" dill==0.3.6 ; python_version >= "3.8" and python_version < "4.0" fastapi==0.85.2 ; python_version >= "3.8" and python_version < "4.0" -flake8==5.0.4 ; python_version >= "3.8" and python_version < "4.0" h11==0.14.0 ; python_version >= "3.8" and python_version < "4.0" idna==3.4 ; python_version >= "3.8" and python_version < "4" isort==5.10.1 ; python_version >= "3.8" and python_version < "4.0" diff --git a/mula/.flake8 b/mula/.flake8 deleted file mode 100644 index 31797adfb29..00000000000 --- a/mula/.flake8 +++ /dev/null @@ -1,10 +0,0 @@ -[flake8] -max-line-length = 120 - -# This is a conservative baseline setting, ignores bare excepts and unused imports -# E203 and W503 are recommended for compatibility with Black (https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#flake8) -ignore = E203, W503 -exclude = .git, __pycache__, old, build, dist, venv -per-file-ignores = - __init__.py:F401,F403 - whitelist.py:F821 diff --git a/mula/.pre-commit-config.yaml b/mula/.pre-commit-config.yaml deleted file mode 100644 index 8c26d66454e..00000000000 --- a/mula/.pre-commit-config.yaml +++ /dev/null @@ -1,44 +0,0 @@ -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 - hooks: - - id: trailing-whitespace - - id: mixed-line-ending - - id: detect-private-key - - id: check-case-conflict - - id: check-yaml - - id: check-json - - id: check-toml - - id: debug-statements - - - repo: https://github.com/psf/black - rev: "22.10.0" - hooks: - - id: black - - - repo: https://github.com/PyCQA/flake8 - rev: "5.0.4" - hooks: - - id: flake8 - - - repo: https://github.com/jendrikseipp/vulture - rev: v2.6 - hooks: - - id: vulture - - - repo: https://github.com/myint/eradicate - rev: v2.1.0 - hooks: - - id: eradicate - args: [ "--error" ] # Do not automatically remove commented-out code - - - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.991 - hooks: - - id: mypy - exclude: "^(tests|whitelist.py)" - - - repo: https://github.com/PyCQA/pylint - rev: v2.15.6 - hooks: - - id: pylint diff --git a/octopoes/.flake8 b/octopoes/.flake8 deleted file mode 100644 index 21598202049..00000000000 --- a/octopoes/.flake8 +++ /dev/null @@ -1,6 +0,0 @@ -[flake8] -max-line-length = 120 -ignore = E203, W503 -exclude = .git, __pycache__, venv -per-file-ignores = - __init__.py:F401,F403 diff --git a/octopoes/.pre-commit-config.yaml b/octopoes/.pre-commit-config.yaml deleted file mode 100644 index ffb99a7cc5a..00000000000 --- a/octopoes/.pre-commit-config.yaml +++ /dev/null @@ -1,54 +0,0 @@ -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 - hooks: - - id: trailing-whitespace - - id: mixed-line-ending - - id: detect-private-key - - id: check-case-conflict - - id: check-yaml - - id: check-json - - id: check-toml - - - repo: https://github.com/psf/black - rev: "22.10.0" - hooks: - - id: black - - repo: https://github.com/MarketSquare/robotframework-tidy - rev: "3.3.2" - hooks: - - id: robotidy - - repo: https://github.com/myint/eradicate - rev: v2.1.0 - hooks: - - id: eradicate - args: [ "--error" ] # Do not automatically remove commented-out code - - repo: https://github.com/jendrikseipp/vulture - rev: v2.6 - hooks: - - id: vulture -# - repo: https://github.com/pre-commit/mirrors-mypy -# rev: v0.991 -# hooks: # pydantic and fastapi ship with mypy stubs -# - id: mypy -# additional_dependencies: ['types-PyYAML', 'types-requests', 'pydantic'] -# exclude: "bits|tests" -# - repo: https://github.com/PyCQA/pylint -# rev: v2.15.2 -# hooks: -# - id: pylint -# exclude: "bits|tests" -# - repo: https://github.com/PyCQA/pydocstyle -# rev: 6.1.1 -# hooks: -# - id: pydocstyle - - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 - hooks: - - id: flake8 - - repo: https://github.com/rstcheck/rstcheck - rev: v6.1.1 - hooks: - - id: rstcheck - additional_dependencies: ["rstcheck[sphinx]"] - exclude: "docs/source/_generated" # exclude apidoc generated files diff --git a/octopoes/pyproject.toml b/octopoes/pyproject.toml index 353de72dc64..53b81d8b452 100644 --- a/octopoes/pyproject.toml +++ b/octopoes/pyproject.toml @@ -59,7 +59,6 @@ vulture = "^2.6" mypy = "^0.982" pylint = "^2.15.4" black = "^22.10.0" -flake8 = "^5.0.4" robotframework = "^6.0" robotframework-requests = "^0.9.3" robotframework-tidy = "^3.3.1" diff --git a/octopoes/requirements-dev.txt b/octopoes/requirements-dev.txt index b9fee133f8e..97ad738ea73 100644 --- a/octopoes/requirements-dev.txt +++ b/octopoes/requirements-dev.txt @@ -22,7 +22,6 @@ exceptiongroup==1.1.0 ; python_version >= "3.8" and python_version < "3.11" fastapi-utils==0.2.1 ; python_version >= "3.8" and python_version < "4.0" fastapi==0.88.0 ; python_version >= "3.8" and python_version < "4.0" filelock==3.9.0 ; python_version >= "3.8" and python_version < "4.0" -flake8==5.0.4 ; python_version >= "3.8" and python_version < "4.0" greenlet==2.0.1 ; python_version >= "3.8" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "4.0" h11==0.14.0 ; python_version >= "3.8" and python_version < "4.0" httpcore==0.16.3 ; python_version >= "3.8" and python_version < "4.0" diff --git a/pyproject.toml b/pyproject.toml index 6833ecd54b9..da90d11fd24 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ disallow_untyped_decorators = false # Needed for FastAPI decorators [tool.vulture] min_confidence = 90 -exclude = ["/tests/", "/venv/"] +exclude = ["/tests/", "*venv*"] paths = ["."] diff --git a/rocky/.flake8 b/rocky/.flake8 deleted file mode 100644 index 8d72ff35c80..00000000000 --- a/rocky/.flake8 +++ /dev/null @@ -1,16 +0,0 @@ -[flake8] -max-line-length = 120 - -# This is our goal -# ignore = E203, W503 - -# This is a conservative baseline setting, ignores bare excepts and unused imports -# E203 and W503 are recommended for compatibility with Black (https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#flake8) -ignore = E203, W503 -exclude = .git, __pycache__, old, build, dist, venv -per-file-ignores = - __init__.py:F401,F403 - whitelist.py:F821 - -banned-modules = - rocky.settings = Use django.conf.settings diff --git a/rocky/.pre-commit-config.yaml b/rocky/.pre-commit-config.yaml deleted file mode 100644 index 03f4daede41..00000000000 --- a/rocky/.pre-commit-config.yaml +++ /dev/null @@ -1,55 +0,0 @@ -exclude: "/migrations/" - -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 - hooks: - - id: trailing-whitespace - - id: mixed-line-ending - - id: detect-private-key - - id: check-case-conflict - - id: check-yaml - - id: check-json - - id: check-toml - - - repo: https://github.com/psf/black - rev: "22.10.0" - hooks: - - id: black - - - repo: https://github.com/MarketSquare/robotframework-tidy - rev: "3.3.2" - hooks: - - id: robotidy - - - repo: https://github.com/myint/eradicate - rev: v2.1.0 - hooks: - - id: eradicate - args: [ "--error" ] # Do not automatically remove commented-out code - - - repo: https://github.com/jendrikseipp/vulture - rev: v2.6 - hooks: - - id: vulture - - - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 - hooks: - - id: flake8 - additional_dependencies: [flake8-tidy-imports] - -# - repo: https://github.com/pre-commit/mirrors-mypy -# rev: v0.982 -# hooks: -# - id: mypy - -# - repo: https://github.com/PyCQA/pylint -# rev: v2.15.2 -# hooks: -# - id: pylint - -# - repo: https://github.com/PyCQA/pydocstyle -# rev: 6.1.1 -# hooks: -# - id: pydocstyle diff --git a/rocky/requirements-check.txt b/rocky/requirements-check.txt index e07cf287930..78192f88524 100644 --- a/rocky/requirements-check.txt +++ b/rocky/requirements-check.txt @@ -1,6 +1,4 @@ # Python linters -flake8==5.0.4 -flake8-tidy-imports==4.8.0 mypy==0.991 pylint==2.15.5 vulture==2.6