Tweaks to uv workspace

Signed-off-by: Prabhu Subramanian <[email protected]>
CycloneDX · Jan 6, 2025 · bfcf303 · bfcf303
1 parent 38f3322
commit bfcf303
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/lib/cli/index.js b/lib/cli/index.js
@@ -3034,7 +3034,9 @@ export async function createPythonBom(path, options) {
       }
     }
   }
-  const requirementsMode = reqFiles?.length || reqDirFiles?.length;
+  // When we identify uv lock files, do not parse requirements files
+  const requirementsMode =
+    (reqFiles?.length || reqDirFiles?.length) && !uvLockFiles.length;
   const poetryMode = poetryFiles?.length;
 
   // TODO: Support for nested directories

diff --git a/lib/helpers/utils.js b/lib/helpers/utils.js
@@ -4304,7 +4304,10 @@ export function parsePyProjectTomlFile(tomlFile) {
     Array.isArray(tomlData.tool.uv.workspace?.members)
   ) {
     for (const amember of tomlData.tool.uv.workspace.members) {
-      workspacePaths.push(amember.replace(/\/\*$/, "/**/pyproject.toml"));
+      const memberPyProjPaths = amember.endsWith("/*")
+        ? amember.replace(/\/\*$/, "/**/pyproject.toml")
+        : `${amember}/**/pyproject.toml`;
+      workspacePaths.push(memberPyProjPaths);
     }
   }
   // uv and others

diff --git a/types/lib/cli/index.d.ts.map b/types/lib/cli/index.d.ts.map
diff --git a/types/lib/helpers/utils.d.ts.map b/types/lib/helpers/utils.d.ts.map