Merge pull request #102 from dihm/setuptools_scm_fix

dihm · web-flow · commit 2ee7de7f8f4d · 2024-02-09T13:38:24.000-05:00
Ensure setuptools_scm uses `release-branch-semver`
diff --git a/blacs/__version__.py b/blacs/__version__.py
@@ -10,7 +10,7 @@
     from setuptools_scm import get_version
     __version__ = get_version(
         root,
-        version_scheme="release-branch-semver",
+        version_scheme=os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
         local_scheme=os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
     )
 else:
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,5 @@
 [build-system]
-requires = ["setuptools", "wheel", "setuptools_scm>=4.1.0"]
+requires = ["setuptools>=64", "wheel", "setuptools_scm>=8"]
 build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     use_scm_version={
-        "version_scheme": "release-branch-semver",
+        "version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
         "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
     }
 )

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`from setuptools_scm import get_version`
`11`	`11`	`__version__ = get_version(`
`12`	`12`	`root,`
`13`		`- version_scheme="release-branch-semver",`
	`13`	`+ version_scheme=os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),`
`14`	`14`	`local_scheme=os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),`
`15`	`15`	`)`
`16`	`16`	`else:`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`setup(`
`5`	`5`	`use_scm_version={`
`6`		`- "version_scheme": "release-branch-semver",`
	`6`	`+ "version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),`
`7`	`7`	`"local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),`
`8`	`8`	`}`
`9`	`9`	`)`