Skip to content

[pull] main from django:main #147

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
Oct 20, 2025
Merged

[pull] main from django:main #147

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
344ae16
Fixed RelatedGeoModelTest.test_related_union_aggregate() test on Orac…
felixxm Oct 20, 2025
5625bd5
Removed duplicate display_raw key in expected data in GeometryWidgetT…
emmanuel-ferdman Oct 20, 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
13 changes: 9 additions & 4 deletions tests/gis_tests/relatedapp/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,15 @@ def test_related_union_aggregate(self):
self.assertEqual(type(u3), MultiPoint)

# Ordering of points in the result of the union is not defined and
# implementation-dependent (DB backend, GEOS version)
self.assertEqual({p.ewkt for p in ref_u1}, {p.ewkt for p in u1})
self.assertEqual({p.ewkt for p in ref_u2}, {p.ewkt for p in u2})
self.assertEqual({p.ewkt for p in ref_u1}, {p.ewkt for p in u3})
# implementation-dependent (DB backend, GEOS version).
tests = [
(u1, ref_u1),
(u2, ref_u2),
(u3, ref_u1),
]
for union, ref in tests:
for point, ref_point in zip(sorted(union), sorted(ref), strict=True):
self.assertIs(point.equals_exact(ref_point, tolerance=6), True)

def test05_select_related_fk_to_subclass(self):
"""
Expand Down
1 change: 0 additions & 1 deletion tests/gis_tests/test_geoforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,6 @@ def test_subwidgets(self):
"map_srid": 4326,
"geom_name": "Geometry",
"geom_type": "GEOMETRY",
"display_raw": False,
},
"name": "name",
"template_name": "",
Expand Down