Merge branch 'dev'

.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.5.0"
+current_version = "2.5.1"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project tries to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.1] - 2024-12-03
+### Changed
+- removed MODEX source for uploads
+
+### Fixed
+- CSV upload
+
 ## [2.5.0] - 2024-12-03
 ### Added
 - databus source to import SEDOS results from databus

django_comparison_dashboard/settings.py

@@ -3,7 +3,7 @@
 import pathlib
 from enum import IntEnum
 
-VERSION = "2.5.0"
+VERSION = "2.5.1"
 
 USE_DUMMY_DATA = os.environ.get("USE_DUMMY_DATA", "False") == "True"
 SKIP_TS = os.environ.get("SKIP_TS", "False") == "True"

django_comparison_dashboard/sources/__init__.py

@@ -1,9 +1,7 @@
 from .core import SourceRegistry
 from .csv import CSVDataSource
 from .databus import DatabusDataSource
-from .modex import ModexDataSource
 
 SOURCES = SourceRegistry()
-SOURCES.register(ModexDataSource)
 SOURCES.register(CSVDataSource)
 SOURCES.register(DatabusDataSource)

django_comparison_dashboard/views.py

@@ -1,4 +1,5 @@
 from io import StringIO
+
 from django.forms.formsets import formset_factory
 from django.http.response import HttpResponse
 from django.shortcuts import render
@@ -83,7 +84,7 @@ def get_chart_and_table_from_request(request, as_html=True) -> tuple:
     chart = chart_function(df, graph_filter_set)
     if as_html:
         table = df.to_html()
-        chart = chart.to_html(config = {'toImageButtonOptions': {'format': 'svg'}})
+        chart = chart.to_html(config={"toImageButtonOptions": {"format": "svg"}})
     else:
         table = df
     return chart, table
@@ -283,7 +284,11 @@ def get_source(self):
 
     def get_form_class(self):
         form = self.get_source().form
-        if scenario_list := self.get_source().list_scenarios():
+        try:
+            scenario_list = self.get_source().list_scenarios()
+        except NotImplementedError:
+            scenario_list = []
+        if scenario_list:
             form.base_fields["scenario_id"].choices = [(scenario.id, scenario.id) for scenario in scenario_list]
         return form
 
@@ -293,4 +298,4 @@ def form_valid(self, form):
         if models.Result.objects.filter(source__name=source.name, name=scenario.id).exists():
             return HttpResponse("Scenario already present in database.")
         scenario.download()
-        return HttpResponse(f"Uploaded scenario '{scenario}'.")
+        return HttpResponse(f"Uploaded scenario '{scenario}'.")

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-comparison-dashboard"
-version = "2.5.0"
+version = "2.5.1"
 description = "Django app to compare scenarios in a dashboard"
 authors = ["Hendrik Huyskens <[email protected]>"]
 license = "MIT"