Merge branch 'dihm/setuptools_scm-fix'

.github/workflows/release.yml

@@ -15,7 +15,6 @@ defaults:
 
 env:
   PACKAGE_NAME: blacs
-  SCM_VERSION_SCHEME: release-branch-semver
   SCM_LOCAL_SCHEME: no-local-version
   ANACONDA_USER: labscript-suite
 

blacs/__version__.py

@@ -5,15 +5,14 @@
 except ImportError:
     import importlib_metadata
 
-VERSION_SCHEME = {
-    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
-    "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
-}
-
 root = Path(__file__).parent.parent
 if (root / '.git').is_dir():
     from setuptools_scm import get_version
-    __version__ = get_version(root, **VERSION_SCHEME)
+    __version__ = get_version(
+        root,
+        version_scheme="release-branch-semver",
+        local_scheme=os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
+    )
 else:
     try:
         __version__ = importlib_metadata.version(__package__)

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools", "wheel", "setuptools_scm"]
+requires = ["setuptools", "wheel", "setuptools_scm>=4.1.0"]
 build-backend = "setuptools.build_meta"

setup.cfg

@@ -29,6 +29,7 @@ install_requires =
   labscript_devices>=3.0.0
   labscript_utils>=3.0.0
   qtutils>=2.3.2
+  setuptools_scm>=4.1.0
   zprocess>=2.14.1
 
 [options.entry_points]

setup.py

@@ -1,9 +1,9 @@
 import os
 from setuptools import setup
 
-VERSION_SCHEME = {
-    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
-    "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
-}
-
-setup(use_scm_version=VERSION_SCHEME)
+setup(
+    use_scm_version={
+        "version_scheme": "release-branch-semver",
+        "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
+    }
+)