django-gisserver 1.2.7__tar.gz → 1.3.0__tar.gz

{django-gisserver-1.2.7 → django-gisserver-1.3.0}/CHANGES.md

@@ -1,3 +1,14 @@
+# 2023-06-08 (1.3.0)
+
+## Updates
+* Django 5 support added.
+
+## Contributors
+We would like to thank the following contributors
+for their work on this release.
+
+   - [tomdtp](https://github.com/tomdtp)
+  
 # 2023-06-08 (1.2.7)
 
 * WFS endpoints now accept a GML version number in their OUTPUTFORMAT.

{django-gisserver-1.2.7/django_gisserver.egg-info → django-gisserver-1.3.0}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: django-gisserver
-Version: 1.2.7
+Version: 1.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
 Author-email: opensource@edoburu.nl
 License: Mozilla Public License 2.0
+Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
@@ -156,3 +157,5 @@ software developed with public money is also publicly available.
 
 This package is initially developed by the City of Amsterdam, but the tools
 and concepts created in this project can be used in any city.
+
+

{django-gisserver-1.2.7 → django-gisserver-1.3.0/django_gisserver.egg-info}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: django-gisserver
-Version: 1.2.7
+Version: 1.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
 Author-email: opensource@edoburu.nl
 License: Mozilla Public License 2.0
+Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
@@ -156,3 +157,5 @@ software developed with public money is also publicly available.
 
 This package is initially developed by the City of Amsterdam, but the tools
 and concepts created in this project can be used in any city.
+
+

django-gisserver-1.3.0/gisserver/__init__.py

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

{django-gisserver-1.2.7 → django-gisserver-1.3.0}/gisserver/output/csv.py

@@ -2,11 +2,10 @@
 from __future__ import annotations
 
 import csv
-from datetime import datetime
+from datetime import datetime, timezone
 
 from django.conf import settings
 from django.db import models
-from django.utils.timezone import utc
 
 from gisserver import conf
 from gisserver.db import (
@@ -137,7 +136,7 @@ class CSVRenderer(OutputRenderer):
                 # Array field
                 append(",".join(map(str, value)))
             elif isinstance(value, datetime):
-                append(str(value.astimezone(utc)))
+                append(str(value.astimezone(timezone.utc)))
             else:
                 append(value)
         return values

{django-gisserver-1.2.7 → django-gisserver-1.3.0}/gisserver/output/geojson.py

@@ -1,5 +1,5 @@
 """Output rendering logic for GeoJSON."""
-from datetime import datetime
+from datetime import datetime, timezone
 from decimal import Decimal
 from typing import cast
 
@@ -8,7 +8,6 @@ from django.conf import settings
 from django.contrib.gis.db.models.functions import AsGeoJSON
 from django.db import models
 from django.utils.functional import Promise
-from django.utils.timezone import utc
 
 from gisserver import conf
 from gisserver.db import get_db_geometry_target
@@ -147,7 +146,7 @@ class GeoJsonRenderer(OutputRenderer):
 
     def _format_geojson_value(self, value):
         if isinstance(value, datetime):
-            return value.astimezone(utc)
+            return value.astimezone(timezone.utc)
         elif isinstance(value, models.Model):
             # ForeignKey, not defined as complex type.
             return str(value)

{django-gisserver-1.2.7 → django-gisserver-1.3.0}/gisserver/output/gml32.py

@@ -7,14 +7,13 @@ from __future__ import annotations
 
 import itertools
 import re
-from datetime import date, datetime, time
+from datetime import date, datetime, time, timezone
 from html import escape
 from typing import cast
 
 from django.contrib.gis import geos
 from django.db import models
 from django.http import HttpResponse
-from django.utils.timezone import utc
 
 from gisserver.db import (
     AsGML,
@@ -306,7 +305,7 @@ class GML32Renderer(OutputRenderer):
             # Expanded foreign relation / dictionary
             return self.render_xml_complex_type(feature_type, xsd_element, value)
         elif isinstance(value, datetime):
-            value = value.astimezone(utc).isoformat()
+            value = value.astimezone(timezone.utc).isoformat()
         elif isinstance(value, (date, time)):
             value = value.isoformat()
         elif isinstance(value, bool):

{django-gisserver-1.2.7 → django-gisserver-1.3.0}/gisserver/output/results.py

@@ -13,7 +13,9 @@ from typing import Iterable
 import django
 from django.db import models
 from django.utils.functional import cached_property
-from django.utils.timezone import now, utc
+from django.utils.timezone import now
+
+from datetime import timezone
 
 from gisserver.features import FeatureType
 from gisserver.geometries import BoundingBox
@@ -218,7 +220,7 @@ class FeatureCollection:
         self.next = next
         self.previous = previous
         self.date = now()
-        self.timestamp = self.date.astimezone(utc).isoformat()
+        self.timestamp = self.date.astimezone(timezone.utc).isoformat()
 
     def get_bounding_box(self) -> BoundingBox:
         """Determine bounding box of all items."""

django-gisserver-1.2.7/gisserver/__init__.py

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