fixed issue with CSV generation

Author: eeisegn

CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Upcoming changes...
 
+## [1.6.1] - 2023-07-06
+### Fixed
+- Fixed issue with CSV dependency generation
+- Increased `scanoss-winnowing` minimum requirement to match HPSM support
+
 ## [1.6.0] - 2023-06-16
 ### Added
 - Added support for High Precision Snippet Matching (`--hpsm` or `-H`) while scanning
@@ -242,3 +247,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [1.5.0]: https://github.com/scanoss/scanoss.py/compare/v1.4.2...v1.5.0
 [1.5.1]: https://github.com/scanoss/scanoss.py/compare/v1.5.0...v1.5.1
 [1.5.2]: https://github.com/scanoss/scanoss.py/compare/v1.5.1...v1.5.2
+[1.6.0]: https://github.com/scanoss/scanoss.py/compare/v1.5.2...v1.6.0
+[1.6.1]: https://github.com/scanoss/scanoss.py/compare/v1.6.0...v1.6.1

src/scanoss/__init__.py

@@ -22,4 +22,4 @@
    THE SOFTWARE.
 """
 
-__version__ = '1.6.0'
+__version__ = '1.6.1'

src/scanoss/csvoutput.py

@@ -72,6 +72,7 @@ def parse(self, data: json):
                         self.print_stderr(f'Warning: No Dependencies found for {f}: {file_details}')
                         continue
                     for deps in dependencies:
+                        detected = {}
                         purl = deps.get("purl")
                         if not purl:
                             self.print_stderr(f'Warning: No PURL found for {f}: {deps}')
@@ -90,6 +91,19 @@ def parse(self, data: json):
                             detected['licenses'] = ''
                         else:
                             detected['licenses'] = ';'.join(dc)
+                        # inventory_id,path,usage,detected_component,detected_license,detected_version,detected_latest,purl
+                        csv_dict.append({'inventory_id': row_id, 'path': f, 'detected_usage': id_details,
+                                         'detected_component': detected.get('component'),
+                                         'detected_license': detected.get('licenses'),
+                                         'detected_version': detected.get('version'),
+                                         'detected_latest': detected.get('latest'),
+                                         'detected_purls': detected.get('purls'),
+                                         'detected_url': detected.get('url'),
+                                         'detected_path': detected.get('file', ''),
+                                         'detected_match': matched, 'detected_lines': lines,
+                                         'detected_oss_lines': oss_lines
+                                         })
+                        row_id = row_id + 1
                 else:
                     purls = d.get('purl')
                     if not purls:
@@ -116,16 +130,19 @@ def parse(self, data: json):
                         detected['licenses'] = ''
                     else:
                         detected['licenses'] = ';'.join(dc)
-                # inventory_id,path,usage,detected_component,detected_license,detected_version,detected_latest,purl
-                csv_dict.append({'inventory_id': row_id, 'path': f, 'detected_usage': id_details,
-                                 'detected_component': detected.get('component'),
-                                 'detected_license': detected.get('licenses'),
-                                 'detected_version': detected.get('version'), 'detected_latest': detected.get('latest'),
-                                 'detected_purls': detected.get('purls'), 'detected_url': detected.get('url'),
-                                 'detected_path': detected.get('file', ''),
-                                 'detected_match': matched, 'detected_lines': lines, 'detected_oss_lines': oss_lines
-                                 })
-                row_id = row_id + 1
+                    # inventory_id,path,usage,detected_component,detected_license,detected_version,detected_latest,purl
+                    csv_dict.append({'inventory_id': row_id, 'path': f, 'detected_usage': id_details,
+                                     'detected_component': detected.get('component'),
+                                     'detected_license': detected.get('licenses'),
+                                     'detected_version': detected.get('version'),
+                                     'detected_latest': detected.get('latest'),
+                                     'detected_purls': detected.get('purls'),
+                                     'detected_url': detected.get('url'),
+                                     'detected_path': detected.get('file', ''),
+                                     'detected_match': matched, 'detected_lines': lines,
+                                     'detected_oss_lines': oss_lines
+                                     })
+                    row_id = row_id + 1
         return csv_dict
 
     def produce_from_file(self, json_file: str, output_file: str = None) -> bool: