Skip to content

feat: add support for pyproject.toml via uv, poetry & pdm #432

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

Open
Strum355 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add support for pyproject.toml via uv, poetry & pdm #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Javascript_npm from './providers/javascript_npm.js';
import Javascript_pnpm from './providers/javascript_pnpm.js';
import Javascript_yarn from './providers/javascript_yarn.js';
import pythonPipProvider from './providers/python_pip.js'
import pythonPyprojectProvider from './providers/python_pyproject.js'
import rustCargoProvider from './providers/rust_cargo.js'

/** @typedef {{ecosystem: string, contentType: string, content: string}} Provided */
Expand All @@ -26,6 +27,7 @@ export const availableProviders = [
new Javascript_npm(),
golangGomodulesProvider,
pythonPipProvider,
pythonPyprojectProvider,
rustCargoProvider]

/**
Expand Down
8 changes: 4 additions & 4 deletions src/providers/python_pip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ function addAllDependencies(source, dep, sbom) {
sbom.addDependency(source, targetPurl)
let directDeps = dep["dependencies"]
if (directDeps !== undefined && directDeps.length > 0) {
directDeps.forEach((dependency) => { addAllDependencies(toPurl(dep["name"],dep["version"]), dependency, sbom) })
directDeps.forEach((dependency) => { addAllDependencies(toPurl(dep["name"], dep["version"]), dependency, sbom) })
}
}

Expand Down Expand Up @@ -123,7 +123,7 @@ async function getIgnoredDependencies(manifest) {
async function handleIgnoredDependencies(manifest, sbom, opts = {}) {
let ignoredDeps = await getIgnoredDependencies(manifest)
let matchManifestVersions = getCustom("MATCH_MANIFEST_VERSIONS", "true", opts);
if(matchManifestVersions === "true") {
if (matchManifestVersions === "true") {
const ignoredDepsVersion = ignoredDeps.filter(dep => dep.version !== undefined);
sbom.filterIgnoredDepsIncludingVersion(ignoredDepsVersion.map(dep => dep.toString()))
} else {
Expand All @@ -150,7 +150,7 @@ function getPythonPipBinaries(binaries, opts) {
invokeCommand(python, ['--version'])
invokeCommand(pip, ['--version'])
} catch (error) {
throw new Error(`Failed checking for python/pip binaries from supplied environment variables`, {cause: error})
throw new Error(`Failed checking for python/pip binaries from supplied environment variables`, { cause: error })
}
}
binaries.pip = pip
Expand Down Expand Up @@ -240,6 +240,6 @@ async function getSbomForComponentAnalysis(manifest, opts = {}) {
* @param version
* @return {PackageURL}
*/
function toPurl(name,version) {
function toPurl(name, version) {
return new PackageURL('pypi', undefined, name, version, undefined, undefined);
}
Loading
Loading