Skip to content

Commit d4945db

Browse files
monty-botmonty-bot
committed
🚀 releasing version 2.1.1 @ 2021-06-25 17:29
[skip ci]
1 parent 0083d27 commit d4945db

File tree

7 files changed

+60
-53
lines changed

7 files changed

+60
-53
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ This project was forked from version 1.7.4 of [mbed-tools-ci-scripts](https://gi
1313

1414
[//]: # (begin_release_notes)
1515

16+
"2.1.1" (2021-06-25)
17+
====================
18+
19+
Bugfixes
20+
--------
21+
22+
- Retrieve branches (master, beta) from remote repository if they have not yet locally (#202106251705)
23+
24+
1625
"2.1.0" (2021-02-05)
1726
====================
1827

‎continuous_delivery_scripts/_version.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
1111
This file is autogenerated, do not modify by hand.
1212
"""
13-
__version__ = "2.1.0"
14-
COMMIT = "2274b850c0ee1a2f23a2d3e52eab33749cde8c49"
13+
__version__ = "2.1.1"
14+
COMMIT = "0083d2727260383912b7f0d7ed72ee6bd7d1d7f9"
1515
MAJOR = 2
1616
MINOR = 1
17-
PATCH = 0
17+
PATCH = 1

‎docs/third_party_IP_report.csv

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ True,continuous-delivery-scripts,False,https://github.com/ARMmbed/continuous-del
1313
True,cryptography,True,https://github.com/pyca/cryptography,0BSD OR Apache-2.0,Licence is compliant.
1414
True,docutils,True,http://docutils.sourceforge.net/,Python-2.0,Licence is compliant.
1515
True,gitdb,True,https://github.com/gitpython-developers/gitdb,0BSD,Licence is compliant.
16-
True,GitPython,True,https://github.com/gitpython-developers/GitPython,Unknown,Package's licence manually checked: BSD-3-Clause
16+
True,GitPython,True,https://github.com/gitpython-developers/GitPython,0BSD,Licence is compliant.
1717
True,idna,True,https://github.com/kjd/idna,0BSD,Licence is compliant.
1818
True,importlib-metadata,True,https://github.com/python/importlib_metadata,Unknown,Package's licence manually checked: Apache-2.0 or Python-2.0
1919
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
3737
True,Pygments,True,https://pygments.org/,0BSD,Licence is compliant.
3838
True,pyparsing,True,https://github.com/pyparsing/pyparsing/,MIT,Licence is compliant.
3939
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.
40-
True,python-dotenv,True,https://github.com/theskumar/python-dotenv,Unknown,Package's licence manually checked: BSD-3-Clause
40+
True,python-dotenv,True,https://github.com/theskumar/python-dotenv,BSD-3-Clause,Licence is compliant.
4141
True,PyYAML,True,https://pyyaml.org/,MIT,Licence is compliant.
4242
True,rdflib,True,https://github.com/RDFLib/rdflib,BSD-3-Clause,Licence is compliant.
4343
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.
4848
True,s3transfer,True,https://github.com/boto/s3transfer,Apache-2.0,Licence is compliant.
4949
True,SecretStorage,True,https://github.com/mitya57/secretstorage,BSD-1-Clause,Licence is compliant.
5050
True,semver,True,https://github.com/python-semver/python-semver,0BSD,Licence is compliant.
51-
True,setuptools,True,https://github.com/pypa/setuptools,Unknown,Package's licence manually checked: MIT
5251
True,six,True,https://github.com/benjaminp/six,MIT,Licence is compliant.
5352
True,smmap,True,https://github.com/gitpython-developers/smmap,0BSD,Licence is compliant.
5453
True,spdx-tools,True,https://github.com/spdx/tools-python,Apache-2.0,Licence is compliant.
5554
True,toml,True,https://github.com/uiri/toml,MIT,Licence is compliant.
5655
True,towncrier,True,https://github.com/hawkowl/towncrier,MIT,Licence is compliant.
57-
True,tqdm,True,https://github.com/tqdm/tqdm,MPL-2.0,Licence is compliant.
56+
True,tqdm,True,https://tqdm.github.io,MPL-2.0,Licence is compliant.
5857
True,twine,True,https://twine.readthedocs.io/,Unknown,Package's licence manually checked: Apache-2.0
5958
True,typing-extensions,True,https://github.com/python/typing/blob/master/typing_extensions/README.rst,ISC,Package's licence manually checked: PSF-2.0
6059
True,urllib3,True,https://urllib3.readthedocs.io/,MIT,Licence is compliant.

‎docs/third_party_IP_report.html

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</head>
6666
<body>
6767
<h1>Project's 3rd party IP report</h1>
68-
<p><i>2021-02-05 19:50:14.421855</i></p>
68+
<p><i>2021-06-25 17:29:26.804065</i></p>
6969
<h2>Summary</h2>
7070
<table>
7171
<thead>
@@ -339,11 +339,11 @@ <h2>Package licences</h2>
339339
https://github.com/gitpython-developers/GitPython
340340
</td>
341341
<td style="text-align:center">
342-
<span style="color: #ffdf28;">Unknown</span>
342+
<span style="color: ;">0BSD</span>
343343

344344
</td>
345345
<td style="text-align:center">
346-
Package's licence manually checked: BSD-3-Clause
346+
Licence is compliant.
347347
</td>
348348
</tr>
349349
<tr>
@@ -747,11 +747,11 @@ <h2>Package licences</h2>
747747
https://github.com/theskumar/python-dotenv
748748
</td>
749749
<td style="text-align:center">
750-
<span style="color: #ffdf28;">Unknown</span>
750+
<span style="color: ;">BSD-3-Clause</span>
751751

752752
</td>
753753
<td style="text-align:center">
754-
Package's licence manually checked: BSD-3-Clause
754+
Licence is compliant.
755755
</td>
756756
</tr>
757757
<tr>
@@ -923,23 +923,6 @@ <h2>Package licences</h2>
923923
<td style="text-align:center">
924924
Licence is compliant.
925925
</td>
926-
</tr>
927-
<tr>
928-
<td style="text-align:center">✅</td>
929-
<td style="text-align:center">
930-
setuptools
931-
</td>
932-
<td style="text-align:center">Y</td>
933-
<td style="text-align:center">
934-
https://github.com/pypa/setuptools
935-
</td>
936-
<td style="text-align:center">
937-
<span style="color: #ffdf28;">Unknown</span>
938-
939-
</td>
940-
<td style="text-align:center">
941-
Package's licence manually checked: MIT
942-
</td>
943926
</tr>
944927
<tr>
945928
<td style="text-align:center">✅</td>
@@ -1033,7 +1016,7 @@ <h2>Package licences</h2>
10331016
</td>
10341017
<td style="text-align:center">Y</td>
10351018
<td style="text-align:center">
1036-
https://github.com/tqdm/tqdm
1019+
https://tqdm.github.io
10371020
</td>
10381021
<td style="text-align:center">
10391022
<span style="color: ;">MPL-2.0</span>

‎docs/third_party_IP_report.txt

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
3rd party IP report for continuous-delivery-scripts
22

3-
2021-02-05 19:50:14.421855
3+
2021-06-25 17:29:26.804065
44

55
# Summary:
66
Licence compliance: Compliant
@@ -110,8 +110,8 @@
110110
[X] Compliant?
111111
[X] Dependency?
112112
URL: https://github.com/gitpython-developers/GitPython
113-
Licence: Unknown
114-
Licence compliance: Package's licence manually checked: BSD-3-Clause
113+
Licence: 0BSD
114+
Licence compliance: Licence is compliant.
115115

116116
- idna:
117117
[X] Compliant?
@@ -278,8 +278,8 @@
278278
[X] Compliant?
279279
[X] Dependency?
280280
URL: https://github.com/theskumar/python-dotenv
281-
Licence: Unknown
282-
Licence compliance: Package's licence manually checked: BSD-3-Clause
281+
Licence: BSD-3-Clause
282+
Licence compliance: Licence is compliant.
283283

284284
- PyYAML:
285285
[X] Compliant?
@@ -351,13 +351,6 @@
351351
Licence: 0BSD
352352
Licence compliance: Licence is compliant.
353353

354-
- setuptools:
355-
[X] Compliant?
356-
[X] Dependency?
357-
URL: https://github.com/pypa/setuptools
358-
Licence: Unknown
359-
Licence compliance: Package's licence manually checked: MIT
360-
361354
- six:
362355
[X] Compliant?
363356
[X] Dependency?
@@ -396,7 +389,7 @@
396389
- tqdm:
397390
[X] Compliant?
398391
[X] Dependency?
399-
URL: https://github.com/tqdm/tqdm
392+
URL: https://tqdm.github.io
400393
Licence: MPL-2.0
401394
Licence compliance: Licence is compliant.
402395

‎docs/utils/git_helpers.html

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -194,15 +194,23 @@ <h1 class="title">Module <code>continuous_delivery_scripts.utils.git_helpers</co
194194
Returns:
195195
corresponding branch
196196
&#34;&#34;&#34;
197-
return self.get_branch(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))
197+
main = configuration.get_value(ConfigurationVariable.MASTER_BRANCH)
198+
branch = self.get_branch(main)
199+
if branch:
200+
return branch
201+
return self.get_remote_branch(main)
198202

199203
def get_beta_branch(self) -&gt; Any:
200204
&#34;&#34;&#34;Gets the `beta` branch.
201205

202206
Returns:
203207
corresponding branch
204208
&#34;&#34;&#34;
205-
return self.get_branch(configuration.get_value(ConfigurationVariable.BETA_BRANCH))
209+
beta = configuration.get_value(ConfigurationVariable.BETA_BRANCH)
210+
branch = self.get_branch(beta)
211+
if branch:
212+
return branch
213+
return self.get_remote_branch(beta)
206214

207215
def is_release_branch(self, branch_name: Optional[str]) -&gt; bool:
208216
&#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
554562

555563
def list_files_added_on_current_branch(self) -&gt; List[str]:
556564
&#34;&#34;&#34;Returns a list of files changed against master branch.&#34;&#34;&#34;
557-
master_branch_commit = self.repo.commit(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))
565+
master_branch_commit = self.repo.commit(self.get_master_branch())
558566
current_branch_commit = self.repo.commit(self.get_current_branch())
559567
changes = self.get_changes_list(
560568
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>
11551163
Returns:
11561164
corresponding branch
11571165
&#34;&#34;&#34;
1158-
return self.get_branch(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))
1166+
main = configuration.get_value(ConfigurationVariable.MASTER_BRANCH)
1167+
branch = self.get_branch(main)
1168+
if branch:
1169+
return branch
1170+
return self.get_remote_branch(main)
11591171

11601172
def get_beta_branch(self) -&gt; Any:
11611173
&#34;&#34;&#34;Gets the `beta` branch.
11621174

11631175
Returns:
11641176
corresponding branch
11651177
&#34;&#34;&#34;
1166-
return self.get_branch(configuration.get_value(ConfigurationVariable.BETA_BRANCH))
1178+
beta = configuration.get_value(ConfigurationVariable.BETA_BRANCH)
1179+
branch = self.get_branch(beta)
1180+
if branch:
1181+
return branch
1182+
return self.get_remote_branch(beta)
11671183

11681184
def is_release_branch(self, branch_name: Optional[str]) -&gt; bool:
11691185
&#34;&#34;&#34;Checks whether the branch is a `release` branch or not.
@@ -1515,7 +1531,7 @@ <h2 id="args">Args</h2>
15151531

15161532
def list_files_added_on_current_branch(self) -&gt; List[str]:
15171533
&#34;&#34;&#34;Returns a list of files changed against master branch.&#34;&#34;&#34;
1518-
master_branch_commit = self.repo.commit(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))
1534+
master_branch_commit = self.repo.commit(self.get_master_branch())
15191535
current_branch_commit = self.repo.commit(self.get_current_branch())
15201536
changes = self.get_changes_list(
15211537
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>
20562072
Returns:
20572073
corresponding branch
20582074
&#34;&#34;&#34;
2059-
return self.get_branch(configuration.get_value(ConfigurationVariable.BETA_BRANCH))</code></pre>
2075+
beta = configuration.get_value(ConfigurationVariable.BETA_BRANCH)
2076+
branch = self.get_branch(beta)
2077+
if branch:
2078+
return branch
2079+
return self.get_remote_branch(beta)</code></pre>
20602080
</details>
20612081
</dd>
20622082
<dt id="continuous_delivery_scripts.utils.git_helpers.GitWrapper.get_branch"><code class="name flex">
@@ -2288,7 +2308,11 @@ <h2 id="returns">Returns</h2>
22882308
Returns:
22892309
corresponding branch
22902310
&#34;&#34;&#34;
2291-
return self.get_branch(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))</code></pre>
2311+
main = configuration.get_value(ConfigurationVariable.MASTER_BRANCH)
2312+
branch = self.get_branch(main)
2313+
if branch:
2314+
return branch
2315+
return self.get_remote_branch(main)</code></pre>
22922316
</details>
22932317
</dd>
22942318
<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>
24542478
</summary>
24552479
<pre><code class="python">def list_files_added_on_current_branch(self) -&gt; List[str]:
24562480
&#34;&#34;&#34;Returns a list of files changed against master branch.&#34;&#34;&#34;
2457-
master_branch_commit = self.repo.commit(configuration.get_value(ConfigurationVariable.MASTER_BRANCH))
2481+
master_branch_commit = self.repo.commit(self.get_master_branch())
24582482
current_branch_commit = self.repo.commit(self.get_current_branch())
24592483
changes = self.get_changes_list(
24602484
self.get_branch_point(master_branch_commit, current_branch_commit), current_branch_commit, change_type=&#34;a&#34;

‎news/202106251705.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)