Skip to content

Commit

Permalink
Update default setuptools_scm version scheme to release-branch-semver.
Browse files Browse the repository at this point in the history
This fixes the circular dependency issue between blacs and labscript-devices.
  • Loading branch information
dihm committed Apr 2, 2021
1 parent 2bd2aa6 commit feff404
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Expand Up @@ -15,7 +15,6 @@ defaults:

env:
PACKAGE_NAME: blacs
SCM_VERSION_SCHEME: release-branch-semver
SCM_LOCAL_SCHEME: no-local-version
ANACONDA_USER: labscript-suite

Expand Down
7 changes: 1 addition & 6 deletions blacs/__version__.py
Expand Up @@ -5,15 +5,10 @@
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__)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
@@ -1,3 +1,3 @@
[build-system]
requires = ["setuptools", "wheel", "setuptools_scm"]
requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=4.1.0"]
build-backend = "setuptools.build_meta"
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -2,7 +2,7 @@
from setuptools import setup

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

Expand Down

0 comments on commit feff404

Please sign in to comment.