Skip to content

Commit

Permalink
Update packages and bump version (#456)
Browse files Browse the repository at this point in the history
* Update packages and bump version

Signed-off-by: Prabhu Subramanian <[email protected]>

* Atom test fix

Signed-off-by: Prabhu Subramanian <[email protected]>

* Atom test fix

Signed-off-by: Prabhu Subramanian <[email protected]>

---------

Signed-off-by: Prabhu Subramanian <[email protected]>
  • Loading branch information
prabhu authored Aug 11, 2023
1 parent 7a982e1 commit 0c5adf5
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 64 deletions.
23 changes: 16 additions & 7 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2309,13 +2309,22 @@ export const createPythonBom = async (path, options) => {
parentComponent
);
}
const pdependencies = {
ref: parentComponent["bom-ref"],
dependsOn: Array.from(parentDependsOn).filter(
(r) => parentComponent && r !== parentComponent["bom-ref"]
)
};
dependencies.splice(0, 0, pdependencies);
let parentPresent = false;
for (const d of dependencies) {
if (d.ref === parentComponent["bom-ref"]) {
parentPresent = true;
break;
}
}
if (!parentPresent) {
const pdependencies = {
ref: parentComponent["bom-ref"],
dependsOn: Array.from(parentDependsOn).filter(
(r) => parentComponent && r !== parentComponent["bom-ref"]
)
};
dependencies.splice(0, 0, pdependencies);
}
}
}
// Final fallback is to manually parse setup.py if we still
Expand Down
105 changes: 53 additions & 52 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyclonedx/cdxgen",
"version": "9.3.2",
"version": "9.3.3",
"description": "Creates CycloneDX Software Bill-of-Materials (SBOM) from source or container image",
"homepage": "http://github.com/cyclonedx/cdxgen",
"author": "Prabhu Subramanian <[email protected]>",
Expand Down Expand Up @@ -50,8 +50,8 @@
"url": "https://github.com/cyclonedx/cdxgen/issues"
},
"dependencies": {
"@babel/parser": "^7.22.5",
"@babel/traverse": "^7.22.5",
"@babel/parser": "^7.22.10",
"@babel/traverse": "^7.22.10",
"ajv": "^8.12.0",
"ajv-formats": "^2.1.1",
"cheerio": "^1.0.0-rc.12",
Expand All @@ -75,7 +75,7 @@
"yargs": "^17.7.2"
},
"optionalDependencies": {
"@appthreat/atom": "^1.0.0",
"@appthreat/atom": "^1.0.1",
"@cyclonedx/cdxgen-plugins-bin": "^1.2.0",
"body-parser": "^1.20.2",
"compression": "^1.7.4",
Expand All @@ -88,7 +88,7 @@
],
"devDependencies": {
"caxa": "^3.0.1",
"eslint": "^8.43.0",
"eslint": "^8.47.0",
"jest": "^29.5.0",
"prettier": "3.0.1"
}
Expand Down

0 comments on commit 0c5adf5

Please sign in to comment.