Update dependency JSON ordering #447

    * Update test expectations

Signed-off-by: Jono Yang <jyang@nexb.com>

Author: JonoYang

scanpipe/pipes/output.py

@@ -189,7 +189,11 @@ def get_dependencies(self, project):
             project.discovereddependencys.all()
             .prefetch_related("for_package", "datafile_resource")
             .order_by(
-                "dependency_uid",
+                "type",
+                "namespace",
+                "name",
+                "version",
+                "datasource_id",
             )
         )
 

scanpipe/tests/data/daglib-0.6.0-py3-none-any.whl_scan_codebase.json

@@ -113,8 +113,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/dask?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
-      "datasource_id": "pypi_wheel_metadata"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
+      "datasource_id": "pypi_wheel"
     },
     {
       "purl": "pkg:pypi/dask",
@@ -126,8 +126,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/dask?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
-      "datasource_id": "pypi_wheel"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
+      "datasource_id": "pypi_wheel_metadata"
     },
     {
       "purl": "pkg:pypi/graphviz",
@@ -165,8 +165,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/ipycytoscape?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
-      "datasource_id": "pypi_wheel_metadata"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
+      "datasource_id": "pypi_wheel"
     },
     {
       "purl": "pkg:pypi/ipycytoscape",
@@ -178,8 +178,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/ipycytoscape?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
-      "datasource_id": "pypi_wheel"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
+      "datasource_id": "pypi_wheel_metadata"
     },
     {
       "purl": "pkg:pypi/networkx",
@@ -191,8 +191,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/networkx?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
-      "datasource_id": "pypi_wheel_metadata"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
+      "datasource_id": "pypi_wheel"
     },
     {
       "purl": "pkg:pypi/networkx",
@@ -204,8 +204,8 @@
       "is_resolved": false,
       "dependency_uid": "pkg:pypi/networkx?uuid=fixed-uid-done-for-testing-5642512d1758",
       "for_package_uid": "pkg:pypi/daglib@0.6.0?uuid=fixed-uid-done-for-testing-5642512d1758",
-      "datafile_path": "daglib-0.6.0-py3-none-any.whl",
-      "datasource_id": "pypi_wheel"
+      "datafile_path": "daglib-0.6.0-py3-none-any.whl-extract/daglib-0.6.0.dist-info/METADATA",
+      "datasource_id": "pypi_wheel_metadata"
     }
   ],
   "files": [

scanpipe/tests/test_pipelines.py

@@ -402,6 +402,7 @@ def test_scanpipe_scan_codebase_can_process_wheel(self):
 
         self.assertEqual(11, project1.codebaseresources.count())
         self.assertEqual(2, project1.discoveredpackages.count())
+        self.assertEqual(8, project1.discovereddependencys.count())
 
         result_file = output.to_json(project1)
         expected_file = (