Skip to content

Commit a05ef0b

Browse files
committed
🚀 releasing version 1.7.1 @ 2020-04-30 11:35
[skip ci]
1 parent f3ecd26 commit a05ef0b

File tree

10 files changed

+52
-27
lines changed

10 files changed

+52
-27
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,21 @@ beta releases are not included in this history. For a full list of all releases,
1111

1212
[//]: # (begin_release_notes)
1313

14+
"1.7.1" (2020-04-30)
15+
====================
16+
17+
Bugfixes
18+
--------
19+
20+
- Tested on Python 3.8. (#20200429)
21+
22+
23+
Misc
24+
----
25+
26+
- #20200429
27+
28+
1429
"1.7.0" (2020-04-24)
1530
====================
1631

docs/spdx_report/spdx_document.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ <h1 class="title">Module <code>mbed_tools_ci_scripts.spdx_report.spdx_document</
105105
def _generate_namespace(self) -&gt; str:
106106
&#34;&#34;&#34;Generates a document namespace.&#34;&#34;&#34;
107107
if self._is_dependency:
108-
url_base = f&#34;http://spdx.org/spdxdocs&#34;
108+
url_base = &#34;http://spdx.org/spdxdocs&#34;
109109
uuid = generate_uuid_based_on_str(self.document_name)
110110
return f&#34;{url_base}/{self.document_name}-{uuid}&#34;
111111
return get_project_namespace(self._project_config, self.document_name)
@@ -354,7 +354,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
354354
def _generate_namespace(self) -&gt; str:
355355
&#34;&#34;&#34;Generates a document namespace.&#34;&#34;&#34;
356356
if self._is_dependency:
357-
url_base = f&#34;http://spdx.org/spdxdocs&#34;
357+
url_base = &#34;http://spdx.org/spdxdocs&#34;
358358
uuid = generate_uuid_based_on_str(self.document_name)
359359
return f&#34;{url_base}/{self.document_name}-{uuid}&#34;
360360
return get_project_namespace(self._project_config, self.document_name)

docs/spdx_report/spdx_helpers.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ <h2 id="examples">Examples</h2>
132132
&#34;&#34;&#34;Determines the project namespace from configuration.&#34;&#34;&#34;
133133
with open(str(project_config_path), &#34;r&#34;, encoding=&#34;utf8&#34;) as f:
134134
config = toml.load(f).get(THIRD_PARTY_CONFIG_NAMESPACE, dict())
135-
protocol = f&#34;http://&#34;
135+
protocol = &#34;http://&#34;
136136
path_part = f&#39;{config.get(&#34;CreatorWebsite&#34;)}/{config.get(&#34;PathToSpdx&#34;)}&#39;
137137
name_part = f&#39;{document_name}-{config.get(&#34;UUID&#34;)}&#39;
138138
return f&#34;{protocol}{path_part}/{name_part}&#34;
@@ -330,7 +330,7 @@ <h2 id="returns">Returns</h2>
330330
&#34;&#34;&#34;Determines the project namespace from configuration.&#34;&#34;&#34;
331331
with open(str(project_config_path), &#34;r&#34;, encoding=&#34;utf8&#34;) as f:
332332
config = toml.load(f).get(THIRD_PARTY_CONFIG_NAMESPACE, dict())
333-
protocol = f&#34;http://&#34;
333+
protocol = &#34;http://&#34;
334334
path_part = f&#39;{config.get(&#34;CreatorWebsite&#34;)}/{config.get(&#34;PathToSpdx&#34;)}&#39;
335335
name_part = f&#39;{document_name}-{config.get(&#34;UUID&#34;)}&#39;
336336
return f&#34;{protocol}{path_part}/{name_part}&#34;</code></pre>

docs/tag_and_release.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ <h1 class="title">Module <code>mbed_tools_ci_scripts.tag_and_release</code></h1>
124124
with ProjectTempClone(desired_branch_name=current_branch) as git:
125125
git.configure_for_github()
126126
time_str = datetime.datetime.utcnow().strftime(&#34;%Y-%m-%d %H:%M&#34;)
127-
commit_message = f&#34;🚀 releasing version {version} @ {time_str}&#34; if is_new_version else f&#34;📰 Automatic changes ⚙&#34;
127+
commit_message = f&#34;🚀 releasing version {version} @ {time_str}&#34; if is_new_version else &#34;📰 Automatic changes ⚙&#34;
128128
if mode == CommitType.RELEASE:
129129
_commit_release_changes(git, version, commit_message)
130130
if is_new_version:
131-
logger.info(f&#34;Tagging commit&#34;)
131+
logger.info(&#34;Tagging commit&#34;)
132132
git.create_tag(version, message=f&#34;release {version}&#34;)
133133
git.force_push_tag()
134134

docs/third_party_IP_report.html

Lines changed: 1 addition & 1 deletion
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>2020-04-24 16:02:27.193747</i></p>
68+
<p><i>2020-04-30 11:35:39.777276</i></p>
6969
<h2>Summary</h2>
7070
<table>
7171
<thead>

docs/third_party_IP_report.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
3rd party IP report for mbed-tools-ci-scripts
22

3-
2020-04-24 16:02:27.193747
3+
2020-04-30 11:35:39.777276
44

55
# Summary:
66
Licence compliance: Compliant

docs/utils/third_party_licences.html

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,12 @@ <h1 class="title">Module <code>mbed_tools_ci_scripts.utils.third_party_licences<
160160
self.load()
161161
if not self._licence_store or not self._licence_list:
162162
return None
163-
matching_licences = [l for l in self._licence_list if licence_descriptor_pattern.match(l)]
164-
return [cast(Licence, self._licence_store.get(l)) for l in matching_licences] if matching_licences else None
163+
matching_licences = [licence for licence in self._licence_list if licence_descriptor_pattern.match(licence)]
164+
return (
165+
[cast(Licence, self._licence_store.get(licence)) for licence in matching_licences]
166+
if matching_licences
167+
else None
168+
)
165169

166170
def get_licence(self, licence_descriptor: Optional[str]) -&gt; Optional[Licence]:
167171
&#34;&#34;&#34;Determines the licence based on a string descriptor e.g. Apache 2.&#34;&#34;&#34;
@@ -249,8 +253,8 @@ <h1 class="title">Module <code>mbed_tools_ci_scripts.utils.third_party_licences<
249253
def determine_whether_licence_expression_is_compliant(licence_expression: str, licence_list: list) -&gt; bool:
250254
&#34;&#34;&#34;Checks whether an expression is compliant with a list of licences.&#34;&#34;&#34;
251255
licensing_util = Licensing()
252-
for l in licence_list:
253-
if licensing_util.contains(licence_expression, l):
256+
for licence in licence_list:
257+
if licensing_util.contains(licence_expression, licence):
254258
return True
255259
return False
256260

@@ -262,9 +266,9 @@ <h1 class="title">Module <code>mbed_tools_ci_scripts.utils.third_party_licences<
262266

263267
def is_licence_accepted(licence_expression: str) -&gt; bool:
264268
&#34;&#34;&#34;Determines whether the licence expressed is valid with regards to project&#39;s accepted licences.&#34;&#34;&#34;
265-
authorised_licences = [l.identifier for l in get_allowed_opensource_licences()]
269+
authorised_licences = [licence.identifier for licence in get_allowed_opensource_licences()]
266270
is_or = _is_expression_or(licence_expression)
267-
if bool([l for l in determine_licences_not_in_list(licence_expression, iter(authorised_licences))]):
271+
if bool([licence for licence in determine_licences_not_in_list(licence_expression, iter(authorised_licences))]):
268272
return (
269273
determine_whether_licence_expression_is_compliant(licence_expression, authorised_licences)
270274
if is_or
@@ -390,8 +394,8 @@ <h2 class="section-title" id="header-functions">Functions</h2>
390394
<pre><code class="python">def determine_whether_licence_expression_is_compliant(licence_expression: str, licence_list: list) -&gt; bool:
391395
&#34;&#34;&#34;Checks whether an expression is compliant with a list of licences.&#34;&#34;&#34;
392396
licensing_util = Licensing()
393-
for l in licence_list:
394-
if licensing_util.contains(licence_expression, l):
397+
for licence in licence_list:
398+
if licensing_util.contains(licence_expression, licence):
395399
return True
396400
return False</code></pre>
397401
</details>
@@ -423,9 +427,9 @@ <h2 class="section-title" id="header-functions">Functions</h2>
423427
</summary>
424428
<pre><code class="python">def is_licence_accepted(licence_expression: str) -&gt; bool:
425429
&#34;&#34;&#34;Determines whether the licence expressed is valid with regards to project&#39;s accepted licences.&#34;&#34;&#34;
426-
authorised_licences = [l.identifier for l in get_allowed_opensource_licences()]
430+
authorised_licences = [licence.identifier for licence in get_allowed_opensource_licences()]
427431
is_or = _is_expression_or(licence_expression)
428-
if bool([l for l in determine_licences_not_in_list(licence_expression, iter(authorised_licences))]):
432+
if bool([licence for licence in determine_licences_not_in_list(licence_expression, iter(authorised_licences))]):
429433
return (
430434
determine_whether_licence_expression_is_compliant(licence_expression, authorised_licences)
431435
if is_or
@@ -555,8 +559,12 @@ <h2 class="section-title" id="header-classes">Classes</h2>
555559
self.load()
556560
if not self._licence_store or not self._licence_list:
557561
return None
558-
matching_licences = [l for l in self._licence_list if licence_descriptor_pattern.match(l)]
559-
return [cast(Licence, self._licence_store.get(l)) for l in matching_licences] if matching_licences else None
562+
matching_licences = [licence for licence in self._licence_list if licence_descriptor_pattern.match(licence)]
563+
return (
564+
[cast(Licence, self._licence_store.get(licence)) for licence in matching_licences]
565+
if matching_licences
566+
else None
567+
)
560568

561569
def get_licence(self, licence_descriptor: Optional[str]) -&gt; Optional[Licence]:
562570
&#34;&#34;&#34;Determines the licence based on a string descriptor e.g. Apache 2.&#34;&#34;&#34;
@@ -602,8 +610,12 @@ <h3>Methods</h3>
602610
self.load()
603611
if not self._licence_store or not self._licence_list:
604612
return None
605-
matching_licences = [l for l in self._licence_list if licence_descriptor_pattern.match(l)]
606-
return [cast(Licence, self._licence_store.get(l)) for l in matching_licences] if matching_licences else None</code></pre>
613+
matching_licences = [licence for licence in self._licence_list if licence_descriptor_pattern.match(licence)]
614+
return (
615+
[cast(Licence, self._licence_store.get(licence)) for licence in matching_licences]
616+
if matching_licences
617+
else None
618+
)</code></pre>
607619
</details>
608620
</dd>
609621
<dt id="mbed_tools_ci_scripts.utils.third_party_licences.OpenSourceLicences.load"><code class="name flex">

mbed_tools_ci_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__ = "1.7.0"
14-
COMMIT = "09353562392cb39f16f24f4df72fe2a250a5883d"
13+
__version__ = "1.7.1"
14+
COMMIT = "f3ecd2671a48dd4205ae93ffdc8fbf4ad0d03a37"
1515
MAJOR = 1
1616
MINOR = 7
17-
PATCH = 0
17+
PATCH = 1

news/20200429.bugfix

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

news/20200429.misc

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

0 commit comments

Comments
 (0)