From fedc6fab4c9046dbf231a2314b73471cf1737cce Mon Sep 17 00:00:00 2001 From: Federico Stagni Date: Mon, 16 Nov 2026 09:53:31 +0100 Subject: [PATCH 1/2] chore: extend the shared DIRACGrid Renovate config preset --- renovate.json | 101 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 41 deletions(-) diff --git a/renovate.json b/renovate.json index 988ddc1..7178e19 100644 --- a/renovate.json +++ b/renovate.json @@ -1,10 +1,8 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:recommended", - "helpers:pinGitHubActionDigests" + "local>DIRACGrid/.github//renovate-config" ], - "minimumReleaseAge": "7 days", "enabledManagers": [ "pip_requirements", "pep621", @@ -36,12 +34,6 @@ } ], "packageRules": [ - { - "description": "Group all GitHub Actions updates together", - "matchManagers": ["github-actions"], - "groupName": "GitHub Actions", - "labels": ["dependencies", "github-actions"] - }, { "description": "Group all Python dependency updates together", "matchManagers": [ @@ -49,58 +41,85 @@ "pep621" ], "groupName": "Python dependencies", - "labels": ["dependencies", "python"] - }, - { - "description": "Handle major version updates separately", - "matchUpdateTypes": ["major"], - "groupName": "Major version updates", - "labels": ["breaking-change"], - "automerge": false - }, - { - "description": "Handle minor and patch updates together", - "matchUpdateTypes": ["minor", "patch", "pin", "digest"], - "automerge": false - }, - { - "description": "Python version requirements - be conservative", - "matchDatasources": ["pypi"], - "matchUpdateTypes": ["major"], - "minimumReleaseAge": "30 days" + "labels": [ + "dependencies", + "python" + ] }, { "description": "Group build dependencies", - "matchPackagePatterns": ["hatchling", "hatch-vcs"], + "matchPackagePatterns": [ + "hatchling", + "hatch-vcs" + ], "groupName": "Build dependencies", - "labels": ["dependencies", "build"] + "labels": [ + "dependencies", + "build" + ] }, { "description": "Group test dependencies", - "matchPackagePatterns": ["pytest.*", "ty"], + "matchPackagePatterns": [ + "pytest.*", + "ty" + ], "groupName": "Testing dependencies", - "labels": ["dependencies", "testing"] + "labels": [ + "dependencies", + "testing" + ] }, { "description": "Group ARC backend bumps, never mixed with other backends so a red PR names its culprit. Renovate tracks the leading-edge ARG; anchors are human-managed.", - "matchManagers": ["dockerfile", "docker-compose", "custom.regex"], - "matchPackageNames": ["/nordugrid-arc/"], + "matchManagers": [ + "dockerfile", + "docker-compose", + "custom.regex" + ], + "matchPackageNames": [ + "/nordugrid-arc/" + ], "groupName": "ARC backend (integration stack)", - "labels": ["dependencies", "integration-stack", "arc"] + "labels": [ + "dependencies", + "integration-stack", + "arc" + ] }, { "description": "Group HTCondor / HTCondor-CE backend bumps", - "matchManagers": ["dockerfile", "docker-compose", "custom.regex"], - "matchPackageNames": ["/htcondor/"], + "matchManagers": [ + "dockerfile", + "docker-compose", + "custom.regex" + ], + "matchPackageNames": [ + "/htcondor/" + ], "groupName": "HTCondor backend (integration stack)", - "labels": ["dependencies", "integration-stack", "htcondor"] + "labels": [ + "dependencies", + "integration-stack", + "htcondor" + ] }, { "description": "Group Slurm backend bumps", - "matchManagers": ["dockerfile", "docker-compose", "custom.regex"], - "matchPackageNames": ["/slurm/"], + "matchManagers": [ + "dockerfile", + "docker-compose", + "custom.regex" + ], + "matchPackageNames": [ + "/slurm/" + ], "groupName": "Slurm backend (integration stack)", - "labels": ["dependencies", "integration-stack", "slurm"] + "labels": [ + "dependencies", + "integration-stack", + "slurm" + ] } ] } From 4f33b9b2f8af1c0a9e1c415b8d617985dfae1deb Mon Sep 17 00:00:00 2001 From: aldbr Date: Mon, 16 Nov 2026 13:40:07 +0100 Subject: [PATCH 2/2] chore: migrate deprecated Renovate options, keep the 30-day PyPI major cooldown - Restore the 30-day minimumReleaseAge for PyPI majors, which the preset does not provide. - fileMatch -> managerFilePatterns, matchPackagePatterns -> matchPackageNames, top-level python -> packageRule with matchCategories (what :configMigration would otherwise open a PR for). - Match ty and the build tools by exact name: the old pattern "ty" was an unanchored regex that put any package containing "ty" (typing-extensions, ...) in the testing group. Assisted-by: Claude:claude-opus-5-5 --- renovate.json | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/renovate.json b/renovate.json index 7178e19..c9744ea 100644 --- a/renovate.json +++ b/renovate.json @@ -11,9 +11,6 @@ "docker-compose", "custom.regex" ], - "python": { - "rangeStrategy": "auto" - }, "ignorePaths": [ ".pixi/**", "**/__pycache__/**", @@ -24,8 +21,8 @@ { "customType": "regex", "description": "Track pinned backend versions in stack image Dockerfiles via `# renovate:`-annotated ARGs. The datasource/depName/versioning ride in the annotation, so a new stack image needs no renovate.json edit.", - "fileMatch": [ - "(^|/)tests/integration/stacks/_images/.+/Dockerfile$" + "managerFilePatterns": [ + "/(^|/)tests/integration/stacks/_images/.+/Dockerfile$/" ], "matchStrings": [ "# renovate: datasource=(?[a-z-]+?) depName=(?[^\\s]+?)(?: versioning=(?[^\\s]+?))?\\s+ARG [A-Za-z0-9_]+?_VERSION=\"?(?[^\"\\s]+)\"?" @@ -34,6 +31,13 @@ } ], "packageRules": [ + { + "description": "Python rangeStrategy (moved here from the deprecated top-level python option)", + "matchCategories": [ + "python" + ], + "rangeStrategy": "auto" + }, { "description": "Group all Python dependency updates together", "matchManagers": [ @@ -46,9 +50,19 @@ "python" ] }, + { + "description": "Python version requirements - be conservative", + "matchDatasources": [ + "pypi" + ], + "matchUpdateTypes": [ + "major" + ], + "minimumReleaseAge": "30 days" + }, { "description": "Group build dependencies", - "matchPackagePatterns": [ + "matchPackageNames": [ "hatchling", "hatch-vcs" ], @@ -60,8 +74,8 @@ }, { "description": "Group test dependencies", - "matchPackagePatterns": [ - "pytest.*", + "matchPackageNames": [ + "/^pytest/", "ty" ], "groupName": "Testing dependencies",