Skip to content

Commit 570f587

Browse files
committed
1 parent 8aba260 commit 570f587

File tree

5 files changed

+9
-17
lines changed

5 files changed

+9
-17
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ defaults:
1515

1616
env:
1717
PACKAGE_NAME: labscript-utils
18-
SCM_VERSION_SCHEME: release-branch-semver
19-
SCM_LOCAL_SCHEME: no-local-version
2018
ANACONDA_USER: labscript-suite
2119

2220
# Configuration for a package with compiled extensions:

labscript_utils/__version__.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
1-
import os
21
from pathlib import Path
2+
33
try:
44
import importlib.metadata as importlib_metadata
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: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
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"
4+
5+
[tool.setuptools_scm]
6+
version_scheme = "release-branch-semver"
7+
local_scheme = "node-and-date"

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ install_requires =
3131
pyqtgraph>=0.11.0rc0
3232
qtutils>=2.2.3
3333
scipy
34-
setuptools_scm>-4.1.2
34+
setuptools_scm>-4.1.0
3535
zprocess>=2.18.0
3636

3737
[options.extras_require]

setup.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,4 @@ def run(self):
1616
self.copy_file('labscript-suite.pth', path)
1717

1818

19-
VERSION_SCHEME = {
20-
"version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
21-
"local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
22-
}
23-
24-
setup(use_scm_version=VERSION_SCHEME, cmdclass={'develop': develop_command})
19+
setup(cmdclass={'develop': develop_command})

0 commit comments

Comments
 (0)