Use ruff for linting

.pre-commit-config.yaml

@@ -7,35 +7,20 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
     -   id: mixed-line-ending
--   repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
-    hooks:
-    -   id: flake8
+    -   id: file-contents-sorter
+        files: docs/spelling_wordlist.txt
 -   repo: https://github.com/pycqa/doc8
     rev: v1.1.1
     hooks:
     -   id: doc8
--   repo: https://github.com/asottile/pyupgrade
-    rev: v3.4.0
-    hooks:
-    -   id: pyupgrade
-        args: [--py38-plus]
 -   repo: https://github.com/adamchainz/django-upgrade
     rev: 1.13.0
     hooks:
     -   id: django-upgrade
         args: [--target-version, "3.2"]
--   repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-    -   id: isort
 -   repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:
-    -   id: python-check-blanket-noqa
-    -   id: python-check-mock-methods
-    -   id: python-no-eval
-    -   id: python-no-log-warn
     -   id: rst-backticks
     -   id: rst-directive-colons
 -   repo: https://github.com/pre-commit/mirrors-prettier
@@ -53,6 +38,11 @@ repos:
         types: [file]
         args:
         - --fix
+-   repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: 'v0.0.267'
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
 -   repo: https://github.com/psf/black
     rev: 23.3.0
     hooks:

debug_toolbar/panels/sql/utils.py

@@ -132,7 +132,7 @@ def contrasting_color_generator():
     """
 
     def rgb_to_hex(rgb):
-        return "#%02x%02x%02x" % tuple(rgb)
+        return "#{:02x}{:02x}{:02x}".format(*tuple(rgb))
 
     triples = [
         (1, 0, 0),

docs/changes.rst

@@ -5,6 +5,8 @@ Pending
 -------
 
 * Adjusted app directories system check to allow for nested template loaders.
+* Switched from flake8, isort and pyupgrade to `ruff
+  <https://beta.ruff.rs/>`__.
 
 4.1.0 (2023-05-15)
 ------------------

docs/contributing.rst

@@ -101,7 +101,7 @@ Style
 -----
 
 The Django Debug Toolbar uses `black <https://github.com/psf/black>`__ to
-format code and additionally uses flake8 and isort. The toolbar uses
+format code and additionally uses ruff. The toolbar uses
 `pre-commit <https://pre-commit.com>`__ to automatically apply our style
 guidelines when a commit is made. Set up pre-commit before committing with::
 

docs/spelling_wordlist.txt

@@ -1,3 +1,12 @@
+Hatchling
+Hotwire
+Jazzband
+Makefile
+Pympler
+Roboto
+Transifex
+Werkzeug
+async
 backend
 backends
 backported
@@ -9,17 +18,13 @@ fallbacks
 flamegraph
 flatpages
 frontend
-Hatchling
-Hotwire
 htmx
 inlining
 isort
-Jazzband
-jinja
 jQuery
+jinja
 jrestclient
 js
-Makefile
 margins
 memcache
 memcached
@@ -36,22 +41,18 @@ psycopg
 py
 pyflame
 pylibmc
-Pympler
+pyupgrade
 querysets
 refactoring
 resizing
-Roboto
 spellchecking
 spooler
 stacktrace
 stacktraces
 startup
-timeline
 theming
+timeline
 tox
-Transifex
-unhashable
 uWSGI
+unhashable
 validator
-Werkzeug
-async

pyproject.toml

@@ -49,10 +49,6 @@ packages = ["debug_toolbar"]
 [tool.hatch.version]
 path = "debug_toolbar/__init__.py"
 
-[tool.isort]
-combine_as_imports = true
-profile = "black"
-
 [tool.coverage.html]
 skip_covered = true
 skip_empty = true
@@ -69,3 +65,25 @@ source = ["src", ".tox/*/site-packages"]
 # Update coverage badge link in README.rst when fail_under changes
 fail_under = 94
 show_missing = true
+
+[tool.ruff.isort]
+combine-as-imports = true
+
+[tool.ruff]
+select = [
+    # flake8/Pyflakes
+    "F",
+    # flake8/pycodestyle
+    "E",
+    "W",
+    # isort
+    "I",
+    # pyupgrade
+    "UP",
+    # pygrep-hooks
+    "PGH",
+]
+ignore = [
+    "E501",
+]
+target-version = "py38"

requirements_dev.txt

@@ -7,9 +7,7 @@ Jinja2
 # Testing
 
 coverage[toml]
-flake8
 html5lib
-isort
 selenium
 tox
 black