Force release-branch-semver version scheme of setuptools_scm

rpanderson · rpanderson · commit ab1571ac323d · 2020-06-27T18:49:29.000+10:00
diff --git a/labscript_suite/__version__.py b/labscript_suite/__version__.py
@@ -1,19 +1,16 @@
-import os
 from pathlib import Path
+
 try:
     import importlib.metadata as importlib_metadata
 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")
 else:
     try:
         __version__ = importlib_metadata.version(__package__)
diff --git a/pyproject.toml b/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"
diff --git a/setup.cfg b/setup.cfg
@@ -26,7 +26,7 @@ packages = find:
 python_requires = >=3.6
 install_requires =
   importlib_metadata
-  setuptools_scm
+  setuptools_scm>=4.1.0
   blacs>=3.0.0
   labscript>=3.0.0
   labscript-devices>=3.0.0
diff --git a/setup.py b/setup.py
@@ -1,9 +1,4 @@
 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"})
