Update version scheme

Signed-off-by: Matthew Ballance <matt.ballance@gmail.com>

Author: mballance

.github/workflows/ci.yml

@@ -19,10 +19,8 @@ jobs:
         ./packages/python/bin/python3 -m pip install wheel twine 
         ./packages/python/bin/python3 -m pip install pip setuptools --upgrade
         rm -rf dist build *.egg-info src/*.egg-info
-        sed -i -e "s/version = \"\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\"/version = \"\1.${GITHUB_RUN_ID}\"/" pyproject.toml
-        grep "^version = " pyproject.toml
-        export BUILD_NUM=$GITHUB_RUN_ID
-        echo "BUILD_NUM=${BUILD_NUM}"
+        sed -i -e "s/^SUFFIX = \"\"$/SUFFIX = \".${GITHUB_RUN_ID}\"/" src/ucis/__version__.py
+        grep "^SUFFIX = " src/ucis/__version__.py
         ./packages/python/bin/python3 setup.py bdist_wheel --universal
     - name: Run Tests
       run: |

pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools>=61.0", "setuptools-scm"]
+requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyucis"
-version = "0.1.5"
+dynamic = ["version"]
 authors = [
     {name = "Matthew Ballance", email = "matt.ballance@gmail.com"},
 ]
@@ -53,6 +53,9 @@ Issues = "https://github.com/fvutils/pyucis/issues"
 pyucis = "ucis.__main__:main"
 pyucis-mcp-server = "ucis.mcp.server:main"
 
+[tool.setuptools.dynamic]
+version = {attr = "ucis.__version__._pkg_version"}
+
 [tool.setuptools]
 package-dir = {"" = "src"}
 

src/ucis/__main__.py

@@ -305,6 +305,12 @@ def _launch_tui(args):
     app.run()
 
 def main():
+    # Handle --version/-V before the subcommand parser (which requires a subcommand)
+    if len(sys.argv) == 2 and sys.argv[1] in ("--version", "-V"):
+        from ucis.__version__ import get_version
+        print(get_version())
+        return
+
     # Print skill information at the start
     print_skill_info()
     print()

src/ucis/__version__.py

@@ -0,0 +1,31 @@
+
+BASE = "0.1.5"
+SUFFIX = ""
+
+__version__ = (BASE, SUFFIX)
+
+# Package version string used by pyproject.toml dynamic versioning
+_pkg_version = BASE + SUFFIX
+
+
+def get_version():
+    """Return the full version string, querying git when running from source."""
+    base, suffix = __version__
+    if suffix:
+        return "%s%s" % (base, suffix)
+    # Try to append git commit info when running from a source tree
+    try:
+        import subprocess, os
+        src_dir = os.path.dirname(os.path.dirname(os.path.dirname(
+            os.path.abspath(__file__))))
+        out = subprocess.check_output(
+            ["git", "describe", "--tags", "--dirty", "--always"],
+            cwd=src_dir,
+            stderr=subprocess.DEVNULL,
+        ).decode().strip()
+        # If the tag matches BASE exactly, no suffix needed
+        if out != base:
+            return "%s+%s" % (base, out)
+    except Exception:
+        pass
+    return base