more version info #14228

Author: behrisch

CMakeLists.txt

@@ -679,6 +679,7 @@ install(DIRECTORY tools/ DESTINATION ${DATA_PATH}tools
         PATTERN "*.pyc" EXCLUDE
         PATTERN "*.egg-info" EXCLUDE
         PATTERN ".git" EXCLUDE)
+install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/build_config/version.py --sumolib \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${DATA_PATH}tools/sumolib/version.py)")
 if (DATA_PATH)
     install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../../bin \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${DATA_PATH}bin)")
 endif ()
@@ -914,6 +915,7 @@ if (GIT_FOUND)
         COMMAND rm -r sumo-${PACKAGE_VERSION}/tests
         COMMAND cp -a docs/tutorial docs/examples sumo-${PACKAGE_VERSION}/docs
         COMMAND find tools/contributed/saga/ tools/contributed/traci4matlab -type f | grep -v .git | xargs cp --parents --target-dir sumo-${PACKAGE_VERSION}
+        COMMAND ${PYTHON_EXECUTABLE} tools/build_config/version.py --sumolib sumo-${PACKAGE_VERSION}/tools/sumolib/version.py
         COMMAND mkdir sumo-${PACKAGE_VERSION}/include
         COMMAND cp ${CMAKE_BINARY_DIR}/src/version.h sumo-${PACKAGE_VERSION}/include
         COMMAND zip -rq sumo-src-${PACKAGE_VERSION}.zip sumo-${PACKAGE_VERSION}

tools/build_config/version.py

@@ -59,6 +59,13 @@ def create_version_file(versionFile, revision):
         print('#define VERSION_STRING "%s"' % revision, file=f)
 
 
+def filter_sumolib(version_py):
+    with open(version_py) as inf:
+        inp = inf.read()
+    with open(version_py, "w") as outf:
+        outf.write(inp.replace('0.0.0', get_pep440_version()))
+
+
 def filter_setup_py(in_file, out_file):
     with open(in_file) as inf, open(out_file, "w") as outf:
         for line in inf:
@@ -72,7 +79,10 @@ def filter_setup_py(in_file, out_file):
 
 def main():
     if len(sys.argv) > 2:
-        filter_setup_py(sys.argv[1], sys.argv[2])
+        if sys.argv[1] == "--sumolib":
+            filter_sumolib(sys.argv[2])
+        else:
+            filter_setup_py(sys.argv[1], sys.argv[2])
         return
     # determine output file
     if len(sys.argv) > 1:

tools/sumolib/__init__.py

@@ -28,6 +28,7 @@
 # the visualization submodule is not imported to avoid an explicit matplotlib dependency
 from .miscutils import openz
 from .options import pullOptions, ArgumentParser
+from .version import _version as __version__
 from .xml import writeHeader as writeXMLHeader  # noqa
 
 

tools/sumolib/version.py

@@ -25,6 +25,14 @@
 import subprocess
 from os.path import dirname, exists, join
 
+try:
+    # this tries to determine the version number of an installed wheel
+    import importlib.metadata  # noqa
+    _version = importlib.metadata.version("sumolib")
+except ImportError:
+    # this is the fallback version, it gets replaced with the current version on "make install" or "make dist"
+    _version = "0.0.0"
+
 GITDIR = join(dirname(__file__), '..', '..', '.git')
 
 
@@ -48,7 +56,7 @@ def fromVersionHeader():
         version = config.find("VERSION_STRING") + 16
         if version > 16:
             return "v" + config[version:config.find('"\n', version)] + "-" + (10 * "0")
-    raise EnvironmentError("Could not determine version.")
+    return "v" + _version
 
 
 def gitDescribe(commit="HEAD", gitDir=GITDIR, padZero=True):