🚀 releasing version 2.1.1 @ 2021-06-25 17:29

[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.1" (2021-06-25)
+====================
+
+Bugfixes
+--------
+
+- Retrieve branches (master, beta) from remote repository if they have not yet locally (#202106251705)
+
+
 "2.1.0" (2021-02-05)
 ====================
 

continuous_delivery_scripts/_version.py

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

docs/third_party_IP_report.csv

@@ -13,7 +13,7 @@ True,continuous-delivery-scripts,False,https://github.com/ARMmbed/continuous-del
 True,cryptography,True,https://github.com/pyca/cryptography,0BSD OR Apache-2.0,Licence is compliant.
 True,docutils,True,http://docutils.sourceforge.net/,Python-2.0,Licence is compliant.
 True,gitdb,True,https://github.com/gitpython-developers/gitdb,0BSD,Licence is compliant.
-True,GitPython,True,https://github.com/gitpython-developers/GitPython,Unknown,Package's licence manually checked: BSD-3-Clause
+True,GitPython,True,https://github.com/gitpython-developers/GitPython,0BSD,Licence is compliant.
 True,idna,True,https://github.com/kjd/idna,0BSD,Licence is compliant.
 True,importlib-metadata,True,https://github.com/python/importlib_metadata,Unknown,Package's licence manually checked: Apache-2.0 or Python-2.0
 True,incremental,True,https://github.com/twisted/incremental,MIT,Licence is compliant.
@@ -37,7 +37,7 @@ True,pycparser,True,https://github.com/eliben/pycparser,0BSD,Licence is complian
 True,Pygments,True,https://pygments.org/,0BSD,Licence is compliant.
 True,pyparsing,True,https://github.com/pyparsing/pyparsing/,MIT,Licence is compliant.
 True,python-dateutil,True,https://dateutil.readthedocs.io,Unknown,Package's licence manually checked: All contributions after December 1, 2017 released under dual license - either Apache 2.0 License or the BSD 3-Clause License.
-True,python-dotenv,True,https://github.com/theskumar/python-dotenv,Unknown,Package's licence manually checked: BSD-3-Clause
+True,python-dotenv,True,https://github.com/theskumar/python-dotenv,BSD-3-Clause,Licence is compliant.
 True,PyYAML,True,https://pyyaml.org/,MIT,Licence is compliant.
 True,rdflib,True,https://github.com/RDFLib/rdflib,BSD-3-Clause,Licence is compliant.
 True,readme-renderer,True,https://github.com/pypa/readme_renderer,Apache-2.0,Licence is compliant.
@@ -48,13 +48,12 @@ True,rfc3986,True,http://rfc3986.readthedocs.io,Apache-2.0,Licence is compliant.
 True,s3transfer,True,https://github.com/boto/s3transfer,Apache-2.0,Licence is compliant.
 True,SecretStorage,True,https://github.com/mitya57/secretstorage,BSD-1-Clause,Licence is compliant.
 True,semver,True,https://github.com/python-semver/python-semver,0BSD,Licence is compliant.
-True,setuptools,True,https://github.com/pypa/setuptools,Unknown,Package's licence manually checked: MIT
 True,six,True,https://github.com/benjaminp/six,MIT,Licence is compliant.
 True,smmap,True,https://github.com/gitpython-developers/smmap,0BSD,Licence is compliant.
 True,spdx-tools,True,https://github.com/spdx/tools-python,Apache-2.0,Licence is compliant.
 True,toml,True,https://github.com/uiri/toml,MIT,Licence is compliant.
 True,towncrier,True,https://github.com/hawkowl/towncrier,MIT,Licence is compliant.
-True,tqdm,True,https://github.com/tqdm/tqdm,MPL-2.0,Licence is compliant.
+True,tqdm,True,https://tqdm.github.io,MPL-2.0,Licence is compliant.
 True,twine,True,https://twine.readthedocs.io/,Unknown,Package's licence manually checked: Apache-2.0
 True,typing-extensions,True,https://github.com/python/typing/blob/master/typing_extensions/README.rst,ISC,Package's licence manually checked: PSF-2.0
 True,urllib3,True,https://urllib3.readthedocs.io/,MIT,Licence is compliant.

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 19:50:14.421855</i></p>
+    <p><i>2021-06-25 17:29:26.804065</i></p>
     <h2>Summary</h2>
     <table>
       <thead>
@@ -339,11 +339,11 @@ <h2>Package licences</h2>
            https://github.com/gitpython-developers/GitPython
         </td>
         <td style="text-align:center">
-            <span style="color: #ffdf28;">Unknown</span>
+            <span style="color: ;">0BSD</span>
 
         </td>
         <td style="text-align:center">
-           Package's licence manually checked: BSD-3-Clause
+           Licence is compliant.
         </td>
       </tr>
         <tr>
@@ -747,11 +747,11 @@ <h2>Package licences</h2>
            https://github.com/theskumar/python-dotenv
         </td>
         <td style="text-align:center">
-            <span style="color: #ffdf28;">Unknown</span>
+            <span style="color: ;">BSD-3-Clause</span>
 
         </td>
         <td style="text-align:center">
-           Package's licence manually checked: BSD-3-Clause
+           Licence is compliant.
         </td>
       </tr>
         <tr>
@@ -923,23 +923,6 @@ <h2>Package licences</h2>
         <td style="text-align:center">
            Licence is compliant.
         </td>
-      </tr>
-        <tr>
-        <td style="text-align:center">✅</td>
-        <td style="text-align:center">
-           setuptools
-        </td>
-        <td style="text-align:center">Y</td>
-        <td style="text-align:center">
-           https://github.com/pypa/setuptools
-        </td>
-        <td style="text-align:center">
-            <span style="color: #ffdf28;">Unknown</span>
-
-        </td>
-        <td style="text-align:center">
-           Package's licence manually checked: MIT
-        </td>
       </tr>
         <tr>
         <td style="text-align:center">✅</td>
@@ -1033,7 +1016,7 @@ <h2>Package licences</h2>
         </td>
         <td style="text-align:center">Y</td>
         <td style="text-align:center">
-           https://github.com/tqdm/tqdm
+           https://tqdm.github.io
         </td>
         <td style="text-align:center">
             <span style="color: ;">MPL-2.0</span>

docs/third_party_IP_report.txt

@@ -1,6 +1,6 @@
                                 3rd party IP report for continuous-delivery-scripts
 
-                                         2021-02-05 19:50:14.421855
+                                         2021-06-25 17:29:26.804065
 
 # Summary:
     Licence compliance: Compliant
@@ -110,8 +110,8 @@
     [X] Compliant?
     [X] Dependency?
     URL: https://github.com/gitpython-developers/GitPython
-    Licence: Unknown
-    Licence compliance: Package's licence manually checked: BSD-3-Clause
+    Licence: 0BSD
+    Licence compliance: Licence is compliant.
 
 - idna:
     [X] Compliant?
@@ -278,8 +278,8 @@
     [X] Compliant?
     [X] Dependency?
     URL: https://github.com/theskumar/python-dotenv
-    Licence: Unknown
-    Licence compliance: Package's licence manually checked: BSD-3-Clause
+    Licence: BSD-3-Clause
+    Licence compliance: Licence is compliant.
 
 - PyYAML:
     [X] Compliant?
@@ -351,13 +351,6 @@
     Licence: 0BSD
     Licence compliance: Licence is compliant.
 
-- setuptools:
-    [X] Compliant?
-    [X] Dependency?
-    URL: https://github.com/pypa/setuptools
-    Licence: Unknown
-    Licence compliance: Package's licence manually checked: MIT
-
 - six:
     [X] Compliant?
     [X] Dependency?
@@ -396,7 +389,7 @@
 - tqdm:
     [X] Compliant?
     [X] Dependency?
-    URL: https://github.com/tqdm/tqdm
+    URL: https://tqdm.github.io
     Licence: MPL-2.0
     Licence compliance: Licence is compliant.
 

docs/utils/git_helpers.html

@@ -194,15 +194,23 @@ <h1 class="title">Module <code>continuous_delivery_scripts.utils.git_helpers</co
         Returns:
             corresponding branch
         &#34;&#34;&#34;
-        return self.get_branch(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))
+        main = configuration.get_value(ConfigurationVariable.MASTER_BRANCH)
+        branch = self.get_branch(main)
+        if branch:
+            return branch
+        return self.get_remote_branch(main)
 
     def get_beta_branch(self) -&gt; Any:
         &#34;&#34;&#34;Gets the `beta` branch.
 
         Returns:
             corresponding branch
         &#34;&#34;&#34;
-        return self.get_branch(configuration.get_value(ConfigurationVariable.BETA_BRANCH))
+        beta = configuration.get_value(ConfigurationVariable.BETA_BRANCH)
+        branch = self.get_branch(beta)
+        if branch:
+            return branch
+        return self.get_remote_branch(beta)
 
     def is_release_branch(self, branch_name: Optional[str]) -&gt; bool:
         &#34;&#34;&#34;Checks whether the branch is a `release` branch or not.
@@ -554,7 +562,7 @@ <h1 class="title">Module <code>continuous_delivery_scripts.utils.git_helpers</co
 
     def list_files_added_on_current_branch(self) -&gt; List[str]:
         &#34;&#34;&#34;Returns a list of files changed against master branch.&#34;&#34;&#34;
-        master_branch_commit = self.repo.commit(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))
+        master_branch_commit = self.repo.commit(self.get_master_branch())
         current_branch_commit = self.repo.commit(self.get_current_branch())
         changes = self.get_changes_list(
             self.get_branch_point(master_branch_commit, current_branch_commit), current_branch_commit, change_type=&#34;a&#34;
@@ -1155,15 +1163,23 @@ <h2 id="args">Args</h2>
         Returns:
             corresponding branch
         &#34;&#34;&#34;
-        return self.get_branch(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))
+        main = configuration.get_value(ConfigurationVariable.MASTER_BRANCH)
+        branch = self.get_branch(main)
+        if branch:
+            return branch
+        return self.get_remote_branch(main)
 
     def get_beta_branch(self) -&gt; Any:
         &#34;&#34;&#34;Gets the `beta` branch.
 
         Returns:
             corresponding branch
         &#34;&#34;&#34;
