From bf0d2b7009bc5fc59b503ec49cc5218e81614041 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Fri, 9 Feb 2024 13:21:32 -0500 Subject: [PATCH] Ensure setuptools_scm uses `release-branch-semver` Updates setuptools and setuptools_scm pin in the build. --- labscript/__version__.py | 2 +- pyproject.toml | 4 +++- setup.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/labscript/__version__.py b/labscript/__version__.py index 699955f..fa43cee 100644 --- a/labscript/__version__.py +++ b/labscript/__version__.py @@ -6,7 +6,7 @@ import importlib_metadata 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"), } diff --git a/pyproject.toml b/pyproject.toml index e6ca9c7..3a61336 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,5 @@ [build-system] -requires = ["setuptools", "wheel", "setuptools_scm"] +requires = ["setuptools>=64", "wheel", "setuptools_scm>=8"] build-backend = "setuptools.build_meta" + +[tool.setuptools_scm] \ No newline at end of file diff --git a/setup.py b/setup.py index 12b22ca..1ff17d3 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"), }