diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 63b4e03..351c460 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,8 +15,6 @@ defaults:
env:
PACKAGE_NAME: labscript-utils
- SCM_VERSION_SCHEME: release-branch-semver
- SCM_LOCAL_SCHEME: no-local-version
ANACONDA_USER: labscript-suite
# Configuration for a package with compiled extensions:
diff --git a/labscript_utils/__version__.py b/labscript_utils/__version__.py
index 414c4b3..f10de68 100644
--- a/labscript_utils/__version__.py
+++ b/labscript_utils/__version__.py
@@ -1,19 +1,14 @@
-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
index e6ca9c7..3a1c62a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,7 @@
[build-system]
-requires = ["setuptools", "wheel", "setuptools_scm"]
+requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=4.1.0"]
build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+version_scheme = "release-branch-semver"
+local_scheme = "node-and-date"
diff --git a/setup.cfg b/setup.cfg
index a7433e0..7c93c95 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,7 +31,7 @@ install_requires =
pyqtgraph>=0.11.0rc0
qtutils>=2.2.3
scipy
- setuptools_scm
+ setuptools_scm>-4.1.0
zprocess>=2.18.0
[options.extras_require]
diff --git a/setup.py b/setup.py
index 66a147b..88857b7 100644
--- a/setup.py
+++ b/setup.py
@@ -16,9 +16,4 @@ def run(self):
self.copy_file('labscript-suite.pth', path)
-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, cmdclass={'develop': develop_command})
+setup(cmdclass={'develop': develop_command})
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy