From 4c4f8fd775c61ad8cfb07b4da244b07000c89edc Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Thu, 20 Aug 2026 17:31:13 -0400 Subject: [PATCH 1/2] Removed more versionadded/versionchanged directives for 6.1. --- docs/ref/contrib/gis/db-api.txt | 5 ----- docs/ref/contrib/gis/forms-api.txt | 2 -- docs/ref/contrib/gis/gdal.txt | 5 ----- docs/ref/contrib/gis/geos.txt | 4 ---- docs/ref/contrib/gis/model-api.txt | 2 -- docs/ref/settings.txt | 2 -- 6 files changed, 20 deletions(-) diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt index 7b2ada03849b..aed9846fec1f 100644 --- a/docs/ref/contrib/gis/db-api.txt +++ b/docs/ref/contrib/gis/db-api.txt @@ -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`. -.. 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 ---------------- diff --git a/docs/ref/contrib/gis/forms-api.txt b/docs/ref/contrib/gis/forms-api.txt index 8af76d5d1bc3..dcb10b3c0dad 100644 --- a/docs/ref/contrib/gis/forms-api.txt +++ b/docs/ref/contrib/gis/forms-api.txt @@ -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 diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt index 33300924a7ea..99433553c1a4 100644 --- a/docs/ref/contrib/gis/gdal.txt +++ b/docs/ref/contrib/gis/gdal.txt @@ -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 `_. -.. versionchanged:: 5.2.17 - - In earlier versions, spatial lookups accepted ``str`` and ``dict`` types - for new rasters, allowing file writes and network fetches. - Settings ======== diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt index 502e59fb6a5f..f83cbfba7c43 100644 --- a/docs/ref/contrib/gis/geos.txt +++ b/docs/ref/contrib/gis/geos.txt @@ -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. diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt index 765735d172b2..bf16eb1e157a 100644 --- a/docs/ref/contrib/gis/model-api.txt +++ b/docs/ref/contrib/gis/model-api.txt @@ -228,8 +228,6 @@ details. .. attribute:: GeometryField.max_geom_collections -.. versionadded:: 5.2.17 - This option is forwarded to the :attr:`form field ` generated for this model field, bounding how many geometry collections may be contained in submitted diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index f629478c9fb1..587937cd6199 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -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 From 03988c5a5ba248c3b9b11ea96fd4fda5e98849aa Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Thu, 20 Aug 2026 17:39:55 -0400 Subject: [PATCH 2/2] Refs #36664 -- Readded optional requirements on daily builds for Python 3.15. --- tests/requirements/py3.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/requirements/py3.txt b/tests/requirements/py3.txt index 5fe92f814f1d..1c53d3bc1e4b 100644 --- a/tests/requirements/py3.txt +++ b/tests/requirements/py3.txt @@ -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