CI updates

.github/renovate.json5

@@ -18,17 +18,20 @@
   baseBranches: ['release_4', '5.0', '5.1', '5.2', '6.0', 'master'],
   'pre-commit': { enabled: true },
   regexManagers: [
+    /** Do updates on pre-commit additional dependencies */
     {
       fileMatch: ['^\\.pre\\-commit\\-config\\.yaml$'],
       matchStrings: [" +- '?(?<depName>[^' @=]+)(@|==)(?<currentValue>[^' @=]+)'? # (?<datasource>.+)"],
     },
+    /** Do update on the schema present in the ci/config.yaml */
     {
       fileMatch: ['^ci/config\\.yaml$'],
       matchStrings: [
         '.*https://raw\\.githubusercontent\\.com/(?<depName>[^\\s]+)/(?<currentValue>[0-9\\.]+)/.*',
       ],
       datasourceTemplate: 'github-tags',
     },
+    /** Do update on packages update (trigger a rebuild) */
     {
       fileMatch: ['^ci/dpkg\\-versions\\.yaml$'],
       matchStrings: [" *(?<depName>[^'\\s]+): '?(?<currentValue>[^'\\s/]*[0-9][^'\\s/]*)'?"],
@@ -37,17 +40,18 @@
     },
   ],
   packageRules: [
-    /** Automerge the patch, the minor and the dev dependency */
+    /** Auto merge the dev dependency update */
     {
       matchDepTypes: ['devDependencies'],
       automerge: true,
     },
-    /** Group the patch and the minor */
+    /** Group and auto merge the patch updates */
     {
       matchUpdateTypes: ['patch'],
       groupName: 'all patch versions',
       automerge: true,
     },
+    /** Group and auto merge the minor updates */
     {
       matchUpdateTypes: ['minor'],
       groupName: 'all minor versions',
@@ -64,7 +68,7 @@
     },
     /** Accept only the patch on stabilization branches */
     {
-      matchBaseBranches: ['/[0-9]\\..*/', '/release_.*/'],
+      matchBaseBranches: ['/^[0-9]+\\.[0-9]+$/'],
       matchUpdateTypes: ['major', 'minor', 'pin', 'digest', 'lockFileMaintenance', 'rollback', 'bump'],
       enabled: false,
     },
@@ -73,9 +77,18 @@
       matchBaseBranches: ['/[0-9]\\..*/', '/release_.*/'],
       schedule: ['on the 1st day of the month'],
     },
+    /** Support the 4 parts of shellcheck-py version with a v prefix */
     {
       matchPackageNames: ['shellcheck-py/shellcheck-py'],
       versioning: 'regex:^v(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\d+)$',
     },
+    /** Update dpkg versions at any time */
+    {
+      matchBaseBranches: ['/^[0-9]+\\.[0-9]+$/'],
+      matchPaths: ['^ci/dpkg\\-versions\\.yaml$'],
+      schedule: ['at any time'],
+      groupName: 'dpkg',
+      automerge: true,
+    },
   ],
 }

ci/requirements.txt

@@ -5,3 +5,5 @@ pre-commit==3.4.0
 pytest==7.4.2
 scikit-image==0.21.0
 poetry-plugin-tweak-dependencies-version==1.5.1
+poetry-dynamic-versioning==1.1.0
+poetry-plugin-drop-python-upper-constraint==0.1.0

pyproject.toml

@@ -191,7 +191,8 @@ requires = [
   "poetry-core>=1.0.0",
   "poetry-dynamic-versioning[plugin]",
   "poetry-plugin-tweak-dependencies-version",
-  "poetry-plugin-drop-python-upper-constraint"
+  "poetry-plugin-drop-python-upper-constraint",
+  "poetry-dynamic-versioning"
 ]
 build-backend = "poetry.core.masonry.api"
 
@@ -201,7 +202,7 @@ vcs = "git"
 pattern = "^(?P<base>\\d+(\\.\\d+)*)"
 format-jinja = """
 {%- if env.get("VERSION_TYPE") == "version_branch" -%}
-{{serialize_pep440(bump_version(base, 0 if env.get("IS_MASTER") == "TRUE" else 2), dev=distance)}}
+{{serialize_pep440(bump_version(base, 1 if env.get("IS_MASTER") == "TRUE" else 2), dev=distance)}}
 {%- elif distance == 0 -%}
 {{serialize_pep440(base)}}
 {%- else -%}