Fix the parsing bug for swift's Package.resolved (#107)

* Fix the parsing bug for swift's Package.resolved
* Remove tox wheel to update tox 4.x
* Add allowlist_externals for tox 4.x

Signed-off-by: Jiyeong Seok <[email protected]>

Author: dd-jy

.github/workflows/pull-request.yml

@@ -46,7 +46,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install tox
-        pip install tox-wheel
         sudo npm install -g license-checker
     - name: Run Tox
       run: |
@@ -66,7 +65,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install tox
-        pip install tox-wheel
     - name: Run Tox
       run: |
         tox -e run_windows

setup.py

@@ -7,7 +7,7 @@
 from codecs import open
 import os
 import shutil
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 
 with open('README.md', 'r', 'utf-8') as f:
     reamdme = f.read()
@@ -37,7 +37,7 @@
         name=_PACKAEG_NAME,
         version='3.12.2',
         package_dir={"": "src"},
-        packages=find_packages(where='src'),
+        packages=find_namespace_packages(where='src'),
         description='FOSSLight Dependency Scanner',
         long_description=reamdme,
         long_description_content_type='text/markdown',

src/fosslight_dependency/package_manager/Swift.py

@@ -70,12 +70,9 @@ def parse_oss_information(self, f_name):
 
             oss_name = f"{self.package_manager_name}:{oss_origin_name}"
 
-            revision = key['state']['revision']
-            version = key['state']['version']
-            if version is None:
-                oss_version = revision
-            else:
-                oss_version = version
+            oss_version = key['state'].get('version', None)
+            if oss_version is None:
+                oss_version = key['state'].get('revision', None)
 
             dn_loc = homepage
             license_name = ''

tox.ini

@@ -6,10 +6,12 @@ skipdist = true
 toxworkdir = {toxinidir}/tests/
 
 [testenv]
-wheel = true
 install_command = pip install {opts} {packages}
 setenv =
   PYTHONPATH=.
+allowlist_externals = 
+  {toxinidir}/dist/cli
+  {toxinidir}\dist\cli.exe
 
 [pytest]
 filterwarnings = ignore::DeprecationWarning
@@ -84,4 +86,4 @@ commands =
   # Test for nuget (for packageReference)
   {toxinidir}\dist\cli.exe -p tests\test_nuget -o tests\result\nuget1
   # Test for nuget2 (for packages.config)
-  {toxinidir}\dist\cli.exe -p tests\test_nuget2 -o tests\result\nuget2
+  {toxinidir}\dist\cli.exe -p tests\test_nuget2 -o tests\result\nuget2