Merge branch 'main' into gtag-testing

.github/dependabot.yaml

@@ -1,9 +1,59 @@
 version: 2
 updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+      day: "friday"
+      time: "08:00"
+      timezone: "Europe/London"
+    labels:
+      - "dependencies"
+      - "github-actions"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+      day: "friday"
+      time: "08:00"
+      timezone: "Europe/London"
+    versioning-strategy: increase-if-necessary
+    labels:
+      - "dependencies"
+      - "node"
+    groups:
+      development-dependencies:
+        dependency-type: "development"
+        patterns:
+          - "@wdio*"
+          - "@babel*"
+          - "eslint*"
+          - "json*"
+          - "jsrsasign*"
+          - "lint-staged*"
+          - "livereload*"
+          - "node-forge*"
+          - "prettier*"
+          - "typescript*"
+          - "uuid*"
+          - "webdriverio*"
+
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+      day: "friday"
+      time: "08:00"
+      timezone: "Europe/London"
+    # Workaround to have two "pip" ecosystems: actively setting "target-branch: main" for one config, and leaving it unset for the other config
+    target-branch: main
+    versioning-strategy: increase-if-necessary
+    labels:
+      - "dependencies"
+      - "python"
+    allow:
+      - dependency-type: "production"
     groups:
       production-dependencies:
         dependency-type: "production"
@@ -38,6 +88,21 @@ updates:
           - "cachetools"
           - "gevent"
           - "babel"
+
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+      day: "friday"
+      time: "08:00"
+      timezone: "Europe/London"
+    versioning-strategy: increase-if-necessary
+    labels:
+      - "dependencies"
+      - "python-dev"
+    allow:
+      - dependency-type: "development"
+    groups:
       development-dependencies:
         dependency-type: "development"
         patterns:
@@ -59,38 +124,6 @@ updates:
           - "black"
           - "djlint"
     ignore:
-      # Temporarily pinned to v2.14.0 - problem for translations found in v2.15.0, see: https://github.com/ONSdigital/eq-questionnaire-runner/pull/1384
+      # "babel" temporarily pinned to v2.14.0 - problem for translations found in v2.15.0, see: https://github.com/ONSdigital/eq-questionnaire-runner/pull/1384
       - dependency-name: "babel"
-        update-types: ["version-update:semver-major", "version-update:semver-minor"]
-      - dependency-name: "pytest*"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "flake8*"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "types*"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "pep8"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "mock"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "jsonschema"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "beautifulsoup4"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "httmock"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "moto"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "freezegun"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "fakeredis"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "mypy"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "responses"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "playwright"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "black"
-        update-types: ["version-update:semver-minor"]
-      - dependency-name: "djlint"
-        update-types: ["version-update:semver-minor"]
+        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]

.schemas-version

@@ -1 +1 @@
-v5.12.0
+v5.13.0

pyproject.toml

@@ -14,6 +14,7 @@ description = "ONS Digital eQ Questionnaire Runner App"
 authors = ["ONSDigital"]
 
 [tool.poetry.group.dev.dependencies]
+# update dependabot.yaml when adding new dependencies
 pep8 = "^1.7.1"
 mock = "^5.1.0"
 pytest-cov = "^5.0.0"
@@ -53,6 +54,7 @@ flake8-quotes = "^3.4.0"
 
 
 [tool.poetry.dependencies]
+# update dependabot.yaml when adding new dependencies
 python = "^3.11.4"
 colorama = "^0.4.6"
 flask = "^3.0.2"