🚀 releasing version 2.1.0 @ 2021-02-05 19:50

[skip ci]

Author: monty-bot

CHANGELOG.md

@@ -13,6 +13,15 @@ This project was forked from version 1.7.4 of [mbed-tools-ci-scripts](https://gi
 
 [//]: # (begin_release_notes)
 
+"2.1.0" (2021-02-05)
+====================
+
+Features
+--------
+
+- Print new version on `cd-generate-news` (#20210205180027)
+
+
 "2.0.1" (2021-02-05)
 ====================
 

continuous_delivery_scripts/_version.py

@@ -10,8 +10,8 @@
 
 This file is autogenerated, do not modify by hand.
 """
-__version__ = "2.0.1"
-COMMIT = "71988b8e886b9f6ee33048accb3ea91d63776645"
+__version__ = "2.1.0"
+COMMIT = "2274b850c0ee1a2f23a2d3e52eab33749cde8c49"
 MAJOR = 2
-MINOR = 0
-PATCH = 1
+MINOR = 1
+PATCH = 0

docs/generate_news.html

@@ -47,12 +47,12 @@ <h1 class="title">Module <code>continuous_delivery_scripts.generate_news</code><
 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
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Dict
 
 logger = logging.getLogger(__name__)
 
 
-def version_project(commit_type: CommitType) -&gt; Tuple[bool, Optional[str]]:
+def version_project(commit_type: CommitType) -&gt; Tuple[bool, Optional[str], Dict[str, str]]:
     &#34;&#34;&#34;Versions the project.
 
     Args:
@@ -63,12 +63,12 @@ <h1 class="title">Module <code>continuous_delivery_scripts.generate_news</code><
         (is new version, the new version)
     &#34;&#34;&#34;
     use_news_files = commit_type in [CommitType.BETA, CommitType.RELEASE]
-    is_new_version, new_version = _calculate_version(commit_type, use_news_files)
+    is_new_version, new_version, version_elements = _calculate_version(commit_type, use_news_files)
     _generate_changelog(new_version, use_news_files)
-    return is_new_version, new_version
+    return is_new_version, new_version, version_elements
 
 
-def _calculate_version(commit_type: CommitType, use_news_files: bool) -&gt; Tuple[bool, Optional[str]]:
+def _calculate_version(commit_type: CommitType, use_news_files: bool) -&gt; Tuple[bool, Optional[str], Dict[str, str]]:
     &#34;&#34;&#34;Calculates the version for the release.
 
     eg. &#34;0.1.2&#34;
@@ -99,13 +99,44 @@ <h1 class="title">Module <code>continuous_delivery_scripts.generate_news</code><
         # Autoversion second returned value is not actually the new version
         # There seem to be a bug in autoversion.
         # This is why the following needs to be done to determine the version
-        for k, v in updates.items():
-            if &#34;version&#34; in str(k).lower():
-                new_version = updates[k]
+        version_elements = _get_version_elements(updates)
+        new_version = version_elements.get(auto_version_tool.Constants.VERSION_FIELD, new_version)
         is_new_version = old != new_version
     logger.info(&#34;:: Determining the new version&#34;)
     logger.info(f&#34;Version: {new_version}&#34;)
-    return is_new_version, new_version
+    return is_new_version, new_version, version_elements
+
+
+def _update_version_string(
+    commit_type: CommitType, new_version: Optional[str], version_elements: Dict[str, str]
+) -&gt; Optional[str]:
+    &#34;&#34;&#34;Updates the version string for development releases.
+
+    Args:
+        commit_type: commit type
+        new_version: the new version
+        version_elements: version elements
+    &#34;&#34;&#34;
+    if commit_type == CommitType.DEVELOPMENT:
+        return &#34;%s-%s.%s&#34; % (
+            new_version,
+            auto_version_tool.config.BUILD_TOKEN,
+            version_elements.get(auto_version_tool.Constants.COMMIT_FIELD),
+        )
+    return new_version
+
+
+def _get_version_elements(native_version_elements: Dict[str, str]) -&gt; Dict[str, str]:
+    &#34;&#34;&#34;Determines the different version elements.
+
+    Args:
+        native_version_elements: native version elements as understood by autoversion
+    &#34;&#34;&#34;
+    return {
+        key: native_version_elements[native]
+        for native, key in auto_version_tool.config.key_aliases.items()
+        if native in native_version_elements
+    }
 
 
 def _generate_changelog(version: Optional[str], use_news_files: bool) -&gt; None:
@@ -135,7 +166,10 @@ <h1 class="title">Module <code>continuous_delivery_scripts.generate_news</code><
     set_log_level(args.verbose)
 
     try:
-        version_project(CommitType.parse(args.release_type))
+        commit_type = CommitType.parse(args.release_type)
+        is_new_version, new_version, version_elements = version_project(commit_type)
+        version_to_print = _update_version_string(commit_type, new_version, version_elements)
+        print(version_to_print)
     except Exception as e:
         log_exception(logger, e)
         sys.exit(1)
@@ -172,14 +206,17 @@ <h2 class="section-title" id="header-functions">Functions</h2>
     set_log_level(args.verbose)
 
     try:
-        version_project(CommitType.parse(args.release_type))
+        commit_type = CommitType.parse(args.release_type)
+        is_new_version, new_version, version_elements = version_project(commit_type)
+        version_to_print = _update_version_string(commit_type, new_version, version_elements)
+        print(version_to_print)
     except Exception as e:
         log_exception(logger, e)
         sys.exit(1)</code></pre>
 </details>
 </dd>
 <dt id="continuous_delivery_scripts.generate_news.version_project"><code class="name flex">
-<span>def <span class="ident">version_project</span></span>(<span>commit_type: <a title="continuous_delivery_scripts.utils.definitions.CommitType" href="utils/definitions.html#continuous_delivery_scripts.utils.definitions.CommitType">CommitType</a>) ‑> Tuple[bool, Union[str, NoneType]]</span>
+<span>def <span class="ident">version_project</span></span>(<span>commit_type: <a title="continuous_delivery_scripts.utils.definitions.CommitType" href="utils/definitions.html#continuous_delivery_scripts.utils.definitions.CommitType">CommitType</a>) ‑> Tuple[bool, Union[str, NoneType], Dict[str, str]]</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Versions the project.</p>
@@ -194,7 +231,7 @@ <h2 id="returns">Returns</h2>
 <summary>
 <span>Expand source code</span>
 </summary>
-<pre><code class="python">def version_project(commit_type: CommitType) -&gt; Tuple[bool, Optional[str]]:
+<pre><code class="python">def version_project(commit_type: CommitType) -&gt; Tuple[bool, Optional[str], Dict[str, str]]:
     &#34;&#34;&#34;Versions the project.
 
     Args:
@@ -205,9 +242,9 @@ <h2 id="returns">Returns</h2>
         (is new version, the new version)
     &#34;&#34;&#34;
     use_news_files = commit_type in [CommitType.BETA, CommitType.RELEASE]
-    is_new_version, new_version = _calculate_version(commit_type, use_news_files)
+    is_new_version, new_version, version_elements = _calculate_version(commit_type, use_news_files)
     _generate_changelog(new_version, use_news_files)
-    return is_new_version, new_version</code></pre>
+    return is_new_version, new_version, version_elements</code></pre>
 </details>
 </dd>
 </dl>

docs/tag_and_release.html

@@ -73,7 +73,7 @@ <h1 class="title">Module <code>continuous_delivery_scripts.tag_and_release</code
 
     &#34;&#34;&#34;
     get_language_specifics().check_credentials()
-    is_new_version, version = version_project(mode)
+    is_new_version, version, _ = version_project(mode)
     logger.info(f&#34;Current version: {version}&#34;)
     if not version:
         raise ValueError(&#34;Undefined version.&#34;)
@@ -252,7 +252,7 @@ <h2 id="args">Args</h2>
 
     &#34;&#34;&#34;
     get_language_specifics().check_credentials()
-    is_new_version, version = version_project(mode)
+    is_new_version, version, _ = version_project(mode)
     logger.info(f&#34;Current version: {version}&#34;)
     if not version:
         raise ValueError(&#34;Undefined version.&#34;)

docs/third_party_IP_report.html

@@ -65,7 +65,7 @@
   </head>
   <body>
     <h1>Project's 3rd party IP report</h1>
-    <p><i>2021-02-05 01:19:20.300205</i></p>
+    <p><i>2021-02-05 19:50:14.421855</i></p>
     <h2>Summary</h2>
     <table>
       <thead>

docs/third_party_IP_report.txt

@@ -1,6 +1,6 @@
                                 3rd party IP report for continuous-delivery-scripts
 
-                                         2021-02-05 01:19:20.300205
+                                         2021-02-05 19:50:14.421855
 
 # Summary:
     Licence compliance: Compliant