Skip to content
Snippets Groups Projects
Commit d1e44ab0 authored by Lars Bilke's avatar Lars Bilke
Browse files

[wheel] Fix versioning scheme.

parent 2f3ee741
No related branches found
No related tags found
No related merge requests found
...@@ -9,10 +9,6 @@ requires = [ ...@@ -9,10 +9,6 @@ requires = [
] ]
build-backend = "setuptools.build_meta" build-backend = "setuptools.build_meta"
[tool.setuptools_scm]
# added --abbrev=8 to force consistent length
git_describe_command = "git describe --dirty --tags --long --match \"*[0-9]*\" --abbrev=8"
[tool.pytest.ini_options] [tool.pytest.ini_options]
testpaths = ["Tests"] testpaths = ["Tests"]
norecursedirs = ["Tests/Data"] norecursedirs = ["Tests/Data"]
......
...@@ -35,7 +35,7 @@ if "SETUPTOOLS_SCM_LOCAL_SCHEME" in os.environ: ...@@ -35,7 +35,7 @@ if "SETUPTOOLS_SCM_LOCAL_SCHEME" in os.environ:
cmake_args = [f"--preset {cmake_preset}", "-B ."] cmake_args = [f"--preset {cmake_preset}", "-B ."]
if "SKBUILD_GENERATOR" in os.environ: if "SKBUILD_GENERATOR" in os.environ:
cmake_args.extend(['-G', os.environ["SKBUILD_GENERATOR"]]) cmake_args.extend(["-G", os.environ["SKBUILD_GENERATOR"]])
setup( setup(
name="ogs", name="ogs",
...@@ -58,5 +58,8 @@ setup( ...@@ -58,5 +58,8 @@ setup(
# This would be in line with PEP 440, switch OGS versioning too? # This would be in line with PEP 440, switch OGS versioning too?
"version_scheme": "no-guess-dev", "version_scheme": "no-guess-dev",
"local_scheme": scm_local_scheme, "local_scheme": scm_local_scheme,
# Was in pyproject.toml but it somehow reset the version scheme. Maybe
# it is better to do all scm config here.
"git_describe_command": 'git describe --dirty --tags --long --match "*[0-9]*" --abbrev=8',
}, },
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment