Modify test files

Signed-off-by: Varsha U N <[email protected]>

Author: VarshaUN

src/packagedcode/pypi.py

@@ -546,7 +546,8 @@ def parse(cls, location, package_only=False):
             dependencies=dependencies,
             is_private=is_private,
             extra_data=extra_data,
-            **urls,
+            homepage_url=urls.get('homepage'),
+            download_url=urls.get('download'),
         )
         yield models.PackageData.from_data(package_data, package_only)
 

tests/packagedcode/data/pypi/pyproject-toml/standard/private-classifier-pyproject.toml-expected.json

@@ -1,32 +1,114 @@
 [
-    {
-        "datasource_id": "pypi_pyproject_toml",
-        "type": "pypi",
-        "primary_language": "Python",
-        "name": "titanic_ml",
-        "version": "0.1.0",
-        "extracted_license_statement": null,
-        "description": "titanic_ml example package",
-        "keywords": [],
-        "parties": [
-            {
-                "type": "author",
-                "name": "Niels Zeilemaker",
-                "email": "[email protected]"
-            }
-        ],
-        "dependencies": [
-            {
-                "dependency": "pyspark[ml]",
-                "version": ""
-            },
-            {
-                "dependency": "sklearn",
-                "version": ""
-            }
-        ],
-        "is_private": true,
-        "extra_data": {},
-        "urls": {}
-    }
-]
+  {
+    "type": "pypi",
+    "namespace": null,
+    "name": "titanic_ml",
+    "version": "0.1.0",
+    "qualifiers": {},
+    "subpath": null,
+    "primary_language": "Python",
+    "description": "titanic_ml example package",
+    "release_date": null,
+    "parties": [
+      {
+        "type": "person",
+        "role": "author",
+        "name": "Niels Zeilemaker",
+        "email": "[email protected]",
+        "url": null
+      }
+    ],
+    "keywords": [
+      "Development Status :: 4 - Beta",
+      "Intended Audience :: Developers",
+      "Private :: Do Not Upload"
+    ],
+    "homepage_url": null,
+    "download_url": null,
+    "size": null,
+    "sha1": null,
+    "md5": null,
+    "sha256": null,
+    "sha512": null,
+    "bug_tracking_url": null,
+    "code_view_url": null,
+    "vcs_url": null,
+    "copyright": null,
+    "holder": null,
+    "declared_license_expression": null,
+    "declared_license_expression_spdx": null,
+    "license_detections": [],
+    "other_license_expression": null,
+    "other_license_expression_spdx": null,
+    "other_license_detections": [],
+    "extracted_license_statement": null,
+    "notice_text": null,
+    "source_packages": [],
+    "file_references": [],
+    "is_private": true,
+    "is_virtual": false,
+    "extra_data": {},
+    "dependencies": [
+      {
+        "purl": "pkg:pypi/pyspark",
+        "extracted_requirement": null,
+        "scope": "install",
+        "is_runtime": true,
+        "is_optional": false,
+        "is_pinned": false,
+        "is_direct": true,
+        "resolved_package": {},
+        "extra_data": {}
+      },
+      {
+        "purl": "pkg:pypi/sklearn",
+        "extracted_requirement": null,
+        "scope": "install",
+        "is_runtime": true,
+        "is_optional": false,
+        "is_pinned": false,
+        "is_direct": true,
+        "resolved_package": {},
+        "extra_data": {}
+      },
+      {
+        "purl": "pkg:pypi/tox",
+        "extracted_requirement": null,
+        "scope": "dev",
+        "is_runtime": true,
+        "is_optional": true,
+        "is_pinned": false,
+        "is_direct": true,
+        "resolved_package": {},
+        "extra_data": {}
+      },
+      {
+        "purl": "pkg:pypi/pre-commit",
+        "extracted_requirement": null,
+        "scope": "dev",
+        "is_runtime": true,
+        "is_optional": true,
+        "is_pinned": false,
+        "is_direct": true,
+        "resolved_package": {},
+        "extra_data": {}
+      },
+      {
+        "purl": "pkg:pypi/bump2version",
+        "extracted_requirement": null,
+        "scope": "dev",
+        "is_runtime": true,
+        "is_optional": true,
+        "is_pinned": false,
+        "is_direct": true,
+        "resolved_package": {},
+        "extra_data": {}
+      }
+    ],
+    "repository_homepage_url": null,
+    "repository_download_url": null,
+    "api_data_url": null,
+    "datasource_id": "pypi_pyproject_toml",
+    "purl": "pkg:pypi/[email protected]"
+  }
+]

tests/packagedcode/test_pypi.py

@@ -339,11 +339,11 @@ def test_parse_pyproject_toml_standard_lc0(self):
         expected_loc = self.get_test_loc('pypi/pyproject-toml/standard/lc0-pyproject.toml-expected.json')
         self.check_packages_data(package, expected_loc, regen=REGEN_TEST_FIXTURES)
 
-    def test_parse_pyproject_toml_private_package(self): 
+    def test_parse_pyproject_toml_private_package(self):
         test_file = self.get_test_loc('pypi/pyproject-toml/standard/python-private-classifier/pyproject.toml') 
         packages = pypi.PyprojectTomlHandler.parse(test_file)
         expected_loc = self.get_test_loc('pypi/pyproject-toml/standard/private-classifier-pyproject.toml-expected.json') 
-        self.check_packages_data(packages, expected_loc, regen=REGEN_TEST_FIXTURES) 
+        self.check_packages_data(packages, expected_loc)
 
 
 class TestPoetryHandler(PackageTester):