update dependencies

src/c3nav/mapdata/api.py

@@ -87,7 +87,7 @@ def api_etag(permissions=True, etag_func=AccessPermission.etag_func, cache_param
                 if cache_parameters is not None:
                     for param, type_ in cache_parameters.items():
                         value = int(param in request.GET) if type_ == bool else type_(request.GET.get(param))
-                        cache_key += ':'+urlsafe_base64_encode(str(value).encode()).decode()
+                        cache_key += ':'+urlsafe_base64_encode(str(value).encode())
                 data = request_cache.get(cache_key)
                 if data is not None:
                     response = Response(data)

src/c3nav/mapdata/fields.py

@@ -78,7 +78,7 @@ class GeometryField(models.TextField):
             'point': (Point, )
         }[self.geomtype]
 
-    def _validate_geomtype(self, value, exception: typing.Type[Exception]=ValidationError):
+    def _validate_geomtype(self, value, exception: typing.Type[Exception] = ValidationError):
         if not isinstance(value, self.classes):
             raise exception('Expected %s instance, got %s instead.' % (' or '.join(c.__name__ for c in self.classes),
                                                                        repr(value)))

src/c3nav/mapdata/models/__init__.py

@@ -1,8 +1,8 @@
-from c3nav.mapdata.models.update import MapUpdate  # noqa
 from c3nav.mapdata.models.access import AccessRestriction  # noqa
+from c3nav.mapdata.models.geometry.level import AltitudeArea, Building, Door, Space  # noqa
+from c3nav.mapdata.models.geometry.space import AltitudeMarker, Area, Hole, LineObstacle, Obstacle, Stair  # noqa
+from c3nav.mapdata.models.graph import GraphEdge, GraphNode, WayType  # noqa
 from c3nav.mapdata.models.level import Level  # noqa
-from c3nav.mapdata.models.geometry.level import Building, Space, Door, AltitudeArea  # noqa
-from c3nav.mapdata.models.geometry.space import Area, Stair, Obstacle, LineObstacle, Hole, AltitudeMarker  # noqa
-from c3nav.mapdata.models.locations import Location, LocationSlug, LocationGroup, LocationGroupCategory  # noqa
+from c3nav.mapdata.models.locations import Location, LocationGroup, LocationGroupCategory, LocationSlug  # noqa
 from c3nav.mapdata.models.source import Source  # noqa
-from c3nav.mapdata.models.graph import GraphNode, WayType, GraphEdge  # noqa
+from c3nav.mapdata.models.update import MapUpdate  # noqa

src/c3nav/mapdata/render/engines/__init__.py

@@ -1,13 +1,13 @@
 from django.conf import settings
 from django.core import checks
 
-from c3nav.mapdata.render.engines.base import register_engine, get_engine, get_engine_filetypes  # noqa
+from c3nav.mapdata.render.engines.base import get_engine, get_engine_filetypes, register_engine  # noqa
 from c3nav.mapdata.render.engines.blender import BlenderEngine  # noqa
-from c3nav.mapdata.render.engines.openscadold import OldOpenSCADEngine  # noqa
 from c3nav.mapdata.render.engines.openscad import OpenSCADEngine  # noqa
-from c3nav.mapdata.render.engines.wavefront import WavefrontEngine  # noqa
+from c3nav.mapdata.render.engines.openscadold import OldOpenSCADEngine  # noqa
 from c3nav.mapdata.render.engines.stl import STLEngine  # noqa
 from c3nav.mapdata.render.engines.svg import SVGEngine  # noqa
+from c3nav.mapdata.render.engines.wavefront import WavefrontEngine  # noqa
 
 
 @checks.register()

src/c3nav/mapdata/render/geometry/__init__.py

@@ -1,3 +1,3 @@
-from c3nav.mapdata.render.geometry.hybrid import hybrid_union, HybridGeometry  # noqa
-from c3nav.mapdata.render.geometry.level import LevelGeometries  # noqa
 from c3nav.mapdata.render.geometry.altitudearea import AltitudeAreaGeometries  # noqa
+from c3nav.mapdata.render.geometry.hybrid import HybridGeometry, hybrid_union  # noqa
+from c3nav.mapdata.render.geometry.level import LevelGeometries  # noqa