Merge branch 'master' into dependabot/pip/django-reversion-approx-eq-6.0.0

Author: nemesifier

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
             django-version: django~=4.2.0
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
@@ -59,7 +59,7 @@ jobs:
           sudo dpkg-reconfigure man-db
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"

.github/workflows/publiccode-yml-validation.yml

@@ -6,7 +6,7 @@ jobs:
   publiccode_yml_validation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: italia/publiccode-parser-action@v1
         with:
           publiccode: "publiccode.yml"

.github/workflows/pypi.yml

@@ -17,9 +17,9 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.10"
       - name: Install dependencies

openwisp_controller/config/migrations/0061_config_checksum_db.py

@@ -8,16 +8,29 @@ def populate_checksum_db(apps, schema_editor):
     """
     Populate checksum_db field with current checksum values
     for existing Config objects.
+
+    We don't want to change the Config.status when populating this field,
+    hence we use Config.objects.bulk_update() instead of
+    Config.update_status_if_checksum_changed().
     """
     Config = load_model("config", "Config")
+    chunk_size = 100
+    updated_configs = []
     qs = (
         Config.objects.prefetch_related("vpnclient_set", "templates")
         .select_related("device", "device__organization__config_settings")
         .filter(checksum_db__isnull=True)
-        .iterator(chunk_size=100)
+        .iterator(chunk_size=chunk_size)
     )
     for config in qs:
-        config.update_status_if_checksum_changed()
+        config.checksum_db = config.checksum
+        updated_configs.append(config)
+        if len(updated_configs) >= chunk_size:
+            Config.objects.bulk_update(updated_configs, ["checksum_db"])
+            updated_configs = []
+
+    if updated_configs:
+        Config.objects.bulk_update(updated_configs, ["checksum_db"])
 
 
 class Migration(migrations.Migration):

requirements-test.txt

@@ -1,6 +1,6 @@
-pytest-cov~=6.2.1
+pytest-cov~=7.0.0
 openwisp-utils[qa,selenium,channels-test] @ https://github.com/openwisp/openwisp-utils/tarball/1.2
 django_redis~=6.0.0
 mock-ssh-server~=0.9.1
-responses~=0.25.7
+responses~=0.25.8
 psycopg2-binary~=2.9.10

requirements.txt

@@ -15,4 +15,4 @@ scp~=0.15.0
 django-cache-memoize~=0.2.1
 shortuuid~=1.0.13
 netaddr~=1.3.0
-django-import-export~=4.3.9
+django-import-export~=4.3.10