Skip to content

[pull] main from django:main #62

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 4 commits into from
Aug 27, 2025
Merged

[pull] main from django:main #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07f44c9
Fixed #36568 -- Confirmed support for GEOS 3.14.
smithdc1 Aug 24, 2025
66082a7
Corrected definition of "needsinfo" triage stage in contributing guide.
jacobtylerwalls Aug 26, 2025
d454aef
Refs #15727 -- Captured failed request log in CSPMiddlewareTest.
jacobtylerwalls Aug 26, 2025
c594574
Clarified Trac "version" attribute in contributing guide.
jacobtylerwalls Aug 25, 2025
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
10 changes: 6 additions & 4 deletions docs/internals/contributing/triaging-tickets.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,11 @@ majority of tickets have a severity of "Normal".
Version
-------

It is possible to use the *version* attribute to indicate in which
version the reported bug was identified.
The *version* attribute indicates the earliest version in which the bug was
reproduced. During triage, this field can be updated, but there is no need to
make further updates when that version goes out of support. The field should
not be reset to "dev" to show the issue still exists: instead, the tested
commit hash can be noted in a comment.

UI/UX
-----
Expand Down Expand Up @@ -350,8 +353,7 @@ Then, you can help out by:
"wontfix".

* Closing "Unreviewed" tickets as "needsinfo" when the description is too
sparse to be actionable, or when they're feature requests requiring a
discussion on the `Django Forum`_.
sparse to be actionable.

* Correcting the "Needs tests", "Needs documentation", or "Has patch"
flags for tickets where they are incorrectly set.
Expand Down
3 changes: 2 additions & 1 deletion docs/ref/contrib/gis/install/geolibs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ geospatial libraries:
======================== ==================================== ================================ =======================================================
Program Description Required Supported Versions
======================== ==================================== ================================ =======================================================
:doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.13, 3.12, 3.11, 3.10, 3.9, 3.8
:doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.14, 3.13, 3.12, 3.11, 3.10, 3.9, 3.8
`PROJ`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 9.x, 8.x, 7.x, 6.x
:doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 3.11, 3.10, 3.9, 3.8, 3.7, 3.6, 3.5, 3.4, 3.3, 3.2, 3.1
:doc:`GeoIP <../geoip2>` IP-based geolocation library No 2
Expand All @@ -27,6 +27,7 @@ totally fine with GeoDjango. Your mileage may vary.
GEOS 3.11.0 2022-07-01
GEOS 3.12.0 2023-06-27
GEOS 3.13.0 2024-09-06
GEOS 3.14.0 2025-08-21
GDAL 3.1.0 2020-05-07
GDAL 3.2.0 2020-11-02
GDAL 3.3.0 2021-05-03
Expand Down
3 changes: 2 additions & 1 deletion tests/middleware/test_csp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ def test_csp_500_debug_view(self):
"""
Test that the CSP headers are not added to the debug view.
"""
response = self.client.get("/csp-500/")
with self.assertLogs("django.request", "WARNING"):
response = self.client.get("/csp-500/")
self.assertNotIn(CSP.HEADER_ENFORCE, response)
self.assertNotIn(CSP.HEADER_REPORT_ONLY, response)

Expand Down
Loading