django · felixxm · May 13, 2020 · May 4, 2020 · May 4, 2020 · May 4, 2020
diff --git a/django/__init__.py b/django/__init__.py
@@ -1,6 +1,6 @@
 from django.utils.version import get_version
 
-VERSION = (3, 1, 0, 'alpha', 0)
+VERSION = (3, 2, 0, 'alpha', 0)
 
 __version__ = get_version(VERSION)
 

diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py
@@ -241,7 +241,7 @@ class PBKDF2PasswordHasher(BasePasswordHasher):
     safely but you must rename the algorithm if you change SHA256.
     """
     algorithm = "pbkdf2_sha256"
-    iterations = 216000
+    iterations = 260000
     digest = hashlib.sha256
 
     def encode(self, password, salt, iterations=None):

diff --git a/django/utils/deprecation.py b/django/utils/deprecation.py
@@ -5,14 +5,17 @@
 from asgiref.sync import sync_to_async
 
 
-class RemovedInNextVersionWarning(DeprecationWarning):
+class RemovedInDjango40Warning(DeprecationWarning):
     pass
 
 
-class RemovedInDjango40Warning(PendingDeprecationWarning):
+class RemovedInDjango41Warning(PendingDeprecationWarning):
     pass
 
 
+RemovedInNextVersionWarning = RemovedInDjango40Warning
+
+
 class warn_about_renamed_method:
     def __init__(self, class_name, old_method_name, new_method_name, deprecation_warning):
         self.class_name = class_name

diff --git a/docs/conf.py b/docs/conf.py
@@ -83,7 +83,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.1'
+version = '3.2'
 # The full version, including alpha/beta/rc tags.
 try:
     from django import VERSION, get_version
@@ -99,7 +99,7 @@ def django_release():
     release = django_release()
 
 # The "development version" of Django
-django_next_version = '3.1'
+django_next_version = '3.2'
 
 extlinks = {
     'commit': ('https://github.com/django/django/commit/%s', ''),

diff --git a/docs/faq/install.txt b/docs/faq/install.txt
@@ -50,11 +50,8 @@ What Python version can I use with Django?
 ============== ===============
 Django version Python versions
 ============== ===============
-1.11           2.7, 3.4, 3.5, 3.6, 3.7 (added in 1.11.17)
-2.0            3.4, 3.5, 3.6, 3.7
-2.1            3.5, 3.6, 3.7
 2.2            3.5, 3.6, 3.7, 3.8 (added in 2.2.8)
-3.0, 3.1       3.6, 3.7, 3.8
+3.0, 3.1, 3.2  3.6, 3.7, 3.8
 ============== ===============
 
 For each version of Python, only the latest micro release (A.B.C) is officially

diff --git a/docs/howto/custom-file-storage.txt b/docs/howto/custom-file-storage.txt
@@ -99,8 +99,6 @@ and underscores from the original filename, removing everything else.
 
 .. method:: get_alternative_name(file_root, file_ext)
 
-.. versionadded:: 3.0
-
 Returns an alternative filename based on the ``file_root`` and ``file_ext``
 parameters. By default, an underscore plus a random 7 character alphanumeric
 string is appended to the filename before the extension.

diff --git a/docs/internals/deprecation.txt b/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-4.1:
+
+4.1
+---
+
+See the :ref:`Django 3.2 release notes <deprecated-features-3.2>` for more
+details on these changes.
+
 .. _deprecation-removed-in-4.0:
 
 4.0

diff --git a/docs/ref/clickjacking.txt b/docs/ref/clickjacking.txt
@@ -72,11 +72,6 @@ this header instead, set the :setting:`X_FRAME_OPTIONS` setting::
 
     X_FRAME_OPTIONS = 'SAMEORIGIN'
 
-.. versionchanged:: 3.0
-
-    The default value of the :setting:`X_FRAME_OPTIONS` setting was changed
-    from ``SAMEORIGIN`` to ``DENY``.
-
 When using the middleware there may be some views where you do **not** want the
 ``X-Frame-Options`` header set. For those cases, you can use a view decorator
 that tells the middleware not to set the header::

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
@@ -1649,8 +1649,6 @@ templates used by the :class:`ModelAdmin` views:
 
 .. method:: ModelAdmin.get_inlines(request, obj)
 
-    .. versionadded:: 3.0
-
     The ``get_inlines`` method is given the ``HttpRequest`` and the
     ``obj`` being edited (or ``None`` on an add form) and is expected to return
     an iterable of inlines. You can override this method to dynamically add
@@ -2151,10 +2149,6 @@ To avoid conflicts with user-supplied scripts or libraries, Django's jQuery
 in your own admin JavaScript without including a second copy, you can use the
 ``django.jQuery`` object on changelist and add/edit views.
 
-.. versionchanged:: 3.0
-
-    jQuery was upgraded from 3.3.1 to 3.4.1.
-
 .. versionchanged:: 3.1
 
     jQuery was upgraded from 3.4.1 to 3.5.1.

diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt
@@ -194,8 +194,6 @@ Methods
 
     .. method:: get_user_permissions(obj=None)
 
-        .. versionadded:: 3.0
-
         Returns a set of permission strings that the user has directly.
 
         If ``obj`` is passed in, only returns the user permissions for this
@@ -288,14 +286,8 @@ Manager methods
         Same as :meth:`create_user`, but sets :attr:`~models.User.is_staff` and
         :attr:`~models.User.is_superuser` to ``True``.
 
-        .. versionchanged:: 3.0
-
-            The ``email`` and ``password`` parameters were made optional.
-
     .. method:: with_perm(perm, is_active=True, include_superusers=True, backend=None, obj=None)
 
-        .. versionadded:: 3.0
-
         Returns users that have the given permission ``perm`` either in the
         ``"<app label>.<permission codename>"`` format or as a
         :class:`~django.contrib.auth.models.Permission` instance. Returns an
@@ -499,8 +491,6 @@ The following backends are available in :mod:`django.contrib.auth.backends`:
 
 .. class:: BaseBackend
 
-    .. versionadded:: 3.0
-
     A base class that provides default implementations for all required
     methods. By default, it will reject any user and provide no permissions.
 
@@ -603,8 +593,6 @@ The following backends are available in :mod:`django.contrib.auth.backends`:
 
     .. method:: with_perm(perm, is_active=True, include_superusers=True, obj=None)
 
-        .. versionadded:: 3.0
-
         Returns all active users who have the permission ``perm`` either in
         the form of ``"<app label>.<permission codename>"`` or a
         :class:`~django.contrib.auth.models.Permission` instance. Returns an

diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
@@ -28,10 +28,6 @@ not conform to the OGC standard. Django supports spatial functions operating on
 real geometries available in modern MySQL versions. However, the spatial
 functions are not as rich as other backends like PostGIS.
 
-.. versionchanged:: 3.0
-
-    Support for spatial functions operating on real geometries was added.
-
 .. warning::
 
     True spatial indexes (R-trees) are only supported with

diff --git a/docs/ref/contrib/gis/functions.txt b/docs/ref/contrib/gis/functions.txt
@@ -361,8 +361,6 @@ __ https://en.wikipedia.org/wiki/Geohash
 
 .. class:: GeometryDistance(expr1, expr2, **extra)
 
-.. versionadded:: 3.0
-
 *Availability*: `PostGIS <https://postgis.net/docs/geometry_distance_knn.html>`__
 
 Accepts two geographic fields or expressions and returns the distance between

diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt
@@ -86,10 +86,6 @@ Keyword Arguments    Description
                      the :setting:`GEOIP_CITY` setting.
 ===================  =======================================================
 
-.. versionchanged:: 3.0
-
-    Support for :class:`pathlib.Path` ``path`` was added.
-
 Methods
 =======
 
@@ -159,10 +155,6 @@ A string or :class:`pathlib.Path` specifying the directory where the GeoIP data
 files are located. This setting is *required* unless manually specified
 with ``path`` keyword when initializing the :class:`GeoIP2` object.
 
-.. versionchanged:: 3.0
-
-    Support for :class:`pathlib.Path` was added.
-
 .. setting:: GEOIP_COUNTRY
 
 ``GEOIP_COUNTRY``

diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
@@ -156,11 +156,6 @@ MySQL       ``ST_Contains(poly, geom)``
 SpatiaLite  ``Contains(poly, geom)``
 ==========  ============================
 
-.. versionchanged:: 3.0
-
-    In older versions, MySQL uses ``MBRContains`` and operates only on bounding
-    boxes.
-
 .. fieldlookup:: contains_properly
 
 ``contains_properly``
@@ -251,10 +246,6 @@ MySQL       ``ST_Crosses(poly, geom)``
 SpatiaLite  ``Crosses(poly, geom)``
 ==========  ==========================
 
-.. versionchanged:: 3.0
-
-    MySQL support was added.
-
 .. fieldlookup:: disjoint
 
 ``disjoint``
@@ -279,11 +270,6 @@ MySQL       ``ST_Disjoint(poly, geom)``
 SpatiaLite  ``Disjoint(poly, geom)``
 ==========  =================================================
 
-.. versionchanged:: 3.0
-
-    In older versions, MySQL uses ``MBRDisjoint`` and operates only on bounding
-    boxes.
-
 .. fieldlookup:: equals
 
 ``equals``
@@ -308,11 +294,6 @@ MySQL       ``ST_Equals(poly, geom)``
 SpatiaLite  ``Equals(poly, geom)``
 ==========  =================================================
 
-.. versionchanged:: 3.0
-
-    In older versions, MySQL uses ``MBREquals`` and operates only on bounding
-    boxes.
-
 .. fieldlookup:: exact
     :noindex:
 .. fieldlookup:: same_as
@@ -341,11 +322,6 @@ MySQL       ``ST_Equals(poly, geom)``
 SpatiaLite  ``Equals(poly, geom)``
 ==========  =================================================
 
-.. versionchanged:: 3.0
-
-    In older versions, MySQL uses ``MBREquals`` and operates only on bounding
-    boxes.
-
 .. fieldlookup:: intersects
 
 ``intersects``
@@ -370,11 +346,6 @@ MySQL       ``ST_Intersects(poly, geom)``
 SpatiaLite  ``Intersects(poly, geom)``
 ==========  =================================================
 
-.. versionchanged:: 3.0
-
-    In older versions, MySQL uses ``MBRIntersects`` and operates only on
-    bounding boxes.
-
 .. fieldlookup:: isvalid
 
 ``isvalid``
@@ -416,11 +387,6 @@ MySQL       ``ST_Overlaps(poly, geom)``
 SpatiaLite  ``Overlaps(poly, geom)``
 ==========  ============================
 
-.. versionchanged:: 3.0
-
-    In older versions, MySQL uses ``MBROverlaps`` and operates only on bounding
-    boxes.
-
 .. fieldlookup:: relate
 
 ``relate``
@@ -521,11 +487,6 @@ Oracle      ``SDO_TOUCH(poly, geom)``
 SpatiaLite  ``Touches(poly, geom)``
 ==========  ==========================
 
-.. versionchanged:: 3.0
-
-    In older versions, MySQL uses ``MBRTouches`` and operates only on bounding
-    boxes.
-
 .. fieldlookup:: within
 
 ``within``
@@ -550,11 +511,6 @@ Oracle      ``SDO_INSIDE(poly, geom)``
 SpatiaLite  ``Within(poly, geom)``
 ==========  ==========================
 
-.. versionchanged:: 3.0
-
-    In older versions, MySQL uses ``MBRWithin`` and operates only on bounding
-    boxes.
-
 .. fieldlookup:: left
 
 ``left``

diff --git a/docs/ref/contrib/humanize.txt b/docs/ref/contrib/humanize.txt
@@ -78,11 +78,6 @@ e.g. with the ``'de'`` language:
 * ``1200000000`` becomes ``'1,2 Milliarden'``.
 * ``-1200000000`` becomes ``'-1,2 Milliarden'``.
 
-.. versionchanged:: 3.0
-
-    All numeric values are now translated as plural, except ``1.0`` which is
-    translated as a singular phrase. This may be incorrect for some languages.
-
 .. versionchanged:: 3.1
 
     Support for negative integers was added.

diff --git a/docs/ref/contrib/postgres/constraints.txt b/docs/ref/contrib/postgres/constraints.txt
@@ -12,8 +12,6 @@ PostgreSQL supports additional data integrity constraints available from the
 ``ExclusionConstraint``
 =======================
 
-.. versionadded:: 3.0
-
 .. class:: ExclusionConstraint(*, name, expressions, index_type=None, condition=None, deferrable=None)
 
     Creates an exclusion constraint in the database. Internally, PostgreSQL

diff --git a/docs/ref/contrib/postgres/fields.txt b/docs/ref/contrib/postgres/fields.txt
@@ -972,8 +972,6 @@ types.
 Range operators
 ---------------
 
-.. versionadded:: 3.0
-
 .. class:: RangeOperators
 
 PostgreSQL provides a set of SQL operators that can be used together with the
@@ -1000,8 +998,6 @@ corresponding lookups.
 RangeBoundary() expressions
 ---------------------------
 
-.. versionadded:: 3.0
-
 .. class:: RangeBoundary(inclusive_lower=True, inclusive_upper=False)
 
     .. attribute:: inclusive_lower

diff --git a/docs/ref/contrib/postgres/operations.txt b/docs/ref/contrib/postgres/operations.txt
@@ -111,8 +111,6 @@ run the query ``CREATE EXTENSION IF NOT EXISTS hstore;``.
 Index concurrent operations
 ===========================
 
-.. versionadded:: 3.0
-
 PostgreSQL supports the ``CONCURRENTLY`` option to ``CREATE INDEX`` and
 ``DROP INDEX`` statements to add and remove indexes without locking out writes.
 This option is useful for adding or removing an index in a live production

diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
@@ -310,11 +310,6 @@ appropriate ``<language>`` tag (RSS 2.0) or ``xml:lang`` attribute (Atom). By
 default, this is :func:`django.utils.translation.get_language()`. You can change it
 by setting the ``language`` class attribute.
 
-.. versionchanged:: 3.0
-
-    The ``language`` class attribute was added. In older versions, the behavior
-    is the same as ``language = settings.LANGUAGE_CODE``.
-
 URLs
 ----
 

diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
@@ -287,8 +287,6 @@ non-durable <https://www.postgresql.org/docs/current/non-durability.html>`_.
 MariaDB notes
 =============
 
-.. versionadded:: 3.0
-
 Django supports MariaDB 10.2 and higher.
 
 To use MariaDB, use the MySQL backend, which is shared between the two. See the