update dependencies

This commit is contained in:
Laura Klünder 2019-12-09 22:09:57 +01:00
parent 9788c7154c
commit 6f8f725acc
14 changed files with 41 additions and 41 deletions

View file

@ -1,6 +1,6 @@
from functools import wraps from functools import wraps
from rest_framework.generics import GenericAPIView
from rest_framework.generics import GenericAPIView
from rest_framework.renderers import JSONRenderer from rest_framework.renderers import JSONRenderer
from c3nav.mapdata.utils.json import json_encoder_reindent from c3nav.mapdata.utils.json import json_encoder_reindent

View file

@ -87,7 +87,7 @@ def api_etag(permissions=True, etag_func=AccessPermission.etag_func, cache_param
if cache_parameters is not None: if cache_parameters is not None:
for param, type_ in cache_parameters.items(): for param, type_ in cache_parameters.items():
value = int(param in request.GET) if type_ == bool else type_(request.GET.get(param)) 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) data = request_cache.get(cache_key)
if data is not None: if data is not None:
response = Response(data) response = Response(data)

View file

@ -78,7 +78,7 @@ class GeometryField(models.TextField):
'point': (Point, ) 'point': (Point, )
}[self.geomtype] }[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): if not isinstance(value, self.classes):
raise exception('Expected %s instance, got %s instead.' % (' or '.join(c.__name__ for c in self.classes), raise exception('Expected %s instance, got %s instead.' % (' or '.join(c.__name__ for c in self.classes),
repr(value))) repr(value)))

View file

@ -1,8 +1,8 @@
from c3nav.mapdata.models.update import MapUpdate # noqa
from c3nav.mapdata.models.access import AccessRestriction # 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.level import Level # noqa
from c3nav.mapdata.models.geometry.level import Building, Space, Door, AltitudeArea # noqa from c3nav.mapdata.models.locations import Location, LocationGroup, LocationGroupCategory, LocationSlug # 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.source import Source # 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

View file

@ -1,13 +1,13 @@
from django.conf import settings from django.conf import settings
from django.core import checks 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.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.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.stl import STLEngine # noqa
from c3nav.mapdata.render.engines.svg import SVGEngine # noqa from c3nav.mapdata.render.engines.svg import SVGEngine # noqa
from c3nav.mapdata.render.engines.wavefront import WavefrontEngine # noqa
@checks.register() @checks.register()

View file

@ -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.altitudearea import AltitudeAreaGeometries # noqa
from c3nav.mapdata.render.geometry.hybrid import HybridGeometry, hybrid_union # noqa
from c3nav.mapdata.render.geometry.level import LevelGeometries # noqa

View file

@ -1,3 +1,3 @@
requests>=2.19,<2.20 requests==2.22.0
numpy>=1.15,<1.16 numpy==1.17.4
pylibmc>=1.5,<1.6 pylibmc==1.6.1

View file

@ -1,4 +1,4 @@
flake8>=3.5,<3.6 flake8==3.7.9
pycodestyle>=2.3,<2.4 pycodestyle==2.5.0
isort isort
django-debug-toolbar django-debug-toolbar

View file

@ -1 +1 @@
django-htmlmin>=0.10,<0.11 django-htmlmin==0.11.0

View file

@ -1 +1 @@
ModernGL>=5.4,<5.5 ModernGL==5.5.4

View file

@ -1,17 +1,17 @@
Django>=2.1,<2.2 Django==2.2.8
django-bootstrap3>=11.0,<11.1 django-bootstrap3==12.0.0
django-compressor==2.2 django-compressor==2.3
csscompressor csscompressor==0.9.5
djangorestframework>=3.9,<3.10 djangorestframework==3.10.3
django-filter>=2.0,<2.1 django-filter==2.2.0
shapely>=1.6,<1.7 shapely==1.6.4.post2
pybind11>=2.2,<2.3 pybind11==2.4.3
MeshPy>=2018.2,<2018.3 MeshPy==2018.2.1
rtree>=0.8,<0.9 # rtree==0.9.1
celery>=4.2,<4.3 celery==4.3.0
requests>=2.19,<2.20 requests==2.22.0
Pillow>=6.2,<6.3 Pillow==6.2.1
qrcode>=6.0,<6.1 qrcode==6.1
matplotlib>=2.2,<2.3 matplotlib==3.1.2
scipy>=1.1,<1.2 scipy==1.3.3
django_libsass>=0.7,<0.8 django_libsass==0.7

View file

@ -1,2 +1,2 @@
django-redis>=4.9,<4.10 django-redis==4.10.0
redis>=2.10,<2.11 redis==3.3.11

View file

@ -1,2 +1,2 @@
pgi==0.0.11.2 pgi==0.0.11.2
cairocffi>=0.9,<0.10 cairocffi==1.1.0

View file

@ -1 +1 @@
sentry-sdk>=0.6.2,<0.7 sentry-sdk==0.13.5