Skip to content

Output fix #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 16, 2025
Merged

Output fix #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d13c00e
Bump version to 0.2.1, refactor data structures in Conda and PyPI pac…
michaelbeale-IL Apr 16, 2025
c4444f2
Refactor test assertions in Conda and PyPI package utilities to use d…
michaelbeale-IL Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .coverage.jnathawa-mobl1.amr.corp.intel.com.5819.XXOGkbux
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "superBOM"
version = "0.2.0"
version = "0.2.1"
description = ""
authors = ["Michael Beale <michael.beale@intel.com>"]
license = "Apache-2.0"
Expand Down
8 changes: 3 additions & 5 deletions src/superbom/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def save_results(results: Dict[str, pd.DataFrame], output_path: str, format: str
logger.info(f"License Info: {result}\n{df}")


def process_items(items, process_method, *args, **kwargs) -> List:
def process_items(items, process_method, *args, **kwargs) -> set:
"""
Process items using the specified method.

Expand All @@ -81,15 +81,13 @@ def process_items(items, process_method, *args, **kwargs) -> List:
*args: Additional arguments to pass to the process method.
**kwargs: Additional keyword arguments to pass to the process method.
"""
results = []

results = []
for item in tqdm.tqdm(
items, desc="Processing items", unit="item", disable=logger.level > logging.INFO
):
try:
result = process_method(item, *args, **kwargs)
if result:
results.append(result)
results.append(process_method(item, *args, **kwargs))
except Exception as e:
logger.error(f"Error processing item {item}: {e}")

Expand Down
20 changes: 8 additions & 12 deletions src/superbom/utils/packageindexes/conda/condadependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,13 @@ def _find_license(self, dictionary, license):
return None, None

def retrieve_conda_package_info(self, package) -> dict:
package_data = []
package_data = {}

# make sure there's a package name
if not package:
return package_data

parsed = self.parse_conda_dependency(package)

package_info = {}
found_channel = ""
found_platform = ""

Expand Down Expand Up @@ -141,15 +139,13 @@ def retrieve_conda_package_info(self, package) -> dict:
else:
validated, license = False, "No License Information"

package_data.append(
{
"Package": name,
"Version": version,
"License": license,
"Validated": validated,
"Source": f"{found_channel}:{found_platform}",
}
)
package_data = {
"Package": name,
"Version": version,
"License": license,
"Validated": validated,
"Source": f"{found_channel}:{found_platform}",
}

logger.debug(
f"Package: {name}, Version: {version}, License: {license}, Source: {found_channel}:{found_platform}"
Expand Down
39 changes: 16 additions & 23 deletions src/superbom/utils/packageindexes/pypi/pipdependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ def _getpypimetadata(self, package):

return package_data

def get_pip_package_data(self, package) -> list:
package_data = []
def get_pip_package_data(self, package) -> dict:
package_data = {}

# Skip python package
if package.name == "python":
Expand All @@ -40,15 +40,13 @@ def get_pip_package_data(self, package) -> list:
validated, license = pypiutils.get_license(metadata)
source = "pypi"

package_data.append(
{
"Package": name,
"Version": version,
"License": license,
"Validated": validated,
"Source": source,
}
)
package_data = {
"Package": name,
"Version": version,
"License": license,
"Validated": validated,
"Source": source,
}
self.logger.debug(
f"Package: {name}, Version: {version}, License: {license}, Source: {source}"
)
Expand All @@ -59,17 +57,12 @@ def get_pip_package_data(self, package) -> list:
validated, license = githubutils.get_license(package.name)
version = "N/A"
source = "github"
package_data.append(
{
"Package": package.name,
"Version": version,
"License": license,
"Validated": validated,
"Source": source,
}
)
self.logger.debug(
f"Package: {package.name}, Version: {version}, License: {license}, Source: {source}"
)
package_data = {
"Package": package.name,
"Version": version,
"License": license,
"Validated": validated,
"Source": source,
}

return package_data
50 changes: 23 additions & 27 deletions tests/unit_tests/test_condadeps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,13 @@ def test_retrieve_conda_package_info_success(
dep = "conda-forge::test-package=1.0.0"
result = self.util.retrieve_conda_package_info(dep)

expected = [
{
"Package": "test-package",
"Version": "1.0.0",
"License": "MIT",
"Validated": True,
"Source": "conda-forge:noarch",
}
]
expected = {
"Package": "test-package",
"Version": "1.0.0",
"License": "MIT",
"Validated": True,
"Source": "conda-forge:noarch",
}
self.assertEqual(result, expected)

@patch("superbom.utils.packageindexes.conda.condadependencies.CondaCache.get_cache")
Expand All @@ -102,15 +100,14 @@ def test_retrieve_conda_package_info_no_license(

dep = "conda-forge::test-package=1.0.0"
result = self.util.retrieve_conda_package_info(dep)
expected = [
{
"Package": "test-package",
"Version": "1.0.0",
"License": "No License Information",
"Validated": False,
"Source": "conda-forge:noarch",
}
]
expected = {
"Package": "test-package",
"Version": "1.0.0",
"License": "No License Information",
"Validated": False,
"Source": "conda-forge:noarch",
}

self.assertEqual(result, expected)

@patch("superbom.utils.packageindexes.conda.condadependencies.CondaCache.get_cache")
Expand All @@ -131,15 +128,14 @@ def test_retrieve_conda_package_info_not_found(

dep = "conda-forge::nonexistent-package"
result = self.util.retrieve_conda_package_info(dep)
expected = [
{
"Package": "nonexistent-package",
"Version": None,
"License": "No License Information",
"Validated": False,
"Source": ":",
}
]
expected = {
"Package": "nonexistent-package",
"Version": None,
"License": "No License Information",
"Validated": False,
"Source": ":",
}

self.assertEqual(result, expected)


Expand Down
36 changes: 17 additions & 19 deletions tests/unit_tests/test_pipdeps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@ def test_get_pip_packages_data_pypi(self, mock_get_license, mock_requests_get):
util = PyPIPackageUtil()
result = util.get_pip_package_data(mock_package)

expected_result = [
{
"Package": "testpackage",
"Version": "1.0.0",
"License": "MIT",
"Validated": True,
"Source": "pypi",
}
]
expected_result = {
"Package": "testpackage",
"Version": "1.0.0",
"License": "MIT",
"Validated": True,
"Source": "pypi",
}

self.assertEqual(result, expected_result)

@patch("superbom.utils.packageindexes.pypi.pipdependencies.requests.get")
Expand All @@ -50,15 +49,14 @@ def test_get_pip_packages_data_github(self, mock_get_license, mock_requests_get)
util = PyPIPackageUtil()
result = util.get_pip_package_data(mock_package)

expected_result = [
{
"Package": "testpackage",
"Version": "N/A",
"License": "MIT",
"Validated": True,
"Source": "github",
}
]
expected_result = {
"Package": "testpackage",
"Version": "N/A",
"License": "MIT",
"Validated": True,
"Source": "github",
}

self.assertEqual(result, expected_result)

@patch("superbom.utils.packageindexes.pypi.pipdependencies.requests.get")
Expand All @@ -69,7 +67,7 @@ def test_get_pip_packages_data_python(self, mock_requests_get):
util = PyPIPackageUtil()
result = util.get_pip_package_data(mock_package)

self.assertEqual(result, [])
self.assertEqual(result, {})


if __name__ == "__main__":
Expand Down