Merge pull request #113 from dihm/setuptools_scm_fix

Ensure setuptools_scm uses `release-branch-semver`
labscript-suite · Feb 9, 2024 · 83cabf8 · 83cabf8
2 parents a175d26 + 9c5d9db
commit 83cabf8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/labscript_devices/__version__.py b/labscript_devices/__version__.py
@@ -10,7 +10,7 @@
     from setuptools_scm import get_version
     __version__ = get_version(
         root,
-        version_scheme="release-branch-semver",
+        version_scheme=os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
         local_scheme=os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
     )
 else:

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,5 @@
 [build-system]
-requires = ["setuptools", "wheel", "setuptools_scm>=4.1.0"]
+requires = ["setuptools>=64", "wheel", "setuptools_scm>=8"]
 build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     use_scm_version={
-        "version_scheme": "release-branch-semver",
+        "version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
         "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
     }
 )