-        return self.get_branch(configuration.get_value(ConfigurationVariable.BETA_BRANCH))
+        beta = configuration.get_value(ConfigurationVariable.BETA_BRANCH)
+        branch = self.get_branch(beta)
+        if branch:
+            return branch
+        return self.get_remote_branch(beta)
 
     def is_release_branch(self, branch_name: Optional[str]) -&gt; bool:
         &#34;&#34;&#34;Checks whether the branch is a `release` branch or not.
@@ -1515,7 +1531,7 @@ <h2 id="args">Args</h2>
 
     def list_files_added_on_current_branch(self) -&gt; List[str]:
         &#34;&#34;&#34;Returns a list of files changed against master branch.&#34;&#34;&#34;
-        master_branch_commit = self.repo.commit(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))
+        master_branch_commit = self.repo.commit(self.get_master_branch())
         current_branch_commit = self.repo.commit(self.get_current_branch())
         changes = self.get_changes_list(
             self.get_branch_point(master_branch_commit, current_branch_commit), current_branch_commit, change_type=&#34;a&#34;
@@ -2056,7 +2072,11 @@ <h2 id="returns">Returns</h2>
     Returns:
         corresponding branch
     &#34;&#34;&#34;
-    return self.get_branch(configuration.get_value(ConfigurationVariable.BETA_BRANCH))</code></pre>
+    beta = configuration.get_value(ConfigurationVariable.BETA_BRANCH)
+    branch = self.get_branch(beta)
+    if branch:
+        return branch
+    return self.get_remote_branch(beta)</code></pre>
 </details>
 </dd>
 <dt id="continuous_delivery_scripts.utils.git_helpers.GitWrapper.get_branch"><code class="name flex">
@@ -2288,7 +2308,11 @@ <h2 id="returns">Returns</h2>
     Returns:
         corresponding branch
     &#34;&#34;&#34;
-    return self.get_branch(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))</code></pre>
+    main = configuration.get_value(ConfigurationVariable.MASTER_BRANCH)
+    branch = self.get_branch(main)
+    if branch:
+        return branch
+    return self.get_remote_branch(main)</code></pre>
 </details>
 </dd>
 <dt id="continuous_delivery_scripts.utils.git_helpers.GitWrapper.get_remote_branch"><code class="name flex">
@@ -2454,7 +2478,7 @@ <h2 id="returns">Returns</h2>
 </summary>
 <pre><code class="python">def list_files_added_on_current_branch(self) -&gt; List[str]:
     &#34;&#34;&#34;Returns a list of files changed against master branch.&#34;&#34;&#34;
-    master_branch_commit = self.repo.commit(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))
+    master_branch_commit = self.repo.commit(self.get_master_branch())
     current_branch_commit = self.repo.commit(self.get_current_branch())
     changes = self.get_changes_list(
         self.get_branch_point(master_branch_commit, current_branch_commit), current_branch_commit, change_type=&#34;a&#34;