setup: use setuptools-scm to generate the version

This commit changes the versioning scheme of non-release versions of mkosi to
align with the standard Python version scheme [1]. Unfortunately this scheme is
not fully compatible with the UAPI group version format specification.

Concretely, this changes

    26~devel

to

    25.3.post1.dev244+g0eac3718

The used format ensures that for prereleases the following inequalities still
hold

    25.3 < 25.3.post1.dev244+g0eac3718 < 25.4 < 26

Usage of this new format has the following benefits:

1. It is compatible with PyPI and allows publishing mkosi there in the future

2. Since it contains the number of commits since the last tag as well as part
   of the commit hash in the "local part" of the version, it becomes easier for
   bug reporters to show the version they are on no matter how mkosi has been
   installed.

3. The version no longer needs to be managed in multiple places.

The current implementation moves the version from mkosi/sandbox.py to a new
file _version.py that obtains the version either via importlib metadata (in
case mkosi has been installed) or by calling setuptools-scm directly, to
support the bin/ shims. Since the version is no longer available in
mkosi/sandbox.py, it passed as an environment variable for scripts.

[1] https://packaging.python.org/en/latest/specifications/version-specifiers/

Author: behrmann

mkosi/__init__.py

@@ -27,6 +27,7 @@
 from pathlib import Path
 from typing import Any, Optional, Union, cast
 
+from mkosi._version import __version__
 from mkosi.archive import can_extract_tar, extract_tar, make_cpio, make_tar
 from mkosi.bootloader import (
     efi_boot_binary,
@@ -127,7 +128,6 @@
     MOUNT_ATTR_RDONLY,
     MS_REC,
     MS_SLAVE,
-    __version__,
     acquire_privileges,
     have_effective_cap,
     join_new_session_keyring,
@@ -598,6 +598,7 @@ def run_configure_scripts(config: Config) -> Config:
         SRCDIR="/work/src",
         MKOSI_UID=str(os.getuid()),
         MKOSI_GID=str(os.getgid()),
+        MKOSI_VERSION=__version__,
     )
 
     if config.profiles:
@@ -639,6 +640,7 @@ def run_sync_scripts(config: Config) -> None:
         MKOSI_UID=str(os.getuid()),
         MKOSI_GID=str(os.getgid()),
         MKOSI_CONFIG="/work/config.json",
+        MKOSI_VERSION=__version__,
         CACHED=one_zero(have_cache(config)),
     )
 
@@ -764,6 +766,7 @@ def run_prepare_scripts(context: Context, build: bool) -> None:
         MKOSI_UID=str(os.getuid()),
         MKOSI_GID=str(os.getgid()),
         MKOSI_CONFIG="/work/config.json",
+        MKOSI_VERSION=__version__,
         WITH_DOCS=one_zero(context.config.with_docs),
         WITH_NETWORK=one_zero(context.config.with_network),
         WITH_TESTS=one_zero(context.config.with_tests),
@@ -833,6 +836,7 @@ def run_build_scripts(context: Context) -> None:
         MKOSI_UID=str(os.getuid()),
         MKOSI_GID=str(os.getgid()),
         MKOSI_CONFIG="/work/config.json",
+        MKOSI_VERSION=__version__,
         WITH_DOCS=one_zero(context.config.with_docs),
         WITH_NETWORK=one_zero(context.config.with_network),
         WITH_TESTS=one_zero(context.config.with_tests),
@@ -907,6 +911,7 @@ def run_postinst_scripts(context: Context) -> None:
         MKOSI_UID=str(os.getuid()),
         MKOSI_GID=str(os.getgid()),
         MKOSI_CONFIG="/work/config.json",
+        MKOSI_VERSION=__version__,
         WITH_NETWORK=one_zero(context.config.with_network),
     )
 
@@ -975,6 +980,7 @@ def run_finalize_scripts(context: Context) -> None:
         MKOSI_UID=str(os.getuid()),
         MKOSI_GID=str(os.getgid()),
         MKOSI_CONFIG="/work/config.json",
+        MKOSI_VERSION=__version__,
         WITH_NETWORK=one_zero(context.config.with_network),
     )
 
@@ -1036,6 +1042,7 @@ def run_postoutput_scripts(context: Context) -> None:
         MKOSI_UID=str(os.getuid()),
         MKOSI_GID=str(os.getgid()),
         MKOSI_CONFIG="/work/config.json",
+        MKOSI_VERSION=__version__,
     )
 
     if context.config.profiles:
