Skip to content

Commit 9d689bc

Browse files
committed
Update default setuptools_scm version scheme to release-branch-semver.
Copies config from labscript-utils. This fixes half the circular dependency issue between labscript-devices and blacs (ie can now pip install dev labscript-devices properly).
1 parent bdb8c13 commit 9d689bc

File tree

4 files changed

+3
-9
lines changed

4 files changed

+3
-9
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ defaults:
1515

1616
env:
1717
PACKAGE_NAME: labscript-devices
18-
SCM_VERSION_SCHEME: release-branch-semver
1918
SCM_LOCAL_SCHEME: no-local-version
2019
ANACONDA_USER: labscript-suite
2120

labscript_devices/__version__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,10 @@
55
except ImportError:
66
import importlib_metadata
77

8-
VERSION_SCHEME = {
9-
"version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
10-
"local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
11-
}
12-
138
root = Path(__file__).parent.parent
149
if (root / '.git').is_dir():
1510
from setuptools_scm import get_version
16-
__version__ = get_version(root, **VERSION_SCHEME)
11+
__version__ = get_version(root, version_scheme="release-branch-semver")
1712
else:
1813
try:
1914
__version__ = importlib_metadata.version(__package__)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[build-system]
2-
requires = ["setuptools", "wheel", "setuptools_scm"]
2+
requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=4.1.0"]
33
build-backend = "setuptools.build_meta"

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from setuptools import setup
33

44
VERSION_SCHEME = {
5-
"version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
5+
"version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
66
"local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
77
}
88

0 commit comments

Comments
 (0)