Skip to content

[pull] main from django:main #542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 21, 2026
Merged

[pull] main from django:main #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c4f8fd
Removed more versionadded/versionchanged directives for 6.1.
jacobtylerwalls Aug 20, 2026
03988c5
Refs #36664 -- Readded optional requirements on daily builds for Pyth…
jacobtylerwalls Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions docs/ref/contrib/gis/db-api.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,6 @@ file writing or network fetching is acceptable. For the rationale, see
The general structure of geographic lookups is described below. A complete
reference can be found in the :ref:`spatial lookup reference<spatial-lookups>`.

.. versionchanged:: 5.2.17

In earlier versions, spatial lookups accepted ``str`` and ``dict`` types
for new rasters, allowing file writes and network fetches.

Geometry Lookups
----------------

Expand Down
2 changes: 0 additions & 2 deletions docs/ref/contrib/gis/forms-api.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ GeoDjango form fields take the following optional arguments.

.. attribute:: Field.max_geom_collections

.. versionadded:: 5.2.17

The maximum number of geometry collections the field accepts before
refusing to parse the input and raising a
:exc:`~django.core.exceptions.ValidationError`. This guards against crashes
Expand Down
5 changes: 0 additions & 5 deletions docs/ref/contrib/gis/gdal.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2167,11 +2167,6 @@ values. When validating raster inputs, you should write custom validation.
For defense-in-depth strategies for limiting the available raster drivers, see
`GDAL security considerations <https://gdal.org/user/security.html>`_.

.. versionchanged:: 5.2.17

In earlier versions, spatial lookups accepted ``str`` and ``dict`` types
for new rasters, allowing file writes and network fetches.

Settings
========

Expand Down
4 changes: 0 additions & 4 deletions docs/ref/contrib/gis/geos.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,6 @@ WKB / EWKB ``memoryview``
For the GeoJSON format, the SRID is set based on the ``crs`` member. If ``crs``
isn't provided, the SRID defaults to 4326.

.. versionchanged:: 5.2.17

The ``max_geom_collections`` parameter was added.

.. classmethod:: GEOSGeometry.from_gml(gml_string)

Constructs a :class:`GEOSGeometry` from the given GML string.
Expand Down
2 changes: 0 additions & 2 deletions docs/ref/contrib/gis/model-api.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,6 @@ details.

.. attribute:: GeometryField.max_geom_collections

.. versionadded:: 5.2.17

This option is forwarded to the :attr:`form field
<django.contrib.gis.forms.Field.max_geom_collections>` generated for this model
field, bounding how many geometry collections may be contained in submitted
Expand Down
2 changes: 0 additions & 2 deletions docs/ref/settings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2851,8 +2851,6 @@ See also :setting:`DATE_FORMAT` and :setting:`SHORT_DATE_FORMAT`.
``SIGNED_COOKIE_LEGACY_SALT_FALLBACK``
---------------------------------------

.. versionadded:: 5.2.15

Default: ``False``

Controls whether :meth:`~django.http.HttpRequest.get_signed_cookie` accepts
Expand Down
4 changes: 2 additions & 2 deletions tests/requirements/py3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ black >= 26.5.1
docutils >= 0.22
geoip2 >= 4.8.0
jinja2 >= 2.11.0
numpy >= 1.26.0; sys.platform != 'win32' or python_version < '3.15'
Pillow >= 10.1.0; sys.platform != 'win32' or python_version < '3.15'
numpy >= 1.26.0
Pillow >= 10.1.0
# pylibmc/libmemcached can't be built on Windows.
pylibmc; sys_platform != 'win32'
pymemcache >= 3.4.0
Expand Down
Loading