Merge branch 'develop' into add-ignored-resources

Author: AyanSinhaMahapatra

CHANGELOG.rst

@@ -1,11 +1,12 @@
 ==============================
 Changelog
 
-Next
-    Release 8.0.1
+2023-xx-xx
+    Release x.x.x
 
-    * Adopt 3.3.1 specification
-    * Introduce ``ignored_resources`` to ABOUT specification
+    * The tool will now show which worksheet (if .xlsx input) is the tool working on
+    * Error handling if defined worksheet does not exist
+    * Adopt 3.3.1 specification: introduce ``ignored_resources``
 
 
 2023-03-09

src/attributecode/util.py

@@ -680,10 +680,16 @@ def load_excel(location, worksheet=None):
     # This is to prevent showing the: warn("Workbook contains no default style, apply openpyxl's default")
     with warnings.catch_warnings(record=True):
         input_bom = openpyxl.load_workbook(location)
+        sheetnames = input_bom.sheetnames
         if worksheet:
+            if worksheet not in sheetnames:
+                import sys
+                print("The input worksheet name does not exist. Exiting.")
+                sys.exit(1)
             sheet_obj = input_bom[worksheet]
         else:
             sheet_obj = input_bom.active
+    print("Working on the " + sheet_obj.title + " worksheet.")
     max_col = sheet_obj.max_column
 
     index = 1

templates/license_ref.template

@@ -34,16 +34,16 @@ This document lists the open source and third-party components of a {{ vartext['
         <div id="group_{{ loop.index0 }}">
             <h3>{{ license.name }}</h3>
             <p>This product contains the following open source software packages licensed under the terms of the license: {{license.name}}</p>
-            
+
             <div class="oss-component" id="component_{{ loop.index0 }}">
-            {%for about_object in abouts %} 
+            {%for about_object in abouts %}
                 {% if loop.first %}
                     {% if license.url %}
                         <p>License Gallery URL: <a href="{{ license.url }}">{{license.url}}</a> </p>
                     {% endif %}
                 {% endif %}
                 {% if license.key in about_object.license_key.value %}
-                    <li>{{ about_object.name.value }}{% if about_object.version.value %}  - Version  {{ about_object.version.value }}{% endif %}</li>       
+                    <li>{{ about_object.name.value }}{% if about_object.version.value %}  - Version  {{ about_object.version.value }}{% endif %}</li>
                     {% if about_object.copyright.value %}
                         <pre>Copyright: {{about_object.copyright.value}}</pre>
                     {% endif %}
@@ -63,7 +63,7 @@ This document lists the open source and third-party components of a {{ vartext['
         </div>
     {% endfor %}
     <hr>
-<hr> 
+<hr>
 <h3><a id="End">End</a></h3>
 </body>
 </html>