.github/dependabot.yml

@@ -7,4 +7,4 @@ updates:
       patterns:
       - "*"
   schedule:
-    interval: weekly
+    interval: monthly

.github/workflows/main.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
     - main
+    tags:
+    - '**'
   pull_request:
 
 concurrency:
@@ -13,16 +15,16 @@ concurrency:
 jobs:
   tests:
     name: Python ${{ matrix.python-version }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:
         python-version:
-        - 3.8
         - 3.9
         - '3.10'
         - '3.11'
         - '3.12'
+        - '3.13'
 
     steps:
     - uses: actions/checkout@v4
@@ -31,13 +33,15 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
         allow-prereleases: true
-        cache: pip
-        cache-dependency-path: 'requirements/*.txt'
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v3
+      with:
+        enable-cache: true
+        cache-dependency-glob: tests/requirements/*.txt
 
     - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip setuptools wheel
-        python -m pip install --upgrade 'tox>=4.0.0rc3'
+      run: uv pip install --system tox tox-uv
 
     - name: Run tox targets for ${{ matrix.python-version }}
       run: tox run -f py$(echo ${{ matrix.python-version }} | tr -d .)
@@ -47,10 +51,12 @@ jobs:
       with:
         name: coverage-data-${{ matrix.python-version }}
         path: '${{ github.workspace }}/.coverage.*'
+        include-hidden-files: true
+        if-no-files-found: error
 
   coverage:
     name: Coverage
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: tests
     steps:
       - uses: actions/checkout@v4
@@ -59,8 +65,11 @@ jobs:
         with:
           python-version: '3.12'
 
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
+
       - name: Install dependencies
-        run: python -m pip install --upgrade coverage[toml]
+        run: uv pip install --system coverage[toml]
 
       - name: Download data
         uses: actions/download-artifact@v4
@@ -83,3 +92,23 @@ jobs:
         with:
           name: html-report
           path: htmlcov
+
+  release:
+    needs: [coverage]
+    if: success() && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-24.04
+    environment: release
+
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: astral-sh/setup-uv@v3
+
+      - name: Build
+        run: uv build
+
+      - uses: pypa/gh-action-pypi-publish@release/v1

.pre-commit-config.yaml

@@ -1,9 +1,12 @@
+ci:
+  autoupdate_schedule: monthly
+
 default_language_version:
   python: python3.12
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
   - id: check-added-large-files
   - id: check-case-conflict
@@ -14,11 +17,11 @@ repos:
   - id: end-of-file-fixer
   - id: trailing-whitespace
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: 2.1.4
+  rev: 2.2.4
   hooks:
   - id: pyproject-fmt
 - repo: https://github.com/tox-dev/tox-ini-fmt
-  rev: 1.3.1
+  rev: 1.4.1
   hooks:
   - id: tox-ini-fmt
 - repo: https://github.com/rstcheck/rstcheck
@@ -28,12 +31,12 @@ repos:
     additional_dependencies:
     - tomli==2.0.1
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.16.0
+  rev: v3.17.0
   hooks:
   - id: pyupgrade
-    args: [--py38-plus]
+    args: [--py39-plus]
 - repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 24.4.2
+  rev: 24.8.0
   hooks:
   - id: black
 - repo: https://github.com/adamchainz/blacken-docs
@@ -48,7 +51,7 @@ repos:
     - id: isort
       name: isort (python)
 - repo: https://github.com/PyCQA/flake8
-  rev: 7.1.0
+  rev: 7.1.1
   hooks:
   - id: flake8
     additional_dependencies:
@@ -57,7 +60,7 @@ repos:
     - flake8-logging
     - flake8-tidy-imports
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.10.1
+  rev: v1.11.2
   hooks:
   - id: mypy
     additional_dependencies:

CHANGELOG.rst

@@ -2,6 +2,35 @@
 Changelog
 =========
 
+1.22.1 (2024-10-11)
+-------------------
+
+* Fix circular import error when running django-upgrade.
+
+  Thanks to Michal Čihař for the report in `Issue #503 <https://github.com/adamchainz/django-upgrade/issues/503>`__.
+
+1.22.0 (2024-10-10)
+-------------------
+
+* Avoid accidental removal of comments a removed ``if`` block in the versioned block fixer.
+
+  Thanks to Tobias Funke for the report in `Issue #495 <https://github.com/adamchainz/django-upgrade/issues/495>`__.
+
+* Add all-version fixer to remove outdated test skip decorators.
+
+  `Issue #364 <https://github.com/adamchainz/django-upgrade/issues/364>`__.
+
+* Drop Python 3.8 support.
+
+* Support Python 3.13.
+
+1.21.0 (2024-09-05)
+-------------------
+
+* Add Django 5.0+ fixer to rewrite ``format_html()`` calls without ``args`` or ``kwargs`` probably using ``str.format()`` incorrectly.
+
+  `Issue #477 <https://github.com/adamchainz/django-upgrade/issues/477>`__.
+
 1.20.0 (2024-07-19)
 -------------------
 

README.rst

@@ -36,7 +36,7 @@ Use **pip**:
 
     python -m pip install django-upgrade
 
-Python 3.8 to 3.12 supported.
+Python 3.9 to 3.13 supported.
 
 (Python 3.12+ is required to correctly apply fixes within f-strings.)
 
@@ -218,6 +218,66 @@ A single ``else`` block may be present, but ``elif`` is not supported.
 
 See also `pyupgrade’s similar feature <https://github.com/asottile/pyupgrade/#python2-and-old-python3x-blocks>`__ that removes outdated code from checks on the Python version.
 
+Versioned test skip decorators
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**Name:** ``versioned_test_skip_decorators``
+
+Removes outdated test skip decorators that compare to ``django.VERSION``.
+Like the above, it requires comparisons of the form:
+
+.. code-block:: text
+
+    django.VERSION <comparator> (<X>, <Y>)
+
+Supports these test skip decorators:
+
+* |unittest.skipIf|__
+
+  .. |unittest.skipIf| replace:: ``@unittest.skipIf``
+  __ https://docs.python.org/3/library/unittest.html#unittest.skipIf
+
+* |unittest.skipUnless|__
+
+  .. |unittest.skipUnless| replace:: ``@unittest.skipUnless``
+  __ https://docs.python.org/3/library/unittest.html#unittest.skipUnless
+
+* |pytest.mark.skipif|__
+
+  .. |pytest.mark.skipif| replace:: ``@pytest.mark.skipif``
+  __ https://docs.pytest.org/en/stable/how-to/skipping.html#id1
+
+For example:
+
+.. code-block:: diff
+
+     import unittest
+
+     import django
+     import pytest
+     from django.test import TestCase
+
+     class ExampleTests(TestCase):
+    -    @unittest.skipIf(django.VERSION < (5, 1), "Django 5.1+")
+         def test_one(self):
+             ...
+
+    -    @unittest.skipUnless(django.VERSION >= (5, 1), "Django 5.1+")
+         def test_two(self):
+             ...
+
+    -    @pytest.mark.skipif(django.VERSION < (5, 1), reason="Django 5.1+")
+         def test_three(self):
+             ...
+
+    -@unittest.skipIf(django.VERSION < (5, 1), "Django 5.1+")
+     class Example2Tests(TestCase):
+         ...
+
+    -@pytest.mark.skipif(django.VERSION < (5, 1), reason="Django 5.1+")
+     class Example3Tests(TestCase):
+         ...
+
 Django 5.1
 ----------
 
@@ -230,8 +290,6 @@ Django 5.1
 
 Rewrites calls to ``CheckConstraint`` and built-in subclasses from the old ``check`` argument to the new name ``condition``.
 
-Requires Python 3.9+ due to changes in ``ast.keyword``.
-
 .. code-block:: diff
 
    -CheckConstraint(check=Q(amount__gte=0))
@@ -242,7 +300,24 @@ Django 5.0
 
 `Release Notes <https://docs.djangoproject.com/en/5.0/releases/5.0/>`__
 
-No fixers yet.
+``format_html()`` calls
+~~~~~~~~~~~~~~~~~~~~~~~
+
+**Name:** ``format_html``
+
+Rewrites ``format_html()`` calls without ``args`` or ``kwargs`` but using ``str.format()``.
+Such calls are most likely incorrectly applying formatting without escaping, making them vulnerable to HTML injection.
+Such use cases are why calling ``format_html()`` without any arguments or keyword arguments was deprecated in `Ticket #34609 <https://code.djangoproject.com/ticket/34609>`__.
+
+.. code-block:: diff
+
+     from django.utils.html import format_html
+
+    -format_html("<marquee>{}</marquee>".format(message))
+    +format_html("<marquee>{}</marquee>", message)
+
+    -format_html("<marquee>{name}</marquee>".format(name=name))
+    +format_html("<marquee>{name}</marquee>", name=name)
 
 Django 4.2
 ----------
@@ -298,8 +373,6 @@ Transforms HTTP headers from the old WSGI kwarg format to use the new ``headers`
 * ``Client`` instantiation
 * ``RequestFactory`` instantiation
 
-Requires Python 3.9+ due to changes in ``ast.keyword``.
-
 .. code-block:: diff
 
     -response = self.client.get("/", HTTP_ACCEPT="text/plain")

pyproject.toml

@@ -6,7 +6,7 @@ requires = [
 
 [project]
 name = "django-upgrade"
-version = "1.20.0"
+version = "1.22.1"
 description = "Automatically upgrade your Django project code."
 readme = "README.rst"
 keywords = [
@@ -15,7 +15,7 @@ keywords = [
 authors = [
   { name = "Adam Johnson", email = "me@adamj.eu" },
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Framework :: Django :: 2.2",
@@ -31,11 +31,11 @@ classifiers = [
   "Natural Language :: English",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Typing :: Typed",
 ]
 dependencies = [
@@ -51,11 +51,15 @@ add_imports = [
 force_single_line = true
 profile = "black"
 
+[tool.pyproject-fmt]
+max_supported_python = "3.13"
+
 [tool.pytest.ini_options]
 addopts = """\
     --strict-config
     --strict-markers
     """
+xfail_strict = true
 
 [tool.coverage.run]
 branch = true
@@ -73,6 +77,9 @@ source = [
 
 [tool.coverage.report]
 show_missing = true
+exclude_also = [
+  "if TYPE_CHECKING:",
+]
 
 [tool.mypy]
 enable_error_code = [