@@ -4573,6 +4580,7 @@ def run_clean_scripts(config: Config) -> None:
         MKOSI_UID=str(os.getuid()),
         MKOSI_GID=str(os.getgid()),
         MKOSI_CONFIG="/work/config.json",
+        MKOSI_VERSION=__version__,
     )
 
     if config.profiles:

mkosi/_version.py

@@ -0,0 +1,72 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# The __version__ generation here supports the following modes
+# 1. By default the version is obtained von the Python distribution's metadata on installed packages
+# 2. If mkosi has not been installed as a Python package or the metadata pertains to a different mkosi than
+#    is being called the version is
+#    a. obtained from the environment variable MKOSI_VERSION
+#    b. generated from the output of git describe
+#    c. looked up in a static version file from resources
+# 3. If no version can be found, it is set to "0"
+
+import datetime
+import importlib.metadata
+import importlib.resources
+import logging
+import os
+import subprocess
+from importlib.metadata import PackageNotFoundError
+from pathlib import Path
+from typing import Optional
+
+
+def version_from_git() -> Optional[str]:
+    try:
+        p = subprocess.run(
+            ["git", "describe"],
+            cwd=Path(__file__).parent.parent,
+            check=True,
+            text=True,
+            capture_output=True,
+        )
+        # output has form like v25.3-244-g8f491df9 when not on a tag, else just the tag
+        tag, *rest = p.stdout.strip().split("-")
+        tag = tag.lstrip("v")
+        if rest:
+            numcommits, commit = rest
+            return f"{tag}.post1.dev{numcommits}+{commit}.d{datetime.datetime.now():%Y%m%d}"
+
+        # we are exactly on a tag
+        return tag
+    except (subprocess.CalledProcessError, NotADirectoryError, FileNotFoundError):
+        return None
+
+
+def version_from_resources() -> Optional[str]:
+    try:
+        import mkosi.resources
+        from mkosi.util import resource_path
+
+        with resource_path(mkosi.resources) as resources:
+            return (resources / "staticversion").read_text().strip()
+    except (ImportError, FileNotFoundError):
+        return None
+
+
+try:
+    # If the file importlib.metadata things we are talking about is not this on, let's pretend we didn't find
+    # anything at all and fall back
+    mkosi_files = [p for p in importlib.metadata.files("mkosi") or [] if p.name == "_version.py"]
+    if not mkosi_files or os.fspath(mkosi_files[0]) != __file__:
+        raise PackageNotFoundError()
+
+    __version__ = importlib.metadata.version("mkosi")
+except PackageNotFoundError:
+    # This branch means, that mkosi was not installed as a package as Python is aware, this is most likely
+    # the case if mkosi was run via the bin/mkosi shim in mkosi's repository.
+
+    fallback = os.getenv("MKOSI_VERSION") or version_from_git() or version_from_resources() or "0"
+
+    if fallback == "0":
+        logging.warning("Unable to determine mkosi version")
+
+    __version__ = fallback

mkosi/config.py

@@ -30,11 +30,12 @@
 from pathlib import Path
 from typing import Any, Callable, Generic, Optional, TypeVar, Union, cast
 
+from mkosi._version import __version__
 from mkosi.distributions import Distribution, detect_distribution
 from mkosi.log import ARG_DEBUG, ARG_DEBUG_SANDBOX, ARG_DEBUG_SHELL, die
 from mkosi.pager import page
 from mkosi.run import SandboxProtocol, find_binary, nosandbox, run, sandbox_cmd, workdir
