fosslight-dependency 4.1.0__tar.gz → 4.1.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/PKG-INFO +1 -1
  2. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/setup.py +1 -1
  3. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/_package_manager.py +1 -1
  4. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Swift.py +6 -5
  5. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency.egg-info/PKG-INFO +1 -1
  6. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/LICENSE +0 -0
  7. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/LICENSES/Apache-2.0.txt +0 -0
  8. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/LICENSES/LicenseRef-3rd_party_licenses.txt +0 -0
  9. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/LICENSES/MIT.txt +0 -0
  10. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/MANIFEST.in +0 -0
  11. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/README.md +0 -0
  12. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/requirements.txt +0 -0
  13. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/setup.cfg +0 -0
  14. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/__init__.py +0 -0
  15. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/_analyze_dependency.py +0 -0
  16. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/_graph_convertor.py +0 -0
  17. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/_help.py +0 -0
  18. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/constant.py +0 -0
  19. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/dependency_item.py +0 -0
  20. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Android.py +0 -0
  21. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Carthage.py +0 -0
  22. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Cocoapods.py +0 -0
  23. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Go.py +0 -0
  24. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Gradle.py +0 -0
  25. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Helm.py +0 -0
  26. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Maven.py +0 -0
  27. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Npm.py +0 -0
  28. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Nuget.py +0 -0
  29. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Pub.py +0 -0
  30. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Pypi.py +0 -0
  31. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Unity.py +0 -0
  32. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/__init__.py +0 -0
  33. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/run_dependency_scanner.py +0 -0
  34. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency.egg-info/SOURCES.txt +0 -0
  35. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency.egg-info/dependency_links.txt +0 -0
  36. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency.egg-info/entry_points.txt +0 -0
  37. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency.egg-info/requires.txt +0 -0
  38. {fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency.egg-info/top_level.txt +0 -0
{fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: fosslight_dependency
3
- Version: 4.1.0
3
+ Version: 4.1.1
4
4
  Summary: FOSSLight Dependency Scanner
5
5
  Home-page: https://github.com/fosslight/fosslight_dependency_scanner
6
6
  Author: LG Electronics
{fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/setup.py RENAMED
@@ -35,7 +35,7 @@ if __name__ == "__main__":
35
35
 
36
36
  setup(
37
37
  name=_PACKAEG_NAME,
38
- version='4.1.0',
38
+ version='4.1.1',
39
39
  package_dir={"": "src"},
40
40
  packages=find_namespace_packages(where='src'),
41
41
  description='FOSSLight Dependency Scanner',
{fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/_package_manager.py RENAMED
@@ -303,7 +303,7 @@ def version_refine(oss_version):
303
303
 
304
304
 
305
305
  def connect_github(github_token):
306
- if github_token is not None:
306
+ if len(github_token) > 0:
307
307
  g = Github(github_token)
308
308
  else:
309
309
  g = Github()
{fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency/package_manager/Swift.py RENAMED
@@ -98,7 +98,7 @@ class Swift(PackageManager):
98
98
  return ret
99
99
 
100
100
  def parse_oss_information(self, f_name):
101
- json_ver = 1
101
+ json_ver = 2
102
102
  purl_dict = {}
103
103
 
104
104
  with open(f_name, 'r', encoding='utf8') as json_file:
@@ -107,11 +107,12 @@ class Swift(PackageManager):
107
107
 
108
108
  if json_ver == 1:
109
109
  json_data = json_raw["object"]["pins"]
110
- elif json_ver == 2:
110
+ elif json_ver == 2 or json_ver == 3:
111
111
  json_data = json_raw["pins"]
112
112
  else:
113
- logger.error(f'Not supported Package.resolved version {json_ver}')
114
- return
113
+ logger.warning(f'Not supported Package.resolved version {json_ver}')
114
+ logger.warning('Try to parse as version 2(or 3)')
115
+ json_data = json_raw["pins"]
115
116
 
116
117
  g = connect_github(self.github_token)
117
118
 
@@ -121,7 +122,7 @@ class Swift(PackageManager):
121
122
  if json_ver == 1:
122
123
  oss_origin_name = key['package']
123
124
  oss_item.homepage = key['repositoryURL']
124
- elif json_ver == 2:
125
+ else:
125
126
  oss_origin_name = key['identity']
126
127
  oss_item.homepage = key['location']
127
128
 
{fosslight_dependency-4.1.0 → fosslight_dependency-4.1.1}/src/fosslight_dependency.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: fosslight-dependency
3
- Version: 4.1.0
3
+ Version: 4.1.1
4
4
  Summary: FOSSLight Dependency Scanner
5
5
  Home-page: https://github.com/fosslight/fosslight_dependency_scanner
6
6
  Author: LG Electronics