[pull] main from django:main

django/__init__.py

@@ -1,6 +1,6 @@
 from django.utils.version import get_version
 
-VERSION = (6, 1, 0, "alpha", 0)
+VERSION = (6, 2, 0, "alpha", 0)
 
 __version__ = get_version(VERSION)
 

django/contrib/auth/hashers.py

@@ -324,7 +324,7 @@ class PBKDF2PasswordHasher(BasePasswordHasher):
     """
 
     algorithm = "pbkdf2_sha256"
-    iterations = 1_500_000
+    iterations = 1_800_000
     digest = hashlib.sha256
 
     def encode(self, password, salt, iterations=None):

django/utils/deprecation.py

@@ -19,15 +19,16 @@ def django_file_prefixes():
     return (os.path.join(os.path.dirname(file), ""),)
 
 
-class RemovedInNextVersionWarning(DeprecationWarning):
+class RemovedInDjango70Warning(DeprecationWarning):
     pass
 
 
-class RemovedInDjango70Warning(PendingDeprecationWarning):
+class RemovedInDjango71Warning(PendingDeprecationWarning):
     pass
 
 
-RemovedAfterNextVersionWarning = RemovedInDjango70Warning
+RemovedInNextVersionWarning = RemovedInDjango70Warning
+RemovedAfterNextVersionWarning = RemovedInDjango71Warning
 
 
 def warn_about_external_use(

docs/conf.py

@@ -120,7 +120,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = "6.1"
+version = "6.2"
 # The full version, including alpha/beta/rc tags.
 try:
     from django import VERSION, get_version
@@ -137,7 +137,7 @@ def django_release():
     release = django_release()
 
 # The "development version" of Django
-django_next_version = "6.1"
+django_next_version = "6.2"
 
 extlinks = {
     "bpo": ("https://bugs.python.org/issue?@action=redirect&bpo=%s", "bpo-%s"),

docs/faq/install.txt

@@ -50,12 +50,10 @@ What Python version can I use with Django?
 ============== ===============
 Django version Python versions
 ============== ===============
-4.2            3.8, 3.9, 3.10, 3.11, 3.12 (added in 4.2.8)
-5.0            3.10, 3.11, 3.12
-5.1            3.10, 3.11, 3.12, 3.13 (added in 5.1.3)
 5.2            3.10, 3.11, 3.12, 3.13, 3.14 (added in 5.2.8)
 6.0            3.12, 3.13, 3.14
 6.1            3.12, 3.13, 3.14
+6.2            3.12, 3.13, 3.14
 ============== ===============
 
 For each version of Python, only the latest micro release (A.B.C) is officially

docs/howto/custom-shell.txt

@@ -56,11 +56,6 @@ Running this customized ``shell`` command with ``verbosity=2`` would show:
       from django.urls import resolve, reverse
       from django.utils import timezone
 
-.. versionchanged:: 6.0
-
-    Automatic imports of common utilities, such as ``django.conf.settings``,
-    were added.
-
 If an overridden ``shell`` command includes paths that cannot be imported,
 these errors are shown when ``verbosity`` is set to ``1`` or higher. Duplicate
 imports are automatically handled.

docs/internals/deprecation.txt

@@ -7,6 +7,14 @@ in a backward incompatible way, following their deprecation, as per the
 :ref:`deprecation policy <internal-release-deprecation-policy>`. More details
 about each item can often be found in the release notes of two versions prior.
 
+.. _deprecation-removed-in-7.1:
+
+7.1
+---
+
+See the :ref:`Django 6.2 release notes <deprecated-features-6.2>` for more
+details on these changes.
+
 .. _deprecation-removed-in-7.0:
 
 7.0