From 9eca78caebb2774c17c2c7f93018075d649ad028 Mon Sep 17 00:00:00 2001
From: Yuyutsu Rai <113098086+Yuyuutsu@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:41:43 +0100
Subject: [PATCH 1/2] Schema v5.13.0 (#1510)

---
 .schemas-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.schemas-version b/.schemas-version
index eef4725383..fa75732317 100644
--- a/.schemas-version
+++ b/.schemas-version
@@ -1 +1 @@
-v5.12.0
+v5.13.0

From 90803b161cf53156e392b72705204b0d283e144a Mon Sep 17 00:00:00 2001
From: petechd <53475968+petechd@users.noreply.github.com>
Date: Thu, 12 Sep 2024 08:43:26 +0100
Subject: [PATCH 2/2] Add improvements to dependabot config (#1487)

---
 .github/dependabot.yaml | 103 ++++++++++++++++++++++++++--------------
 pyproject.toml          |   2 +
 2 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 59c374bce8..02ffa2f084 100644
--- a/.github/dependabot.yaml
+++ b/.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" ]
diff --git a/pyproject.toml b/pyproject.toml
index 4626c74241..78b08d89a5 100644
--- a/pyproject.toml
+++ b/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"