diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 548b300..10df443 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,8 +15,6 @@ defaults:
env:
PACKAGE_NAME: labscript-suite
- 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_suite/__version__.py b/labscript_suite/__version__.py
index 699955f..681247c 100644
--- 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
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 f78be23..5a99372 100644
--- 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
index 12b22ca..6068493 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,3 @@
-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()
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