Merge branch 'master' into pyproject

Author: dulmandakh

.github/workflows/lint.yaml

@@ -9,12 +9,13 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: "3.10"
     - name: Install Ruff
       run: |
-        python -m pip install ruff>=0.5
-    - name: Format check (Ruff)
+        python -m pip install ruff>=0.6
+    - name: Lint using Ruff
       run: |
         ruff format --check
+        ruff check

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.12'
 

.github/workflows/test.yml

@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

.pre-commit-config.yaml

@@ -1,7 +1,9 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.7
+    rev: v0.6.0
     hooks:
+      - id: ruff
+        args: [ --fix ]
       - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
@@ -14,16 +16,6 @@ repos:
       - id: check-yaml
       - id: mixed-line-ending
         args: ['--fix=lf']
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        exclude: ^(oauth2_provider/migrations/|tests/migrations/)
-  - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
-    hooks:
-      - id: flake8
-        exclude: ^(oauth2_provider/migrations/|tests/migrations/)
   - repo: https://github.com/sphinx-contrib/sphinx-lint
     rev: v0.9.1
     hooks:

docs/contributing.rst

@@ -27,29 +27,26 @@ add a comment stating you're working on it.
 Code Style
 ==========
 
-The project uses `flake8 <https://flake8.pycqa.org/en/latest/>`_ for linting,
-`black <https://black.readthedocs.io/en/stable/>`_ for formatting the code,
-`isort <https://pycqa.github.io/isort/>`_ for formatting and sorting imports,
-and `pre-commit <https://pre-commit.com/>`_ for checking/fixing commits for
-correctness before they are made.
+The project uses `ruff <https://docs.astral.sh/ruff/>`_ for linting, formatting the code and sorting imports,
+and `pre-commit <https://pre-commit.com/>`_ for checking/fixing commits for correctness before they are made.
 
 You will need to install ``pre-commit`` yourself, and then ``pre-commit`` will
-take care of installing ``flake8``, ``black`` and ``isort``.
+take care of installing ``ruff``.
 
 After cloning your repository, go into it and run::
 
     pre-commit install
 
 to install the hooks. On the next commit that you make, ``pre-commit`` will
 download and install the necessary hooks (a one off task). If anything in the
-commit would fail the hooks, the commit will be abandoned. For ``black`` and
-``isort``, any necessary changes will be made automatically, but not staged.
+commit would fail the hooks, the commit will be abandoned. For ``ruff``, any
+necessary changes will be made automatically, but not staged.
 Review the changes, and then re-stage and commit again.
 
 Using ``pre-commit`` ensures that code that would fail in QA does not make it
 into a commit in the first place, and will save you time in the long run. You
 can also (largely) stop worrying about code style, although you should always
-check how the code looks after ``black`` has formatted it, and think if there
+check how the code looks after ``ruff`` has formatted it, and think if there
 is a better way to structure the code so that it is more readable.
 
 Documentation
@@ -265,7 +262,7 @@ add a comment. If you think a function is not trivial, add a docstrings.
 
 To see if your code formatting will pass muster use::
 
-  tox -e flake8
+  tox -e lint
 
 The contents of this page are heavily based on the docs from `django-admin2 <https://github.com/twoscoops/django-admin2>`_
 

pyproject.toml

@@ -56,4 +56,11 @@ ignore-words-list = 'assertIn'
 
 [tool.ruff]
 line-length = 110
-exclude = [".tox", "oauth2_provider/migrations/", "tests/migrations/", "manage.py"]
+exclude = [".tox", "build/", "dist/", "docs/", "oauth2_provider/migrations/", "tests/migrations/", "manage.py"]
+
+[tool.ruff.lint]
+select = ["E", "F", "I", "Q", "W"]
+
+[tool.ruff.lint.isort]
+lines-after-imports = 2
+known-first-party = ["oauth2_provider"]

tox.ini

@@ -1,9 +1,9 @@
 [tox]
 envlist =
-    flake8,
     migrations,
     migrate_swapped,
     docs,
+    lint,
     sphinxlint,
     py{38,39,310,311,312}-dj42,
     py{310,311,312}-dj50,
@@ -12,7 +12,7 @@ envlist =
 
 [gh-actions]
 python =
-    3.8: py38, docs, flake8, migrations, migrate_swapped, sphinxlint
+    3.8: py38, docs, lint, migrations, migrate_swapped, sphinxlint
     3.9: py39
     3.10: py310
     3.11: py311
@@ -92,14 +92,13 @@ deps =
     jwcrypto
     django
 
-[testenv:flake8]
+[testenv:lint]
 basepython = python3.8
+deps = ruff>=0.6
 skip_install = True
-commands = flake8 {toxinidir}
-deps =
-    flake8
-    flake8-isort
-    flake8-quotes
+commands =
+    ruff format --check
+    ruff check
 
 [testenv:migrations]
 setenv =
@@ -132,22 +131,3 @@ omit = */migrations/*
 
 [coverage:report]
 show_missing = True
-
-[flake8]
-max-line-length = 110
-exclude = docs/, oauth2_provider/migrations/, tests/migrations/, .tox/, build/, dist/
-application-import-names = oauth2_provider
-inline-quotes = double
-extend-ignore = E203, W503
-
-[isort]
-default_section = THIRDPARTY
-known_first_party = oauth2_provider
-line_length = 110
-lines_after_imports = 2
-multi_line_output = 3
-include_trailing_comma = True
-force_grid_wrap = 0
-use_parentheses = True
-ensure_newline_before_comments = True
-skip = oauth2_provider/migrations/, .tox/, tests/migrations/