Bump pyyaml to 6.0.1

.github/workflows/automated-tests.yml

@@ -6,8 +6,8 @@ on:
       - 'v*'
       - 'development'
   pull_request:
-    branches:
-      - '!dependabot/'
+    branches-ignore:
+      - 'dependabot/'
 
 jobs:
   # The most verbose and complete job.

docs/reference/changelog.rst

@@ -25,6 +25,12 @@ Current release series
     :depth: 1
 
 
+v5.10.4 - November 2023
+-----------------------
+
+- ``Fixed`` [`#1915 <https://github.com/dsmrreader/dsmr-reader/issues/1915>`_] Pyyaml dependency unavailable.
+
+
 v5.10.3 - February 2023
 -----------------------
 

dsmr_frontend/migrations/0034_mysql_timezone_support.py

@@ -16,8 +16,8 @@ def migrate_forward(apps, schema_editor):
             "SELECT CONVERT_TZ('2020-01-01 00:00:00', 'UTC', 'Europe/Amsterdam')"
         )
 
-    if cursor.fetchone() is not None:
-        return
+        if cursor.fetchone() is not None:
+            return
 
     Notification = apps.get_model("dsmr_frontend", "Notification")
     Notification.objects.create(

dsmrreader/__init__.py

@@ -1,5 +1,5 @@
 from django.utils.version import get_version
 
-VERSION = (5, 10, 3, "final", 0)
+VERSION = (5, 10, 4, "final", 0)
 
 __version__ = get_version(VERSION)

dsmrreader/provisioning/downgrade/v5.10.4.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# Dump for DSMR-reader v5.10.4
+./manage.py migrate dsmr_api 0003_create_api_user
+./manage.py migrate dsmr_backend 0015_backend_restart_required
+./manage.py migrate dsmr_backup 0017_backup_interval_in_days
+./manage.py migrate dsmr_consumption 0021_schedule_quarter_hour_peaks_calculation
+./manage.py migrate dsmr_datalogger 0032_dsmr_extra_device_channel
+./manage.py migrate dsmr_dropbox 0001_schedule_dropbox
+./manage.py migrate dsmr_frontend 0049_alter_notification_options
+./manage.py migrate dsmr_influxdb 0006_influxdb_settings_field_size
+./manage.py migrate dsmr_mindergas 0005_schedule_mindergas_export
+./manage.py migrate dsmr_mqtt 0021_quarter_hour_peak_mqtt
+./manage.py migrate dsmr_notification 0008_dummy_notification_provider
+./manage.py migrate dsmr_pvoutput 0004_pvoutput_setting_refactoring
+./manage.py migrate dsmr_stats 0020_day_statistics_fix_total_gas_consumption_retroactive
+./manage.py migrate dsmr_weather 0006_schedule_weather_update

dsmrreader/provisioning/requirements/base.txt

@@ -20,6 +20,6 @@ pyserial-asyncio==0.6
 python-dateutil==2.8.2
 python-decouple==3.7
 pytz==2022.7.1
-pyyaml==6.0
+pyyaml==6.0.1
 requests==2.28.2
 urllib3==1.26.14