django-gisserver 2.2.1__tar.gz → 2.3.0__tar.gz

{django_gisserver-2.2.1 → django_gisserver-2.3.0}/CHANGES.md

@@ -1,3 +1,12 @@
+# 2026-01-12 (2.3.0)
+
+* Add support for python 3.14 and Django 5.2
+* Drop support for Django 5.1
+
+# 2025-12-04 (2.2.2)
+
+* Fix output format matching to allow `application/json; subtype=geojson; charset=utf-8`
+
 # 2025-10-14 (2.2.1)
 
 * Add outputFormat to GetFeature operation to support ArcGISOnline

{django_gisserver-2.2.1/django_gisserver.egg-info → django_gisserver-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-gisserver
-Version: 2.2.1
+Version: 2.3.0
 Summary: Django speaking WFS 2.0 (exposing GeoDjango model fields)
 Home-page: https://github.com/amsterdam/django-gisserver
 Author: Diederik van der Boor
@@ -16,35 +16,35 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.2
-Classifier: Framework :: Django :: 5.1
 Classifier: Framework :: Django :: 5.2
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires: Django (>=4.2, >=5.1)
+Requires: Django (>=4.2, >=5.2, <6.0)
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Django>=4.2
+Requires-Dist: Django<6.0,>=4.2
 Requires-Dist: defusedxml>=0.7.1
-Requires-Dist: lru_dict>=1.1.7
-Requires-Dist: orjson>=3.9.15
-Requires-Dist: pyproj>=3.6.1
+Requires-Dist: lru_dict>=1.4.1
+Requires-Dist: orjson>=3.11.5
+Requires-Dist: pyproj>=3.7.1
 Provides-Extra: tests
-Requires-Dist: django-environ>=0.4.5; extra == "tests"
-Requires-Dist: psycopg2-binary>=2.8.4; extra == "tests"
-Requires-Dist: lxml>=4.9.1; extra == "tests"
-Requires-Dist: pytest>=6.2.3; extra == "tests"
-Requires-Dist: pytest-django>=4.1.0; extra == "tests"
-Requires-Dist: pytest-cov>=2.11.1; extra == "tests"
+Requires-Dist: django-environ>=0.12.0; extra == "tests"
+Requires-Dist: psycopg2-binary>=2.9.11; extra == "tests"
+Requires-Dist: lxml>=6.0.2; extra == "tests"
+Requires-Dist: pytest>=9.0.2; extra == "tests"
+Requires-Dist: pytest-django>=4.11.1; extra == "tests"
+Requires-Dist: pytest-cov>=7.0.0; extra == "tests"
 Provides-Extra: docs
-Requires-Dist: Django~=5.1; extra == "docs"
+Requires-Dist: Django~=5.2; extra == "docs"
 Requires-Dist: sphinxcontrib-django>=2.5; extra == "docs"
-Requires-Dist: myst-parser>=3.0.1; extra == "docs"
-Requires-Dist: psycopg2-binary>=2.8.4; extra == "docs"
+Requires-Dist: myst-parser>=4.0.1; extra == "docs"
+Requires-Dist: psycopg2-binary>=2.9.11; extra == "docs"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{django_gisserver-2.2.1 → django_gisserver-2.3.0/django_gisserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-gisserver
-Version: 2.2.1
+Version: 2.3.0
 Summary: Django speaking WFS 2.0 (exposing GeoDjango model fields)
 Home-page: https://github.com/amsterdam/django-gisserver
 Author: Diederik van der Boor
@@ -16,35 +16,35 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.2
-Classifier: Framework :: Django :: 5.1
 Classifier: Framework :: Django :: 5.2
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires: Django (>=4.2, >=5.1)
+Requires: Django (>=4.2, >=5.2, <6.0)
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Django>=4.2
+Requires-Dist: Django<6.0,>=4.2
 Requires-Dist: defusedxml>=0.7.1
-Requires-Dist: lru_dict>=1.1.7
-Requires-Dist: orjson>=3.9.15
-Requires-Dist: pyproj>=3.6.1
+Requires-Dist: lru_dict>=1.4.1
+Requires-Dist: orjson>=3.11.5
+Requires-Dist: pyproj>=3.7.1
 Provides-Extra: tests
-Requires-Dist: django-environ>=0.4.5; extra == "tests"
-Requires-Dist: psycopg2-binary>=2.8.4; extra == "tests"
-Requires-Dist: lxml>=4.9.1; extra == "tests"
-Requires-Dist: pytest>=6.2.3; extra == "tests"
-Requires-Dist: pytest-django>=4.1.0; extra == "tests"
-Requires-Dist: pytest-cov>=2.11.1; extra == "tests"
+Requires-Dist: django-environ>=0.12.0; extra == "tests"
+Requires-Dist: psycopg2-binary>=2.9.11; extra == "tests"
+Requires-Dist: lxml>=6.0.2; extra == "tests"
+Requires-Dist: pytest>=9.0.2; extra == "tests"
+Requires-Dist: pytest-django>=4.11.1; extra == "tests"
+Requires-Dist: pytest-cov>=7.0.0; extra == "tests"
 Provides-Extra: docs
-Requires-Dist: Django~=5.1; extra == "docs"
+Requires-Dist: Django~=5.2; extra == "docs"
 Requires-Dist: sphinxcontrib-django>=2.5; extra == "docs"
-Requires-Dist: myst-parser>=3.0.1; extra == "docs"
-Requires-Dist: psycopg2-binary>=2.8.4; extra == "docs"
+Requires-Dist: myst-parser>=4.0.1; extra == "docs"
+Requires-Dist: psycopg2-binary>=2.9.11; extra == "docs"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

django_gisserver-2.3.0/django_gisserver.egg-info/requires.txt

@@ -0,0 +1,19 @@
+Django<6.0,>=4.2
+defusedxml>=0.7.1
+lru_dict>=1.4.1
+orjson>=3.11.5
+pyproj>=3.7.1
+
+[docs]
+Django~=5.2
+sphinxcontrib-django>=2.5
+myst-parser>=4.0.1
+psycopg2-binary>=2.9.11
+
+[tests]
+django-environ>=0.12.0
+psycopg2-binary>=2.9.11
+lxml>=6.0.2
+pytest>=9.0.2
+pytest-django>=4.11.1
+pytest-cov>=7.0.0

django_gisserver-2.3.0/gisserver/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.3.0"  # follows PEP440

{django_gisserver-2.2.1 → django_gisserver-2.3.0}/gisserver/extensions/functions.py

@@ -17,7 +17,6 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Union
 
-import django
 from django.contrib.gis.db.models import functions as gis
 from django.db import models
 from django.db.models import functions
@@ -400,15 +399,14 @@ function_registry.register(
     returns=XsdTypes.gmlAbstractGeometryType,
 )
 
-if django.VERSION >= (4, 2):
-    function_registry.register(
-        "isEmpty",
-        gis.IsEmpty,
-        arguments={
-            "geom": XsdTypes.gmlAbstractGeometryType,
-        },
-        returns=XsdTypes.boolean,
-    )
+function_registry.register(
+    "isEmpty",
+    gis.IsEmpty,
+    arguments={
+        "geom": XsdTypes.gmlAbstractGeometryType,
+    },
+    returns=XsdTypes.boolean,
+)
 
 function_registry.register(
     "isValid",

{django_gisserver-2.2.1 → django_gisserver-2.3.0}/gisserver/operations/base.py

@@ -96,12 +96,32 @@ class OutputFormat(typing.Generic[R]):
         self._max_page_size = max_page_size
 
     def matches(self, value):
-        """Test whether the 'value' is matched by this object."""
-        if self.content_type == "application/gml+xml":
-            # Allow "application/gml+xml; version=3.2" as sent by FME.
-            # TODO rewrite this matching code in a clean way.
-            value = value.split("; ", 1)[0]
-        return self.content_type == value or self.subtype == value
+        """
+        Test whether the 'value' is matched by this object.
+
+        The regex used captures the content-type (ct), subtype (st), charset (cs) and version (v)
+        from the supplied value.
+
+        Some possible input values are:
+        - application/gml+xml
+        - application/gml+xml; version=3.2
+        - csv
+        - text/csv
+        - application/json; subtype=geojson; charset=utf-8
+        - geojson
+        """
+
+        regex = (
+            r"^(?P<ct>[^;]+);?\s?(?:(?:subtype=)(?P<st>[^;]*))?;?\s?"
+            r"(?:(?:charset=)(?P<cs>.*))?(;\s)?(?:(?:version=)(?P<v>.*))?"
+        )
+        if match := re.match(regex, value):
+            # If we capture a subtype, match on both
+            if match.group("st") is not None:
+                return self.content_type == match.group("ct") and self.subtype == match.group("st")
+            else:
+                return self.content_type == match.group("ct") or self.subtype == match.group("ct")
+        return False
 
     @property
     def identifier(self):

{django_gisserver-2.2.1 → django_gisserver-2.3.0}/setup.py

@@ -20,19 +20,19 @@ def find_version(*parts):
 
 
 tests_require = [
-    "django-environ >= 0.4.5",
-    "psycopg2-binary >= 2.8.4",
-    "lxml >= 4.9.1",
-    "pytest >= 6.2.3",
-    "pytest-django >= 4.1.0",
-    "pytest-cov >= 2.11.1",
+    "django-environ >= 0.12.0",
+    "psycopg2-binary >= 2.9.11",
+    "lxml >= 6.0.2",
+    "pytest >= 9.0.2",
+    "pytest-django >= 4.11.1",
+    "pytest-cov >= 7.0.0",
 ]
 
 docs_require = [
-    "Django ~= 5.1",
+    "Django ~= 5.2",
     "sphinxcontrib-django >= 2.5",
-    "myst-parser >= 3.0.1",
-    "psycopg2-binary >= 2.8.4",
+    "myst-parser >= 4.0.1",
+    "psycopg2-binary >= 2.9.11",
 ]
 
 
@@ -41,17 +41,17 @@ setup(
     version=find_version("gisserver", "__init__.py"),
     license="Mozilla Public License 2.0",
     install_requires=[
-        "Django >= 4.2",
+        "Django >= 4.2, <6.0",
         "defusedxml >= 0.7.1",
-        "lru_dict >= 1.1.7",
-        "orjson >= 3.9.15",
-        "pyproj >= 3.6.1",
+        "lru_dict >= 1.4.1",
+        "orjson >= 3.11.5",
+        "pyproj >= 3.7.1",
     ],
     extras_require={
         "tests": tests_require,
         "docs": docs_require,
     },
-    requires=["Django (>=4.2, >=5.1)"],
+    requires=["Django (>=4.2, >=5.2, <6.0)"],
     description="Django speaking WFS 2.0 (exposing GeoDjango model fields)",
     long_description=read("README.md"),
     long_description_content_type="text/markdown",
@@ -72,9 +72,9 @@ setup(
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "Framework :: Django",
         "Framework :: Django :: 4.2",
-        "Framework :: Django :: 5.1",
         "Framework :: Django :: 5.2",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",

django_gisserver-2.2.1/django_gisserver.egg-info/requires.txt

@@ -1,19 +0,0 @@
-Django>=4.2
-defusedxml>=0.7.1
-lru_dict>=1.1.7
-orjson>=3.9.15
-pyproj>=3.6.1
-
-[docs]
-Django~=5.1
-sphinxcontrib-django>=2.5
-myst-parser>=3.0.1
-psycopg2-binary>=2.8.4
-
-[tests]
-django-environ>=0.4.5
-psycopg2-binary>=2.8.4
-lxml>=4.9.1
-pytest>=6.2.3
-pytest-django>=4.1.0
-pytest-cov>=2.11.1

django_gisserver-2.2.1/gisserver/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.2.1"  # follows PEP440