diff --git a/.flake8 b/.flake8 new file mode 100644 index 00000000..2b7958b8 --- /dev/null +++ b/.flake8 @@ -0,0 +1,4 @@ +[flake8] +import-order-style = pep8 +application-import-names = yamllint +ignore = W503,W504 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 506d610d..780831e9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,9 +21,9 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 - run: - pip install ruff sphinx rstcheck[sphinx] doc8 + pip install flake8 flake8-import-order sphinx rstcheck[sphinx] doc8 - run: pip install . - - run: ruff . + - run: flake8 . - run: doc8 $(git ls-files '*.rst') - run: rstcheck --ignore-directives automodule $(git ls-files '*.rst') - run: yamllint --strict $(git ls-files '*.yaml' '*.yml') diff --git a/.ruff.toml b/.ruff.toml deleted file mode 100644 index c7e7ce97..00000000 --- a/.ruff.toml +++ /dev/null @@ -1,6 +0,0 @@ -[lint] -extend-select = ["B", "I", "PGH", "TRY", "UP"] -ignore = ["TRY003"] - -[lint.isort] -known-third-party = ["tests"] diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index a1fde07b..312c6d88 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -23,7 +23,7 @@ Pull Request Process .. code:: bash - ruff . + flake8 . If you added/modified documentation: diff --git a/pyproject.toml b/pyproject.toml index 5fd24df5..63746f63 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,8 +26,9 @@ dynamic = ["version"] [project.optional-dependencies] dev = [ "doc8", + "flake8", + "flake8-import-order", "rstcheck[sphinx]", - "ruff", "sphinx", ]