From 786d490e274794edd08dd4dca9318da1213fffd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Fri, 2 Jun 2023 19:42:17 +0200 Subject: [PATCH] update all dependencies so we have some fun new bugs to fix --- src/c3nav/editor/wrappers.py | 4 +-- src/c3nav/mapdata/fields.py | 2 ++ src/c3nav/mapdata/models/geometry/level.py | 2 +- src/requirements/dev.txt | 4 +-- src/requirements/opengl.txt | 2 +- src/requirements/production.txt | 30 +++++++++++----------- src/requirements/redis.txt | 2 +- src/requirements/rsvg.txt | 2 +- src/requirements/sentry.txt | 2 +- 9 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/c3nav/editor/wrappers.py b/src/c3nav/editor/wrappers.py index bb4238af..c8aa1e33 100644 --- a/src/c3nav/editor/wrappers.py +++ b/src/c3nav/editor/wrappers.py @@ -834,7 +834,7 @@ class RelatedManagerWrapper(ManagerWrapper): """ try: return self.instance._prefetched_objects_cache[self._get_cache_name()] - except(AttributeError, KeyError): + except (AttributeError, KeyError): pass return super().all() @@ -877,7 +877,7 @@ class ManyRelatedManagerWrapper(RelatedManagerWrapper): def all(self): try: return self.instance._prefetched_objects_cache[self._get_cache_name()] - except(AttributeError, KeyError): + except (AttributeError, KeyError): pass return super().all() diff --git a/src/c3nav/mapdata/fields.py b/src/c3nav/mapdata/fields.py index 56306b97..06a04cd6 100644 --- a/src/c3nav/mapdata/fields.py +++ b/src/c3nav/mapdata/fields.py @@ -184,6 +184,8 @@ class I18nField(models.JSONField): super().__init__(verbose_name=verbose_name, default=(dict(default) if default else dict), null=False, **kwargs) def get_default(self): + if callable(self.default): + return self.default() return self.default.copy() def deconstruct(self): diff --git a/src/c3nav/mapdata/models/geometry/level.py b/src/c3nav/mapdata/models/geometry/level.py index 2ea7b106..de57666c 100644 --- a/src/c3nav/mapdata/models/geometry/level.py +++ b/src/c3nav/mapdata/models/geometry/level.py @@ -525,7 +525,7 @@ class AltitudeArea(LevelGeometryMixin, models.Model): line = scale(line, xfact=factor, yfact=factor) centroid = line.centroid line = min(assert_multilinestring(space_geom.intersection(line)), - key=lambda l: l.centroid.distance(centroid), default=None) + key=lambda line_: line_.centroid.distance(centroid), default=None) cuts.append(scale(line, xfact=1.01, yfact=1.01)) remaining_space = tuple( diff --git a/src/requirements/dev.txt b/src/requirements/dev.txt index f8b316be..e83b48b2 100644 --- a/src/requirements/dev.txt +++ b/src/requirements/dev.txt @@ -1,4 +1,4 @@ -flake8==4.0.1 -pycodestyle==2.8.0 +flake8==6.0.0 +pycodestyle==2.10.0 isort django-debug-toolbar diff --git a/src/requirements/opengl.txt b/src/requirements/opengl.txt index 71371bda..7de2d9d9 100644 --- a/src/requirements/opengl.txt +++ b/src/requirements/opengl.txt @@ -1 +1 @@ -ModernGL==5.6.4 +ModernGL==5.8.2 diff --git a/src/requirements/production.txt b/src/requirements/production.txt index f4524971..720dd50d 100644 --- a/src/requirements/production.txt +++ b/src/requirements/production.txt @@ -1,18 +1,18 @@ -Django==4.0.3 -django-bootstrap3==21.2 -django-compressor==3.1 +Django==4.2.1 +django-bootstrap3==23.1 +django-compressor==4.3.1 csscompressor==0.9.5 -djangorestframework==3.13.1 -django-filter==21.1 -shapely==1.8.1.post1 -pybind11==2.9.2 -MeshPy==2020.1 +djangorestframework==3.14.0 +django-filter==23.2 +shapely==2.0.1 +pybind11==2.10.4 +MeshPy==2022.1.3 # rtree==0.9.1 -celery==5.2.3 -requests==2.27.1 -Pillow==9.1.0 -qrcode==7.3.1 -matplotlib==3.5.1 -scipy==1.8.0 +celery==5.2.7 +requests==2.31.0 +Pillow==9.5.0 +qrcode==7.4.2 +matplotlib==3.7.1 +scipy==1.10.1 django_libsass==0.9 -channels==3.0.4 +channels==4.0.0 diff --git a/src/requirements/redis.txt b/src/requirements/redis.txt index c4fee00f..857746d0 100644 --- a/src/requirements/redis.txt +++ b/src/requirements/redis.txt @@ -1,2 +1,2 @@ django-redis==5.2.0 -redis==4.2.1 +redis==4.5.5 diff --git a/src/requirements/rsvg.txt b/src/requirements/rsvg.txt index b4b199da..ac9ee0b1 100644 --- a/src/requirements/rsvg.txt +++ b/src/requirements/rsvg.txt @@ -1,2 +1,2 @@ pgi==0.0.11.2 -cairocffi==1.3.0 +cairocffi==1.5.1 diff --git a/src/requirements/sentry.txt b/src/requirements/sentry.txt index c283bd22..f51af528 100644 --- a/src/requirements/sentry.txt +++ b/src/requirements/sentry.txt @@ -1 +1 @@ -sentry-sdk==1.5.8 +sentry-sdk==1.25.0