[5.2.x] Bumped minimum isort version to 7.0.0.

Added ignores relating to https://github.com/PyCQA/isort/issues/2352.

Backport of d980d68609448a4c85763fa34e471ff80540888b from main.

7 files changed, 10 insertions, 10 deletions

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index c4d249551a..936f2f90e5 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -51,7 +51,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: '3.14'
-      - run: python -m pip install "isort<6"
+      - run: python -m pip install isort
       - name: isort
         # Pinned to v3.0.0.
         uses: liskin/gh-problem-matcher-wrap@e7b7beaaafa52524748b31a381160759d68d61fb
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1453e08b13..d22066cbde 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
         files: 'docs/.*\.txt$'
         args: ["--rst-literal-block"]
   - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
+    rev: 7.0.0
     hooks:
       - id: isort
   - repo: https://github.com/PyCQA/flake8
diff --git a/django/db/backends/postgresql/compiler.py b/django/db/backends/postgresql/compiler.py
index fcd7faaf35..81d291cf36 100644
--- a/django/db/backends/postgresql/compiler.py
+++ b/django/db/backends/postgresql/compiler.py
@@ -1,10 +1,10 @@
-from django.db.models.sql.compiler import (
+from django.db.models.sql.compiler import (  # isort:skip
     SQLAggregateCompiler,
     SQLCompiler as BaseSQLCompiler,
     SQLDeleteCompiler,
+    SQLInsertCompiler as BaseSQLInsertCompiler,
+    SQLUpdateCompiler,
 )
-from django.db.models.sql.compiler import SQLInsertCompiler as BaseSQLInsertCompiler
-from django.db.models.sql.compiler import SQLUpdateCompiler
 
 __all__ = [
     "SQLAggregateCompiler",
diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt
index be3118f96e..e9e913c83f 100644
--- a/docs/internals/contributing/writing-code/coding-style.txt
+++ b/docs/internals/contributing/writing-code/coding-style.txt
@@ -140,7 +140,7 @@ Imports
 
   .. console::
 
-      $ python -m pip install "isort >= 5.1.0"
+      $ python -m pip install "isort >= 7.0.0"
       $ isort .
 
   This runs ``isort`` recursively from your current directory, modifying any
diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt
index 7448e05102..54751275cc 100644
--- a/docs/internals/contributing/writing-code/unit-tests.txt
+++ b/docs/internals/contributing/writing-code/unit-tests.txt
@@ -83,7 +83,7 @@ can be seen as follows:
     blacken-docs
     flake8>=3.7.0
     docs
-    isort>=5.1.0
+    isort>=7.0.0
     zizmor>=1.16.3
 
 Testing other Python versions and database backends
diff --git a/tests/contenttypes_tests/test_views.py b/tests/contenttypes_tests/test_views.py
index 75f39a7bab..276ec5fbe2 100644
--- a/tests/contenttypes_tests/test_views.py
+++ b/tests/contenttypes_tests/test_views.py
@@ -8,7 +8,7 @@ from django.contrib.sites.shortcuts import get_current_site
 from django.http import Http404, HttpRequest
 from django.test import TestCase, override_settings
 
-from .models import (
+from .models import (  # isort:skip
     Article,
     Author,
     FooWithBrokenAbsoluteUrl,
@@ -17,8 +17,8 @@ from .models import (
     ModelWithM2MToSite,
     ModelWithNullFKToSite,
     SchemeIncludedURL,
+    Site as MockSite,
 )
-from .models import Site as MockSite
 
 
 @override_settings(ROOT_URLCONF="contenttypes_tests.urls")
diff --git a/tox.ini b/tox.ini
index c402171c16..7781a1ab6a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,7 +75,7 @@ commands =
 [testenv:isort]
 basepython = python3
 usedevelop = false
-deps = isort >= 5.1.0
+deps = isort >= 7.0.0
 changedir = {toxinidir}
 commands = isort --check-only --diff django tests scripts