Ensure setuptools_scm uses release-branch-semver

dihm · dihm · commit cb7be8861b32 · 2024-02-09T13:43:10.000-05:00
Updates setuptools and setuptools_scm pin in the build.
diff --git a/labscript_suite/__version__.py b/labscript_suite/__version__.py
@@ -1,16 +1,21 @@
+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", "release-branch-semver"),
+    "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="release-branch-semver")
+    __version__ = get_version(root, **VERSION_SCHEME)
 else:
     try:
         __version__ = importlib_metadata.version(__package__)
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,5 @@
 [build-system]
-requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=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
@@ -2,7 +2,7 @@
 from setuptools import setup
 
 VERSION_SCHEME = {
-    "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"),
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`from setuptools import setup`
`3`	`3`
`4`	`4`	`VERSION_SCHEME = {`
`5`		`- "version_scheme": "release-branch-semver",`
	`5`	`+ "version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),`
`6`	`6`	`"local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),`
`7`	`7`	`}`
`8`	`8`