-from mkosi.sandbox import Style, __version__
+from mkosi.sandbox import Style
 from mkosi.user import INVOKING_USER
 from mkosi.util import (
     PathString,

mkosi/initrd.py

@@ -14,11 +14,12 @@
 from typing import Optional, cast
 
 import mkosi.resources
+from mkosi._version import __version__
 from mkosi.config import DocFormat, InitrdProfile, OutputFormat
 from mkosi.documentation import show_docs
 from mkosi.log import ARG_DEBUG, ARG_DEBUG_SHELL, log_notice, log_setup
 from mkosi.run import find_binary, run, uncaught_exception_handler
-from mkosi.sandbox import __version__, umask
+from mkosi.sandbox import umask
 from mkosi.tree import copy_tree, move_tree, rmtree
 from mkosi.util import PathString, mandatory_variable, resource_path
 

mkosi/resources/man/mkosi.1.md

@@ -2555,6 +2555,8 @@ Scripts executed by **mkosi** receive the following environment variables:
   current image. This file can be parsed inside scripts to gain access to all
   settings for the current image.
 
+* `$MKOSI_VERSION` is the version string of mkosi.
+
 * `$IMAGE_ID` contains the identifier from the `ImageId=` or `--image-id=` setting.
 
 * `$IMAGE_VERSION` contains the version from the `ImageVersion=` or `--image-version=` setting.
@@ -2589,6 +2591,7 @@ Consult this table for which script receives which environment variables:
 | `MKOSI_UID`                 | ✓           | ✓      | ✓         | ✓       | ✓          | ✓          | ✓            | ✓       |
 | `MKOSI_GID`                 | ✓           | ✓      | ✓         | ✓       | ✓          | ✓          | ✓            | ✓       |
 | `MKOSI_CONFIG`              |             | ✓      | ✓         | ✓       | ✓          | ✓          | ✓            | ✓       |
+| `MKOSI_VERSION`             | ✓           | ✓      | ✓         | ✓       | ✓          | ✓          | ✓            | ✓       |
 | `IMAGE_ID`                  | ✓           | ✓      | ✓         | ✓       | ✓          | ✓          | ✓            | ✓       |
 | `IMAGE_VERSION`             | ✓           | ✓      | ✓         | ✓       | ✓          | ✓          | ✓            | ✓       |
 

mkosi/resources/staticversion

@@ -0,0 +1 @@
+23.3.post0

mkosi/sandbox.py

@@ -13,8 +13,6 @@
 import sys
 import warnings  # noqa: F401 (loaded lazily by os.execvp() which happens too late)
 
-__version__ = "26~devel"
-
 # The following constants are taken from the Linux kernel headers.
 AT_EMPTY_PATH = 0x1000
 AT_FDCWD = -100
@@ -894,8 +892,18 @@ def main() -> None:
             print(HELP, file=sys.stderr)
             sys.exit(0)
         elif arg == "--version":
-            print(__version__, file=sys.stderr)
-            sys.exit(0)
+            try:
+                from mkosi._version import __version__
+
+                print(__version__, file=sys.stderr)
+                sys.exit(0)
+            except ImportError:
+                try:
+                    print(os.environ["MKOSI_VERSION"])
+                    sys.exit(0)
+                except KeyError:
+                    print("Cannot determine version", file=sys.stderr)
+                    sys.exit(1)
         if arg == "--tmpfs":
             fsops.append(TmpfsOperation(argv.pop()))
         elif arg == "--dev":

pyproject.toml

@@ -1,13 +1,13 @@
 [build-system]
-requires = ["setuptools", "setuptools-scm"]
+requires = ["setuptools>=64", "setuptools-scm>=8"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "mkosi"
 authors = [
     {name = "mkosi contributors", email = "[email protected]"},
 ]
-version = "25.3"
+dynamic = ["version"]
 description = "Build Bespoke OS Images"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -47,8 +47,12 @@ packages = [
     "mkosi-tools/**/*",
     "mkosi-vm/**/*",
     "repart/**/*",
+    "staticversion",
 ]
 
+[tool.setuptools_scm]
+version_scheme = "no-guess-dev"
+
 [tool.isort]
 profile = "black"
 include_trailing_comma = true

tools/do-a-release.sh

@@ -13,8 +13,7 @@ if ! git diff-index --quiet HEAD; then
     exit 1
 fi
 
-sed -r -i "s/^version = \".*\"$/version = \"$VERSION\"/" pyproject.toml
-sed -r -i "s/^__version__ = \".*\"$/__version__ = \"$VERSION\"/" mkosi/sandbox.py
+printf "%s\n" "$VERSION" >mkosi/resources/staticversion
 
 git add -p pyproject.toml mkosi
 
@@ -25,8 +24,6 @@ git tag -s "v$VERSION" -m "mkosi $VERSION"
 VERSION_MAJOR=${VERSION%%.*}
 VERSION="$((VERSION_MAJOR + 1))~devel"
 
-sed -r -i "s/^__version__ = \".*\"$/__version__ = \"$VERSION\"/" mkosi/sandbox.py
-
 git add -p mkosi
 
 git commit -m "Bump version to $VERSION"

tools/generate-zipapp.sh

@@ -10,6 +10,11 @@ mkdir -p builddir
 
 cp -r mkosi "${BUILDDIR}/"
 
+# HACK: importlib metadata doesn't seem to be there in a zipapp even if
+# properly installed via pip, so let's patch it in there manually.
+mkosiversion="$(python3 -m mkosi --version)"
+printf '__version__ = "%s"\n' "${mkosiversion#mkosi }" >"${BUILDDIR}/mkosi/resources/staticversion"
+
 python3 -m zipapp \
         -p "/usr/bin/env python3" \
         -o builddir/mkosi \