From 752a106b10f300cdcb67ca1b1a2537fe5070d092 Mon Sep 17 00:00:00 2001
From: Jack Wotherspoon <jackwoth@google.com>
Date: Wed, 10 Apr 2024 15:15:27 -0400
Subject: [PATCH] chore: group nonmajor dep updates and use json5 (#295)

---
 .github/renovate.json  | 25 -------------------------
 .github/renovate.json5 | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 25 deletions(-)
 delete mode 100644 .github/renovate.json
 create mode 100644 .github/renovate.json5

diff --git a/.github/renovate.json b/.github/renovate.json
deleted file mode 100644
index 93f5407..0000000
--- a/.github/renovate.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "extends": [
-    "config:recommended",
-    ":semanticCommitTypeAll(chore)",
-    "helpers:pinGitHubActionDigests"
-  ],
-  "commitMessagePrefix": "deps: ",
-  "ignorePresets": [":semanticPrefixFixDepsChoreOthers"],
-  "ignorePaths": [".kokoro/requirements.txt"],
-  "prConcurrentLimit": 0,
-  "rebaseWhen": "behind-base-branch",
-  "dependencyDashboard": true,
-  "dependencyDashboardLabels": ["type: process"],
-  "semanticCommits": "disabled",
-  "pip_requirements": {
-    "fileMatch": ["requirements-test.txt"]
-  },
-  "packageRules": [
-    {
-      "matchManagers": ["github-actions"],
-      "groupName": "dependencies for github",
-      "commitMessagePrefix": "chore(deps):"
-    }
-  ]
-}
diff --git a/.github/renovate.json5 b/.github/renovate.json5
new file mode 100644
index 0000000..03218ee
--- /dev/null
+++ b/.github/renovate.json5
@@ -0,0 +1,33 @@
+{
+  "extends": [
+    "config:base", // https://docs.renovatebot.com/presets-config/#configbase
+    ":semanticCommits", // https://docs.renovatebot.com/presets-default/#semanticcommits
+    ":ignoreUnstable", // https://docs.renovatebot.com/presets-default/#ignoreunstable
+    "group:allNonMajor", // https://docs.renovatebot.com/presets-group/#groupallnonmajor
+    ":separateMajorReleases", // https://docs.renovatebot.com/presets-default/#separatemajorreleases
+    ":prConcurrentLimitNone", // View complete backlog as PRs. https://docs.renovatebot.com/presets-default/#prconcurrentlimitnone
+  ],
+  "ignorePaths": [".kokoro/requirements.txt"],
+  "rebaseWhen": "behind-base-branch",
+  "dependencyDashboard": true,
+  "dependencyDashboardLabels": ["type: process"],
+  "pip_requirements": {
+    "fileMatch": ["requirements-test.txt"]
+  },
+  "pip_setup": {
+    "fileMatch": ["(^|/)setup\\.py$"]
+  },
+  "packageRules": [
+    {
+      "matchManagers": ["github-actions"],
+      "groupName": "dependencies for github",
+      "commitMessagePrefix": "chore(deps):",
+      "pinDigest": true,
+    },
+    {
+      "groupName": "python-nonmajor",
+      "matchCategories": ["python"],
+      "matchUpdateTypes": ["minor", "patch"],
+    },
+  ],
+}