update dependencies and update docker image to python 3.10

upgrade django to 4.2

Author: maexled

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-alpine
+FROM python:3.10-alpine
 
 WORKDIR /app
 

pim/settings.py

@@ -76,7 +76,11 @@
 STATIC_URL = '/static/'
 STATICFILES_DIRS = [BASE_DIR / "static"]
 STATIC_ROOT = BASE_DIR / "staticfiles"
-STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
+STORAGES = {
+    "staticfiles": {
+        "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
+    },
+}
 
 ROOT_URLCONF = 'pim.urls'
 

requirements.txt

@@ -1,12 +1,12 @@
-django==4.1.10
-django-widget-tweaks==1.4.12
-djangorestframework==3.13.1
-django-cors-headers==3.13.0
-django-debug-toolbar==4.1.0
-whitenoise==6.3.0
+django==4.2.5
+django-widget-tweaks==1.5.0
+djangorestframework==3.14.0
+django-cors-headers==4.2.0
+django-debug-toolbar==4.2.0
+whitenoise==6.5.0
 mysqlclient==2.1.0
-psycopg2==2.9.5
+psycopg2==2.9.7
 requests==2.31.0
 
 ## for testing
-beautifulsoup4==4.11.1
+beautifulsoup4==4.12.2

shelly3em_rest/views.py

@@ -65,7 +65,7 @@ def device_results(request, id):
     end_param = request.GET.get('end', timezone.now())
 
     results = Shelly3EMResult.objects.filter(
-        device_id=device, date__range=[start_param, end_param]).prefetch_related('emeters')
+        device_id=device, date__range=[start_param, end_param]).order_by('date').prefetch_related('emeters')
 
     average_power = (
         results