Remove flake8 and black references

List all ignored rules in ruff to make it easier to fix them later.
roboflow · Jul 8, 2024 · 5752f8c · 5752f8c
1 parent 889ee39
commit 5752f8c
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 42 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -9,11 +9,11 @@
             "extensions": [
                 "ms-python.python",
                 "ms-python.debugpy",
-                "ms-python.black-formatter"
+                "charliermarsh.ruff"
             ],
             "settings": {
                 "extensions.verifySignature": false
             }
         }
     }
-}
+}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install ".[dev]"
-      - name: 🧹 Lint with flake8
+      - name: 🧹 Lint
         run: |
           make check_code_quality
       - name: Check types with mypy

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -23,14 +23,6 @@ repos:
         args: ["--autofix", "--no-sort-keys", "--indent=4"]
       - id: trailing-whitespace
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.0
-    hooks:
-      - id: flake8
-        name: Flake8 Checks
-        entry: flake8
-        additional_dependencies: [Flake8-pyproject]
-
   - repo: https://github.com/PyCQA/bandit
     rev: 1.7.9
     hooks:

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -12,9 +12,8 @@
     ],
     "editor.formatOnSave": true,
     "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter"
+        "editor.defaultFormatter": "charliermarsh.ruff"
     },
-    "python.formatting.provider": "none",
     "python.testing.pytestEnabled": false,
     "editor.inlineSuggest.showToolbar": "onHover"
-}
+}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -28,7 +28,7 @@ pip install -e ".[dev]"
 
 ### Devcontainer
 
-This project comes with a [convenient devcontainer](https://www.loom.com/share/a183c4a351ed4700a79476fedf08ab9b) that makes it easier to run tests and has black configured to run on save.
+This project comes with a [convenient devcontainer](https://www.loom.com/share/a183c4a351ed4700a79476fedf08ab9b) that makes it easier to run tests and has lint configured to run on save.
 
 On rare occasions a full rebuild is needed, you can do it in VSCode by pressing `Ctrl+Shift+P` and running `Dev Containers: Rebuild Container`.
 
@@ -57,10 +57,10 @@ def example_function(param1: int, param2: str) -> bool:
 We provide a `Makefile` to format and ensure code quality. **Be sure to run them before creating a PR**.
 
 ```bash
-# format code with `black` and `isort`
+# format code with `ruff`
 make style
 
-# check code with flake8
+# check code with `ruff`
 make check_code_quality
 ```
 

diff --git a/Makefile b/Makefile
@@ -10,10 +10,6 @@ style:
 check_code_quality:
 	ruff format $(check_dirs) --check
 	ruff check $(check_dirs)
-	# stop the build if there are Python syntax errors or undefined names
-	flake8 $(check_dirs) --count --select=E9,F63,F7,F82 --show-source --statistics
-	# exit-zero treats all errors as warnings. E203 for black, E501 for docstring, W503 for line breaks before logical operators
-	flake8 $(check_dirs) --count --max-line-length=120 --exit-zero  --ignore=D --extend-ignore=E203,E501,W503  --statistics
 
 publish:
 	python setup.py sdist bdist_wheel

diff --git a/pyproject.toml b/pyproject.toml
@@ -2,38 +2,49 @@
 requires = ["setuptools>=57", "wheel"]
 build-backend = "setuptools.build_meta"
 
-[tool.flake8]
-exclude = ".venv"
-max-complexity = 10
-max-line-length = 120
-extend-ignore = """
-    W503,
-    E203,
-    E701,
-    C901,
-"""
-per-file-ignores = """
-    __init__.py: F401
-"""
-
 [tool.bandit]
 target = ["test", "roboflow"]
 tests = ["B201", "B301"]
 
 [tool.ruff]
 target-version = "py38"
-# Same as Black.
 line-length = 120
 
 [tool.ruff.lint]
 select = [
-    "E",  # pycodestyle errors
-    "F",  # pyflakes
-    "I",  # isort
-    "UP", # pyupgrade
+    "ALL",
 ]
 ignore = [
-    "E501", # line too long, handled by black
+    "A",
+    "ANN",
+    "ARG",
+    "B",
+    "BLE",
+    "C",
+    "COM",
+    "D",
+    "DTZ",
+    "EM",
+    "ERA",
+    "FBT",
+    "FIX",
+    "FLY",
+    "ISC",
+    "N",
+    "PERF",
+    "PIE",
+    "PLR",
+    "PLW",
+    "PT",
+    "PTH",
+    "RET",
+    "RUF",
+    "S",
+    "SIM",
+    "SLF",
+    "T",
+    "TD",
+    "TRY",
 ]
 
 # Exclude a variety of commonly ignored directories.

diff --git a/setup.py b/setup.py
@@ -31,7 +31,6 @@
     extras_require={
         "desktop": ["opencv-python==4.8.0.74"],
         "dev": [
-            "flake8",
             "mypy",
             "responses",
             "ruff",