WIP

Author: behrmann

mkosi/_staticversion.py

@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
-__version__ = "25.3.post0"
+__version__ = "26.dev0"

mkosi/_version.py

@@ -54,11 +54,12 @@ def version_from_git() -> Optional[str]:
         tag = tag.lstrip("v")
         if rest:
             numcommits, commit = rest
-            return f"{tag}.post1.dev{numcommits}+{commit}.d{datetime.datetime.now():%Y%m%d}"
+            nextmajor = int(tag) + 1
+            return f"{nextmajor}.dev{numcommits}+{commit}.d{datetime.datetime.now():%Y%m%d}"
 
         # we are exactly on a tag
         return tag
-    except (subprocess.CalledProcessError, NotADirectoryError, FileNotFoundError):
+    except (subprocess.CalledProcessError, NotADirectoryError, FileNotFoundError, ValueError):
         return None
 
 

pyproject.toml

@@ -50,9 +50,6 @@ packages = [
     "tmpfiles.d/*",
 ]
 
-[tool.setuptools_scm]
-version_scheme = "no-guess-dev"
-
 [tool.isort]
 profile = "black"
 include_trailing_comma = true

setup.py

@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+from setuptools import setup
+
+from setuptools_scm import ScmVersion
+
+
+def guess_next_major_version(version: ScmVersion) -> str:
+    def _guess_next_major_version(version: ScmVersion) -> str:
+        v, _ = str(version.tag).split(".", maxsplit=1)
+        return f"{int(v) + 1}"
+    return version.format_next_version(_guess_next_major_version, "{guessed}.dev{distance}")
+
+
+setup(use_scm_version={"version_scheme": guess_next_major_version})

tools/do-a-release.sh

@@ -7,14 +7,15 @@ if [ -z "$1" ] ; then
 fi
 
 VERSION="$1"
+VERSION_MAJOR=${VERSION%%.*}
 
 if ! git diff-index --quiet HEAD; then
     echo "Repo has modified files."
     exit 1
 fi
 
 printf '# SPDX-License-Identifier: LGPL-2.1-or-later\n__version__ = "%s"\n' \
-       "${VERSION}.post0" \
+       "$((VERSION_MAJOR + 1)).dev0" \
        >mkosi/_staticversion.py
 
 git add -p pyproject.toml mkosi
@@ -23,7 +24,6 @@ git commit -m "Release $VERSION"
 
 git tag -s "v$VERSION" -m "mkosi $VERSION"
 
-VERSION_MAJOR=${VERSION%%.*}
 VERSION="$((VERSION_MAJOR + 1))~devel"
 
 git add -p mkosi