use git version if no npm version is defined in package/publish scripts

Author: d-biehl

scripts/package.py

@@ -1,11 +1,14 @@
+import os
 from pathlib import Path
 from subprocess import run
 
 from git.repo import Repo
 from semantic_version import Version
 
 
-def get_current_version(repo: Repo) -> Version:
+def get_current_version_from_git() -> Version:
+    repo = Repo(Path.cwd())
+
     result = None
     for tag in repo.tags:
         v = tag.name
@@ -30,9 +33,11 @@ def main() -> None:
     if not dist_path.exists():
         dist_path.mkdir()
 
-    repo = Repo(Path.cwd())
+    if "npm_package_version" in os.environ:
+        current_version = Version(os.environ["npm_package_version"])
+    else:
+        current_version = get_current_version_from_git()
 
-    current_version = get_current_version(repo)
     pre_release = current_version.minor % 2 != 0
 
     run(

scripts/publish.py

@@ -6,7 +6,9 @@
 from semantic_version import Version
 
 
-def get_current_version(repo: Repo) -> Version:
+def get_current_version_from_git() -> Version:
+    repo = Repo(Path.cwd())
+
     result = None
     for tag in repo.tags:
         v = tag.name
@@ -32,9 +34,10 @@ def main() -> None:
     if not dist_path.exists():
         raise FileNotFoundError(f"dist folder '{dist_path}' not exists")
 
-    repo = Repo(Path.cwd())
-
-    current_version = get_current_version(repo)
+    if "npm_package_version" in os.environ:
+        current_version = Version(os.environ["npm_package_version"])
+    else:
+        current_version = get_current_version_from_git()
 
     vsix_path = Path(dist_path, f"robotcode-{current_version}.vsix")
 

scripts/update_versions.py

@@ -11,8 +11,8 @@ def replace_in_file(filename: Path, pattern: "re.Pattern[str]", to: str) -> None
 
 
 def main() -> None:
-    # version = Version(os.environ["npm_package_version"])
-    version = Version("0.7.1")
+    version = Version(os.environ["npm_package_version"])
+
     preview = version.minor % 2 != 0
 
     for f in ["robotcode/_version.py", "pyproject.toml"]: