Upgrade to Resonant v0.47

.copier-answers.resonant.yml

@@ -1,4 +1,4 @@
-_commit: v0.45.0
+_commit: v0.47.0
 _src_path: gh:kitware-resonant/cookiecutter-resonant
 core_app_name: core
 include_example_code: false

.editorconfig

@@ -7,21 +7,28 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
 
-[*.py]
-indent_size = 4
-max_line_length = 100
+[*.{css,pcss}]
+indent_size = 2
 
 [*.html]
 indent_size = 2
 
-[*.css]
+[*.ini]
+indent_size = 4
+
+[*.{js,ts,vue}]
 indent_size = 2
+max_line_length = 100
 
-[{*.yml,*.yaml}]
+[*.{json,jsonc,json5}]
 indent_size = 2
 
-[*.ini]
+[*.py]
 indent_size = 4
+max_line_length = 100
+
+[*.toml]
+indent_size = 2
 
-[*.sh]
+[*.{yml,yaml}]
 indent_size = 2

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Switch to double quotes
+052ad665aceaf8ef10ffc3eba8111799517e2cae

geoinsight/__init__.py

@@ -1,6 +1,8 @@
 # This project module is imported for us when Django starts. To ensure that Celery app is always
 # defined prior to any shared_task definitions (so those tasks will bind to the app), import
 # the Celery module here for side effects.
+from __future__ import annotations
+
 from .celery import app as _celery_app  # noqa: F401
 
 # Do not import anything else from this file, to avoid interfering with the startup order of the

geoinsight/asgi.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from channels.auth import AuthMiddlewareStack
 from channels.routing import ProtocolTypeRouter, URLRouter
 from django.core.asgi import get_asgi_application
@@ -7,19 +9,19 @@
 
 application = ProtocolTypeRouter(
     {
-        'http': get_asgi_application(),
-        'websocket': AuthMiddlewareStack(
+        "http": get_asgi_application(),
+        "websocket": AuthMiddlewareStack(
             URLRouter(
                 [
                     path(
-                        'ws/analytics/project/<int:project_id>/results/',
+                        "ws/analytics/project/<int:project_id>/results/",
                         AnalyticsConsumer.as_asgi(),
-                        name='analytics-ws',
+                        name="analytics-ws",
                     ),
                     path(
-                        'ws/conversion/',
+                        "ws/conversion/",
                         ConversionConsumer.as_asgi(),
-                        name='conversion-ws',
+                        name="conversion-ws",
                     ),
                 ]
             )

geoinsight/celery.py

@@ -1,8 +1,10 @@
+from __future__ import annotations
+
 from celery import Celery
 
 # Using a string config_source means the worker doesn't have to serialize
 # the configuration object to child processes.
-app = Celery(config_source='django.conf:settings', namespace='CELERY')
+app = Celery(config_source="django.conf:settings", namespace="CELERY")
 
 # Load task modules from all registered Django app configs.
 app.autodiscover_tasks()

geoinsight/core/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.contrib import admin
 
 from geoinsight.core.models import (
@@ -28,113 +30,113 @@
 
 @admin.register(Basemap)
 class BasemapAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name']
+    list_display = ["id", "name"]
 
 
 @admin.register(Project)
 class ProjectAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name']
+    list_display = ["id", "name"]
 
 
 @admin.register(Dataset)
 class DatasetAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'category']
+    list_display = ["id", "name", "category"]
 
 
 @admin.register(FileItem)
 class FileItemAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'dataset', 'chart']
+    list_display = ["id", "name", "dataset", "chart"]
 
 
 @admin.register(Chart)
 class ChartAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'editable']
+    list_display = ["id", "name", "editable"]
 
 
 @admin.register(Layer)
 class LayerAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'dataset']
+    list_display = ["id", "name", "dataset"]
 
 
 @admin.register(LayerFrame)
 class LayerFrameAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'index', 'layer']
+    list_display = ["id", "name", "index", "layer"]
 
 
 @admin.register(LayerStyle)
 class LayerStyleAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'layer']
+    list_display = ["id", "name", "layer"]
 
 
 @admin.register(Colormap)
 class ColormapAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name']
+    list_display = ["id", "name"]
 
 
 @admin.register(ColorConfig)
 class ColorConfigAdmin(admin.ModelAdmin):
-    list_display = ['id', 'style', 'name']
+    list_display = ["id", "style", "name"]
 
 
 @admin.register(ColormapConfig)
 class ColormapConfigAdmin(admin.ModelAdmin):
-    list_display = ['id', 'colormap', 'color_by']
+    list_display = ["id", "colormap", "color_by"]
 
 
 @admin.register(SizeConfig)
 class SizeConfigAdmin(admin.ModelAdmin):
-    list_display = ['id', 'style', 'name']
+    list_display = ["id", "style", "name"]
 
 
 @admin.register(SizeRangeConfig)
 class SizeRangeConfigAdmin(admin.ModelAdmin):
-    list_display = ['id', 'minimum', 'maximum', 'size_by']
+    list_display = ["id", "minimum", "maximum", "size_by"]
 
 
 @admin.register(FilterConfig)
 class FilterConfigAdmin(admin.ModelAdmin):
-    list_display = ['id', 'style', 'filter_by']
+    list_display = ["id", "style", "filter_by"]
 
 
 @admin.register(RasterData)
 class RasterDataAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'source_file']
+    list_display = ["id", "name", "source_file"]
 
 
 @admin.register(VectorData)
 class VectorDataAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'source_file']
+    list_display = ["id", "name", "source_file"]
 
 
 @admin.register(VectorFeature)
 class VectorFeatureAdmin(admin.ModelAdmin):
-    list_display = ['id', 'dataset']
-    list_select_related = ['vector_data__dataset']
+    list_display = ["id", "dataset"]
+    list_select_related = ["vector_data__dataset"]
 
 
 @admin.register(Region)
 class RegionAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'dataset']
+    list_display = ["id", "name", "dataset"]
 
 
 @admin.register(Network)
 class NetworkAdmin(admin.ModelAdmin):
-    list_display = ['id', 'category', 'dataset']
-    list_select_related = ['vector_data__dataset']
+    list_display = ["id", "category", "dataset"]
+    list_select_related = ["vector_data__dataset"]
 
 
 @admin.register(NetworkEdge)
 class NetworkEdgeAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'network', 'dataset']
-    list_select_related = ['network__vector_data__dataset']
+    list_display = ["id", "name", "network", "dataset"]
+    list_select_related = ["network__vector_data__dataset"]
 
 
 @admin.register(NetworkNode)
 class NetworkNodeAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'network', 'dataset']
-    list_select_related = ['network__vector_data__dataset']
+    list_display = ["id", "name", "network", "dataset"]
+    list_select_related = ["network__vector_data__dataset"]
 
 
 @admin.register(TaskResult)
 class TaskResultAdmin(admin.ModelAdmin):
-    list_display = ['id', 'task_type', 'inputs']
+    list_display = ["id", "task_type", "inputs"]

geoinsight/core/apps.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 from django.apps import AppConfig
 
 
 class CoreConfig(AppConfig):
-    name = 'geoinsight.core'
-    verbose_name = 'GeoInsight: Core'
+    name = "geoinsight.core"
+    verbose_name = "GeoInsight: Core"