🚀 releasing version 1.6.2 @ 2020-04-07 11:55

[skip ci]

Author: monty-bot

CHANGELOG.md

@@ -11,6 +11,15 @@ beta releases are not included in this history. For a full list of all releases,
 
 [//]: # (begin_release_notes)
 
+"1.6.2" (2020-04-07)
+====================
+
+Bugfixes
+--------
+
+- Fix issue found in targets during SPDX report generation. (#20200407)
+
+
 "1.6.1" (2020-04-06)
 ====================
 

docs/spdx_report/spdx_helpers.html

@@ -86,7 +86,7 @@ <h2 id="examples">Examples</h2>
     &#34;*.tar&#34;,
     &#34;*.zip&#34;,
     &#34;**/__pycache__/**&#34;,
-    &#34;**/.egg-info/**&#34;,
+    &#34;**/*.egg-info/**&#34;,
 ]
 
 

docs/spdx_report/spdx_package.html

@@ -71,6 +71,12 @@ <h1 class="title">Module <code>mbed_tools_ci_scripts.spdx_report.spdx_package</c
     uuid: str
 
 
+def _set_package_copyright(file: SpdxFile, package: Package) -&gt; None:
+    &#34;&#34;&#34;Sets the copyright field of a package based on file copyright.&#34;&#34;&#34;
+    if file.copyright:
+        package.cr_text = determine_spdx_value(file.copyright)
+
+
 class SpdxPackage:
     &#34;&#34;&#34;SPDX package.
 
@@ -187,7 +193,7 @@ <h1 class="title">Module <code>mbed_tools_ci_scripts.spdx_report.spdx_package</c
         &#34;&#34;&#34;
         return self._package_info.metadata.description
 
-    def get_spdx_files(self) -&gt; Optional[List[&#34;SpdxFile&#34;]]:
+    def get_spdx_files(self) -&gt; Optional[List[SpdxFile]]:
         &#34;&#34;&#34;Gets package&#39;s files SPDX description.
 
         Returns:
@@ -224,7 +230,6 @@ <h1 class="title">Module <code>mbed_tools_ci_scripts.spdx_report.spdx_package</c
         &#34;&#34;&#34;
         package = Package()
         package.check_sum = Algorithm(&#34;SHA1&#34;, str(NoAssert()))
-        package.verif_code = NoAssert()
         package.cr_text = NoAssert()
         package.name = determine_spdx_value(self.name)
         package.version = determine_spdx_value(self.version)
@@ -244,12 +249,13 @@ <h1 class="title">Module <code>mbed_tools_ci_scripts.spdx_report.spdx_package</c
             for file in files:
                 package.add_file(file.generate_spdx_file())
                 package.add_lics_from_file(License.from_identifier(str(determine_spdx_value(file.licence))))
-                package.cr_text = file.copyright
-            package.verif_code = package.calc_verif_code()
+                _set_package_copyright(file, package)
+            package.verif_code = determine_spdx_value(package.calc_verif_code())
         else:
             # Has to generate a dummy file because of the following rule in SDK:
             # - Package must have at least one file
             dummy_file = SpdxFile(Path(UNKNOWN), self._package_info.root_dir, self.licence)
+            package.verif_code = NoAssert()
             package.add_file(dummy_file.generate_spdx_file())
             package.add_lics_from_file(License.from_identifier(str(determine_spdx_value(dummy_file.licence))))
         return package</code></pre>
@@ -429,7 +435,7 @@ <h2 id="attributes">Attributes</h2>
         &#34;&#34;&#34;
         return self._package_info.metadata.description
 
-    def get_spdx_files(self) -&gt; Optional[List[&#34;SpdxFile&#34;]]:
+    def get_spdx_files(self) -&gt; Optional[List[SpdxFile]]:
         &#34;&#34;&#34;Gets package&#39;s files SPDX description.
 
         Returns:
@@ -466,7 +472,6 @@ <h2 id="attributes">Attributes</h2>
         &#34;&#34;&#34;
         package = Package()
         package.check_sum = Algorithm(&#34;SHA1&#34;, str(NoAssert()))
-        package.verif_code = NoAssert()
         package.cr_text = NoAssert()
         package.name = determine_spdx_value(self.name)
         package.version = determine_spdx_value(self.version)
@@ -486,12 +491,13 @@ <h2 id="attributes">Attributes</h2>
             for file in files:
                 package.add_file(file.generate_spdx_file())
                 package.add_lics_from_file(License.from_identifier(str(determine_spdx_value(file.licence))))
-                package.cr_text = file.copyright
-            package.verif_code = package.calc_verif_code()
+                _set_package_copyright(file, package)
+            package.verif_code = determine_spdx_value(package.calc_verif_code())
         else:
             # Has to generate a dummy file because of the following rule in SDK:
             # - Package must have at least one file
             dummy_file = SpdxFile(Path(UNKNOWN), self._package_info.root_dir, self.licence)
+            package.verif_code = NoAssert()
             package.add_file(dummy_file.generate_spdx_file())
             package.add_lics_from_file(License.from_identifier(str(determine_spdx_value(dummy_file.licence))))
         return package</code></pre>
@@ -791,7 +797,6 @@ <h2 id="returns">Returns</h2>
     &#34;&#34;&#34;
     package = Package()
     package.check_sum = Algorithm(&#34;SHA1&#34;, str(NoAssert()))
-    package.verif_code = NoAssert()
     package.cr_text = NoAssert()
     package.name = determine_spdx_value(self.name)
     package.version = determine_spdx_value(self.version)
@@ -811,12 +816,13 @@ <h2 id="returns">Returns</h2>
         for file in files:
             package.add_file(file.generate_spdx_file())
             package.add_lics_from_file(License.from_identifier(str(determine_spdx_value(file.licence))))
-            package.cr_text = file.copyright
-        package.verif_code = package.calc_verif_code()
+            _set_package_copyright(file, package)
+        package.verif_code = determine_spdx_value(package.calc_verif_code())
     else:
         # Has to generate a dummy file because of the following rule in SDK:
         # - Package must have at least one file
         dummy_file = SpdxFile(Path(UNKNOWN), self._package_info.root_dir, self.licence)
+        package.verif_code = NoAssert()
         package.add_file(dummy_file.generate_spdx_file())
         package.add_lics_from_file(License.from_identifier(str(determine_spdx_value(dummy_file.licence))))
     return package</code></pre>
@@ -833,7 +839,7 @@ <h2 id="returns">Returns</h2>
 <summary>
 <span>Expand source code</span>
 </summary>
-<pre><code class="python">def get_spdx_files(self) -&gt; Optional[List[&#34;SpdxFile&#34;]]:
+<pre><code class="python">def get_spdx_files(self) -&gt; Optional[List[SpdxFile]]:
     &#34;&#34;&#34;Gets package&#39;s files SPDX description.
 
     Returns:

mbed_tools_ci_scripts/_version.py

@@ -10,8 +10,8 @@
 
 This file is autogenerated, do not modify by hand.
 """
-__version__ = "1.6.1"
-COMMIT = "e74fd04fb6bb04c9ac303f764ec0e3da539e5868"
+__version__ = "1.6.2"
+COMMIT = "53a58ccc50ae53cf8ea4aba992b8b7bcb534e1a1"
 MAJOR = 1
 MINOR = 6
-PATCH = 1
+PATCH = 2