Revert replacement of flake8 with ruff

Start with reverting parts of commit 26be794 in adrienverge#629 related to config and CI jobs.
DimitriPapadopoulos · Feb 1, 2024 · a8d84b9 · a8d84b9
1 parent 3cb3a20
commit a8d84b9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.flake8 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
@@ -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
diff --git 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
@@ -26,8 +26,9 @@ dynamic = ["version"]
 [project.optional-dependencies]
 dev = [
     "doc8",
+    "flake8",
+    "flake8-import-order",
     "rstcheck[sphinx]",
-    "ruff",
     "sphinx",
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ Pull Request Process @@
        .. code:: bash
-        ruff .
+        flake8 .
        If you added/modified documentation:
@@ Expand Down @@