Fix tox error

Author: dd-jy

src/fosslight_dependency/package_manager/Npm.py

@@ -53,14 +53,8 @@ def start_license_checker(self):
             self.flag_tmp_node_modules = True
             cmd_ret = subprocess.call(npm_install_cmd, shell=True)
             if cmd_ret != 0:
-                logger.warning(f"{npm_install_cmd} returns an error. Trying yarn as fallback...")
-                yarn_install_cmd = 'yarn install --production --ignore-scripts'
-                cmd_ret = subprocess.call(yarn_install_cmd, shell=True)
-                if cmd_ret != 0:
-                    logger.error(f"Both {npm_install_cmd} and {yarn_install_cmd} failed")
-                    return False
-                else:
-                    logger.info(f"Successfully executed {yarn_install_cmd}")
+                logger.error(f"{npm_install_cmd} failed")
+                return False
 
         # customized json file for obtaining specific items with license-checker
         self.make_custom_json(self.tmp_custom_json)

src/fosslight_dependency/package_manager/Yarn.py

@@ -19,17 +19,17 @@
 
 
 class Yarn(Npm):
-    
+
     def __init__(self, input_dir, output_dir):
         super().__init__(input_dir, output_dir)
         self.package_manager_name = const.YARN
         self.yarn_version = None
-    
+
     def detect_yarn_version(self):
         """Detect Yarn version (1.x = Classic, 2+ = Berry)"""
         if self.yarn_version is not None:
             return self.yarn_version
-            
+
         try:
             result = subprocess.run('yarn -v', shell=True, capture_output=True, text=True, encoding='utf-8')
             if result.returncode == 0:
@@ -47,32 +47,30 @@ def start_license_checker(self):
         license_checker_cmd = f'license-checker --production --json --out {self.input_file_name}'
         custom_path_option = ' --customPath '
         node_modules = 'node_modules'
-        
-        # Detect Yarn version
+
         self.detect_yarn_version()
-        
+
         # For Yarn Berry (2+), check if using PnP mode
         is_pnp_mode = False
         if self.yarn_version and self.yarn_version >= 2:
             # Check if .pnp.cjs exists (PnP mode indicator)
             if os.path.exists('.pnp.cjs') or os.path.exists('.pnp.js'):
                 is_pnp_mode = True
                 logger.info("Detected Yarn Berry with PnP mode")
-        
+
         if not os.path.isdir(node_modules):
-            logger.info(f"node_modules directory does not exist.")
+            logger.info("node_modules directory does not exist.")
             self.flag_tmp_node_modules = True
-            
+
             # For PnP mode, try to force node_modules creation
             if is_pnp_mode:
                 logger.info("Attempting to create node_modules for PnP project...")
-                # Try setting nodeLinker to node-modules temporarily
                 yarn_install_cmd = 'YARN_NODE_LINKER=node-modules yarn install --production --ignore-scripts'
                 logger.info(f"Executing: {yarn_install_cmd}")
             else:
                 yarn_install_cmd = 'yarn install --production --ignore-scripts'
                 logger.info(f"Executing: {yarn_install_cmd}")
-            
+
             cmd_ret = subprocess.call(yarn_install_cmd, shell=True)
             if cmd_ret != 0:
                 logger.error(f"{yarn_install_cmd} failed")

src/fosslight_dependency/run_dependency_scanner.py

@@ -106,22 +106,22 @@ def find_package_manager(input_dir, abs_path_to_exclude=[], manifest_file_name=[
     # both npm and pnpm are detected, remove npm.
     if 'npm' in found_package_manager.keys() and 'pnpm' in found_package_manager.keys():
         del found_package_manager['npm']
-    
+
     # both npm and yarn are detected, check which one to use based on lock file
     if 'npm' in found_package_manager.keys() and 'yarn' in found_package_manager.keys():
         # Remove npm from directories where yarn.lock exists
         dirs_to_remove_from_npm = []
         for yarn_dir in found_package_manager['yarn'].keys():
             if yarn_dir in found_package_manager['npm']:
                 dirs_to_remove_from_npm.append(yarn_dir)
-        
+
         for dir_to_remove in dirs_to_remove_from_npm:
             del found_package_manager['npm'][dir_to_remove]
-        
+
         # If npm has no directories left, remove it entirely
         if not found_package_manager['npm']:
             del found_package_manager['npm']
-    
+
     if len(found_package_manager) >= 1:
         log_lines = ["\nDetected Manifest Files automatically"]
         log_lines = print_package_info(found_package_manager, log_lines)