Clean up PR: remove old files, add new test data, update pypi.py and test_pypi.py

Author: levi42x

.gitignore

@@ -842,62 +842,28 @@ def parse(cls, location, package_only=False):
 def parse_dependency_requirement(requirement, scope='dependencies', is_runtime=True):
     """
     Parse a dependency requirement string and return a DependentPackage or None.
-    
-    Args:
-        requirement: A requirement string (e.g., "requests>=2.0.0")
-        scope: The dependency scope (e.g., 'dependencies', 'dev-dependencies')
-        is_runtime: Whether this is a runtime dependency
-    
-    Returns:
-        models.DependentPackage or None
+    This now delegates to get_requires_dependencies for consistency and to avoid code duplication.
     """
     if not requirement:
         return None
-    
-    try:
-        req = Requirement(requirement)
-        name = canonicalize_name(req.name)
-        is_pinned = False
-        purl = PackageURL(type='pypi', name=name)
-        
-        specifiers_set = req.specifier
-        specifiers = specifiers_set._specs
-        extracted_requirement = None
-        
-        if specifiers:
-            extracted_requirement = str(specifiers_set)
-            if len(specifiers) == 1:
-                specifier = list(specifiers)[0]
-                if specifier.operator in ('==', '==='):
-                    is_pinned = True
-                    purl = purl._replace(version=specifier.version)
-        
-        extra_data = {}
-        if req.marker:
-            platform = get_python_version_os(req.marker)
-            if platform:
-                extra_data = platform
-        
-        is_optional = bool(get_extra(req.marker) if req.marker else False)
-        
-        return models.DependentPackage(
-            purl=purl.to_string(),
-            scope=scope,
-            is_runtime=is_runtime,
-            is_optional=is_optional,
-            is_pinned=is_pinned,
-            is_direct=True,
-            extracted_requirement=extracted_requirement,
-            extra_data=extra_data if extra_data else None,
-        )
-    except Exception:
-        return None
+    # get_requires_dependencies expects a list of requirements
+    deps = get_requires_dependencies(
+        requires=[requirement],
+        default_scope=scope,
+        is_runtime=is_runtime,
+    )
+    # Return the first DependentPackage if any, else None
+    return deps[0] if deps else None
 
 
 class BaseUvPythonLayout(BaseExtractedPythonLayout):
 
     @classmethod
     def assemble(cls, package_data, resource, codebase, package_adder):
+        if codebase.has_single_resource:
+            yield from models.DatafileHandler.assemble(package_data, resource, codebase, package_adder)
+            return
+
         package_resource = None
         if resource.name == 'pyproject.toml':
             package_resource = resource
@@ -907,16 +873,11 @@ def assemble(cls, package_data, resource, codebase, package_adder):
                 package_resource = [r for r in siblings if r.name == 'pyproject.toml']
                 if package_resource:
                     package_resource = package_resource[0]
-
+        
         if not package_resource:
-            # we do not have a pyproject.toml
             yield from yield_dependencies_from_package_resource(resource)
             return
-
-        if codebase.has_single_resource:
-            yield from models.DatafileHandler.assemble(package_data, resource, codebase, package_adder)
-            return
-
+        
         assert len(package_resource.package_data) == 1, f'Invalid pyproject.toml for {package_resource.path}'
         pkg_data = package_resource.package_data[0]
         pkg_data = models.PackageData.from_dict(pkg_data)
@@ -1063,7 +1024,7 @@ def parse(cls, location, package_only=False):
         if not packages:
             return
 
-        version = toml_data.get('version')
+        lock_version = toml_data.get('version')
         requires_python = toml_data.get('requires-python')
 
         dependencies = []
@@ -1103,14 +1064,22 @@ def parse(cls, location, package_only=False):
 
             name = package.get('name')
             version = package.get('version')
+            description = package.get('description')
+            homepage_url = package.get('homepage_url')
+            keywords = package.get('keywords')
+            parties = package.get('parties')
             urls = get_pypi_urls(name, version)
-            
+
             package_data = dict(
                 datasource_id=cls.datasource_id,
                 type=cls.default_package_type,
                 primary_language='Python',
                 name=name,
                 version=version,
+                description=description,
+                homepage_url=homepage_url,
+                keywords=keywords,
+                parties=parties,
                 is_virtual=True,
                 dependencies=dependencies_for_resolved,
                 **urls,
@@ -1131,7 +1100,7 @@ def parse(cls, location, package_only=False):
 
         extra_data = {}
         extra_data['python_version'] = requires_python
-        extra_data['lock_version'] = version
+        extra_data['lock_version'] = lock_version
 
         package_data = dict(
             datasource_id=cls.datasource_id,