From feff40466535d242d79f7324651daaa9bdeb709f Mon Sep 17 00:00:00 2001 From: David Meyer Date: Tue, 29 Dec 2020 14:22:20 -0500 Subject: [PATCH 1/2] Update default setuptools_scm version scheme to release-branch-semver. This fixes the circular dependency issue between blacs and labscript-devices. --- .github/workflows/release.yml | 1 - blacs/__version__.py | 7 +------ pyproject.toml | 2 +- setup.py | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 15cd4638..65dc50d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/blacs/__version__.py b/blacs/__version__.py index 699955f3..79833143 100644 --- a/blacs/__version__.py +++ b/blacs/__version__.py @@ -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__) diff --git a/pyproject.toml b/pyproject.toml index e6ca9c75..c72bd8d3 100644 --- a/pyproject.toml +++ b/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" diff --git a/setup.py b/setup.py index 12b22ca2..1ff17d3e 100644 --- a/setup.py +++ b/setup.py @@ -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"), } From 75b10aa80ddf9d4bbc3c223a3ee1758b6b5810a8 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Fri, 2 Apr 2021 13:50:25 -0400 Subject: [PATCH 2/2] Update setup.cfg Adds setuptools-scm with required version. --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 815d189f..8adc86e1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,6 +29,7 @@ install_requires = labscript_devices>=3.0.0 labscript_utils>=3.0.0 qtutils>=2.3.2 + setuptools_scm>=4.1.0 zprocess>=2.14.1 [options.entry_points]