Merge pull request #5 from ARMmbed/devversion

modify development version to comprise build count

Author: acabarbaye

Pipfile

@@ -23,4 +23,4 @@ pre-commit = "*"
 allow_prereleases = true
 
 [packages]
-continuous-delivery-scripts = {path = "."}
+continuous-delivery-scripts = {editable = true, path = "."}

continuous_delivery_scripts/generate_news.py

@@ -11,6 +11,7 @@
 import subprocess
 from auto_version import auto_version_tool
 from continuous_delivery_scripts.utils.definitions import CommitType
+from continuous_delivery_scripts.utils.git_helpers import LocalProjectRepository
 from continuous_delivery_scripts.utils.configuration import configuration, ConfigurationVariable
 from continuous_delivery_scripts.utils.logging import log_exception, set_log_level
 from continuous_delivery_scripts.utils.filesystem_helpers import cd
@@ -85,12 +86,17 @@ def _update_version_string(
         version_elements: version elements
     """
     if commit_type == CommitType.DEVELOPMENT:
-        return "%s-%s+%s" % (
+        commit_count = version_elements.get(auto_version_tool.Constants.COMMIT_COUNT_FIELD)
+        if not commit_count:
+            with LocalProjectRepository() as git:
+                commit_count = git.get_commit_count()
+        return "%s-%s.%s+%s" % (
             new_version,
             auto_version_tool.config.BUILD_TOKEN,
+            commit_count,
             version_elements.get(auto_version_tool.Constants.COMMIT_FIELD),
         )
-    return new_version
+        return new_version
 
 
 def _get_version_elements(native_version_elements: Dict[str, str]) -> Dict[str, str]:

news/20210716174500.bugfix

@@ -0,0 +1 @@
+Fix development versions so that they can be used by any package managers i.e. pip and npm