Merge remote-tracking branch 'skeleton/main' into 16-vm-images

Author: pombredanne

configure.bat

@@ -65,7 +65,7 @@ if "%1" EQU "--dev"    (
     set "CFG_REQUIREMENTS=%DEV_REQUIREMENTS%"
     set CFG_DEV_MODE=1
 )
-if "%1" EQU "--python"(
+if "%1" EQU "--python" (
     echo "The --python option is now DEPRECATED. Use the PYTHON_EXECUTABLE environment"
     echo "variable instead. Run configure --help for details."
     exit /b 0

pyproject.toml

@@ -1,11 +1,11 @@
 [build-system]
-requires = ["setuptools >= 50", "wheel", "setuptools_scm[toml] >= 4"]
+requires = ["setuptools >= 50", "wheel", "setuptools_scm[toml] >= 6"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
 # this is used populated when creating a git archive
 # and when there is .git dir and/or there is no git installed
-fallback_version = "v9999.$Format:%h-%cs$"
+fallback_version = "9999.$Format:%h-%cs$"
 
 [tool.pytest.ini_options]
 norecursedirs = [