From 3196502d2a671e818f455220367a9d96ba36ce17 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 15:02:25 -0700 Subject: [PATCH 01/18] Update test results for apache miner #518 Signed-off-by: Jono Yang --- minecode/mappers/apache.py | 1 + .../testfiles/apache/map-groovy_expected.json | 2 + .../apache/map-turbine-webapp_expected.json | 2 + .../apache/podling_amaterasu_expected.json | 2 + .../testfiles/apache/projects_expected.json | 108 +++++++++++++++--- 5 files changed, 97 insertions(+), 18 deletions(-) diff --git a/minecode/mappers/apache.py b/minecode/mappers/apache.py index 4b3f6891..a62f7f85 100644 --- a/minecode/mappers/apache.py +++ b/minecode/mappers/apache.py @@ -107,6 +107,7 @@ def build_packages_from_projects(metadata, uri=None): if license_url in APACHE_LICENSE_URL: common_data['declared_license_expression'] = 'apache-2.0' common_data['declared_license_expression_spdx'] = 'Apache-2.0' + common_data['license_detections'] = [] keywords = [] category = project_meta.get('category', '') diff --git a/minecode/tests/testfiles/apache/map-groovy_expected.json b/minecode/tests/testfiles/apache/map-groovy_expected.json index bca6c2e4..591ea6ac 100644 --- a/minecode/tests/testfiles/apache/map-groovy_expected.json +++ b/minecode/tests/testfiles/apache/map-groovy_expected.json @@ -31,6 +31,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/apache/map-turbine-webapp_expected.json b/minecode/tests/testfiles/apache/map-turbine-webapp_expected.json index e8561cdc..bcfe363a 100644 --- a/minecode/tests/testfiles/apache/map-turbine-webapp_expected.json +++ b/minecode/tests/testfiles/apache/map-turbine-webapp_expected.json @@ -31,6 +31,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/apache/podling_amaterasu_expected.json b/minecode/tests/testfiles/apache/podling_amaterasu_expected.json index 31f037ec..1f27220f 100644 --- a/minecode/tests/testfiles/apache/podling_amaterasu_expected.json +++ b/minecode/tests/testfiles/apache/podling_amaterasu_expected.json @@ -32,6 +32,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/apache/projects_expected.json b/minecode/tests/testfiles/apache/projects_expected.json index 92a0ae71..56b72658 100644 --- a/minecode/tests/testfiles/apache/projects_expected.json +++ b/minecode/tests/testfiles/apache/projects_expected.json @@ -34,12 +34,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/abdera@1.7.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -89,12 +93,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/activemq?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -143,12 +151,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.7.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -197,12 +209,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.7.0?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -251,12 +267,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.5?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -305,12 +325,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.4?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -359,12 +383,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.3?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -413,12 +441,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.2?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -467,12 +499,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -521,12 +557,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.0?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -575,12 +615,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.4?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -629,12 +673,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.3?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -683,12 +731,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.2?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -737,12 +789,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -791,12 +847,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.4.5?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -845,12 +905,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.3.6?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -899,12 +963,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/ace@0.8.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], @@ -955,12 +1023,16 @@ "extracted_license_statement":"http://usefulinc.com/doap/licenses/asl20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/airavata@0.11?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "apache_json" ], From 32444fee65c93156e7fd772f6117c256a54dee52 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 15:05:00 -0700 Subject: [PATCH 02/18] Unset regen=True #518 Signed-off-by: Jono Yang --- matchcode/tests/test_models.py | 2 +- minecode/tests/test_cran.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/matchcode/tests/test_models.py b/matchcode/tests/test_models.py index 5c64c98c..e22b0c7c 100644 --- a/matchcode/tests/test_models.py +++ b/matchcode/tests/test_models.py @@ -437,7 +437,7 @@ def test_ApproximateResourceContentIndex_match_deep_equals(self): matches = ApproximateResourceContentIndex.match(fp) results = [match.package.to_dict() for match in matches] expected_results_loc = self.get_test_loc('match/approximate-file-matching/index-modified.js-expected.json') - self.check_expected_results(results, expected_results_loc, regen=True) + self.check_expected_results(results, expected_results_loc, regen=FIXTURES_REGEN) class MatchcodeModelUtilsTestCase(MatchcodeTestCase): diff --git a/minecode/tests/test_cran.py b/minecode/tests/test_cran.py index ea2733fe..9592182d 100644 --- a/minecode/tests/test_cran.py +++ b/minecode/tests/test_cran.py @@ -46,7 +46,7 @@ def test_build_packages_from_directory_listing(self): packages = mappers.cran.build_packages_from_html(metadata, 'https://cloud.r-project.org/web/packages/ANN2/index.html', 'pkg:cran/ANN2') packages = [p.to_dict() for p in packages] expected_loc = self.get_test_loc('cran/mapper_ANN2_expected.json') - self.check_expected_results(packages, expected_loc, regen=True) + self.check_expected_results(packages, expected_loc, regen=FIXTURES_REGEN) def test_build_packages_from_directory_listing2(self): ResourceURI.objects.create(uri='https://cloud.r-project.org/web/packages/abe/index.html') @@ -55,7 +55,7 @@ def test_build_packages_from_directory_listing2(self): packages = mappers.cran.build_packages_from_html(metadata, 'https://cloud.r-project.org/web/packages/abe/index.htm', 'pkg:cran/abe') packages = [p.to_dict() for p in packages] expected_loc = self.get_test_loc('cran/mapper_abe_expected.json') - self.check_expected_results(packages, expected_loc, regen=True) + self.check_expected_results(packages, expected_loc, regen=FIXTURES_REGEN) def test_replace_downloadurl(self): url = "../../../src/contrib/Archive/ANN2" From fd5afc2b342865e6e4ac3a49023423c3b68a3734 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 15:15:42 -0700 Subject: [PATCH 03/18] Update rubygem miner test results #518 Signed-off-by: Jono Yang --- .../rubygems/0mq-0.4.1.gem.package.json | 9 ++++ .../rubygems/a_okay-0.1.0.gem.package.json | 2 + .../action_tracker-1.0.2.gem.package.json | 12 ++++++ .../rubygems/apiv1/0xffffff.api.package.json | 4 ++ .../apiv1/a1630ty_a1630ty.api.mapped.json | 2 + .../apiv1/a1630ty_a1630ty.api.package.json | 2 + .../apiv1/action_tracker.api.package.json | 42 +++++++++++++++++++ .../rubygems/apiv1/zuck.api.package.json | 24 +++++++++++ ...archive-tar-minitar-0.5.2.gem.package.json | 2 + .../blankslate-3.1.3.gem.package.json | 4 ++ .../rubygems/m2r-2.1.0.gem.package.json | 15 +++++++ ...ress_standardization-0.4.1.gem.mapped.json | 5 +++ ...ess_standardization-0.4.1.gem.package.json | 5 +++ ...dea-mad_mimi_mailer-0.0.9.gem.package.json | 2 + .../ng-rails-csrf-0.1.0.gem.package.json | 2 + .../rubygems/small-0.2.gem.package.json | 2 + .../small_wonder-0.1.10.gem.package.json | 13 ++++++ ...rockets-vendor_gems-0.1.3.gem.package.json | 7 ++++ 18 files changed, 154 insertions(+) diff --git a/minecode/tests/testfiles/rubygems/0mq-0.4.1.gem.package.json b/minecode/tests/testfiles/rubygems/0mq-0.4.1.gem.package.json index 57665b6b..727cec7d 100644 --- a/minecode/tests/testfiles/rubygems/0mq-0.4.1.gem.package.json +++ b/minecode/tests/testfiles/rubygems/0mq-0.4.1.gem.package.json @@ -71,6 +71,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [ { @@ -80,6 +82,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -90,6 +93,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -100,6 +104,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -110,6 +115,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -120,6 +126,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -130,6 +137,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -140,6 +148,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} } diff --git a/minecode/tests/testfiles/rubygems/a_okay-0.1.0.gem.package.json b/minecode/tests/testfiles/rubygems/a_okay-0.1.0.gem.package.json index 81137b19..8e089620 100644 --- a/minecode/tests/testfiles/rubygems/a_okay-0.1.0.gem.package.json +++ b/minecode/tests/testfiles/rubygems/a_okay-0.1.0.gem.package.json @@ -41,6 +41,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [], "repository_homepage_url": null, diff --git a/minecode/tests/testfiles/rubygems/action_tracker-1.0.2.gem.package.json b/minecode/tests/testfiles/rubygems/action_tracker-1.0.2.gem.package.json index 197d04ec..4b47d4a6 100644 --- a/minecode/tests/testfiles/rubygems/action_tracker-1.0.2.gem.package.json +++ b/minecode/tests/testfiles/rubygems/action_tracker-1.0.2.gem.package.json @@ -71,6 +71,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [ { @@ -80,6 +82,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -90,6 +93,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -100,6 +104,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -110,6 +115,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -120,6 +126,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -130,6 +137,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -140,6 +148,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -150,6 +159,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -160,6 +170,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -170,6 +181,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} } diff --git a/minecode/tests/testfiles/rubygems/apiv1/0xffffff.api.package.json b/minecode/tests/testfiles/rubygems/apiv1/0xffffff.api.package.json index b1ce90a5..b9c250ad 100644 --- a/minecode/tests/testfiles/rubygems/apiv1/0xffffff.api.package.json +++ b/minecode/tests/testfiles/rubygems/apiv1/0xffffff.api.package.json @@ -41,6 +41,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -91,6 +93,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/rubygems/apiv1/a1630ty_a1630ty.api.mapped.json b/minecode/tests/testfiles/rubygems/apiv1/a1630ty_a1630ty.api.mapped.json index ca73866f..230a7ce5 100644 --- a/minecode/tests/testfiles/rubygems/apiv1/a1630ty_a1630ty.api.mapped.json +++ b/minecode/tests/testfiles/rubygems/apiv1/a1630ty_a1630ty.api.mapped.json @@ -41,6 +41,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/rubygems/apiv1/a1630ty_a1630ty.api.package.json b/minecode/tests/testfiles/rubygems/apiv1/a1630ty_a1630ty.api.package.json index ca73866f..230a7ce5 100644 --- a/minecode/tests/testfiles/rubygems/apiv1/a1630ty_a1630ty.api.package.json +++ b/minecode/tests/testfiles/rubygems/apiv1/a1630ty_a1630ty.api.package.json @@ -41,6 +41,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/rubygems/apiv1/action_tracker.api.package.json b/minecode/tests/testfiles/rubygems/apiv1/action_tracker.api.package.json index dd17c1d3..80f46e51 100644 --- a/minecode/tests/testfiles/rubygems/apiv1/action_tracker.api.package.json +++ b/minecode/tests/testfiles/rubygems/apiv1/action_tracker.api.package.json @@ -64,6 +64,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -137,6 +139,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -210,6 +214,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -283,6 +289,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -356,6 +364,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -429,6 +439,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -502,6 +514,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -575,6 +589,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -648,6 +664,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -721,6 +739,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -794,6 +814,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -867,6 +889,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -940,6 +964,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -1013,6 +1039,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -1086,6 +1114,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -1159,6 +1189,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -1232,6 +1264,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -1305,6 +1339,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -1378,6 +1414,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -1451,6 +1489,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -1524,6 +1564,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/rubygems/apiv1/zuck.api.package.json b/minecode/tests/testfiles/rubygems/apiv1/zuck.api.package.json index a9fa79c9..ee7b4a1b 100644 --- a/minecode/tests/testfiles/rubygems/apiv1/zuck.api.package.json +++ b/minecode/tests/testfiles/rubygems/apiv1/zuck.api.package.json @@ -64,6 +64,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -137,6 +139,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -210,6 +214,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -283,6 +289,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -356,6 +364,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -429,6 +439,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -502,6 +514,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -575,6 +589,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -648,6 +664,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -721,6 +739,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -794,6 +814,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -867,6 +889,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/rubygems/archive-tar-minitar-0.5.2.gem.package.json b/minecode/tests/testfiles/rubygems/archive-tar-minitar-0.5.2.gem.package.json index a17f446c..315d655a 100644 --- a/minecode/tests/testfiles/rubygems/archive-tar-minitar-0.5.2.gem.package.json +++ b/minecode/tests/testfiles/rubygems/archive-tar-minitar-0.5.2.gem.package.json @@ -41,6 +41,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [], "repository_homepage_url": null, diff --git a/minecode/tests/testfiles/rubygems/blankslate-3.1.3.gem.package.json b/minecode/tests/testfiles/rubygems/blankslate-3.1.3.gem.package.json index a063e995..520ae428 100644 --- a/minecode/tests/testfiles/rubygems/blankslate-3.1.3.gem.package.json +++ b/minecode/tests/testfiles/rubygems/blankslate-3.1.3.gem.package.json @@ -55,6 +55,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [ { @@ -64,6 +66,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -74,6 +77,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} } diff --git a/minecode/tests/testfiles/rubygems/m2r-2.1.0.gem.package.json b/minecode/tests/testfiles/rubygems/m2r-2.1.0.gem.package.json index 7c32beff..1f207236 100644 --- a/minecode/tests/testfiles/rubygems/m2r-2.1.0.gem.package.json +++ b/minecode/tests/testfiles/rubygems/m2r-2.1.0.gem.package.json @@ -85,6 +85,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [ { @@ -94,6 +96,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -104,6 +107,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -114,6 +118,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -124,6 +129,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -134,6 +140,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -144,6 +151,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -154,6 +162,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -164,6 +173,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -174,6 +184,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -184,6 +195,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -194,6 +206,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -204,6 +217,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -214,6 +228,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} } diff --git a/minecode/tests/testfiles/rubygems/mysmallidea-address_standardization-0.4.1.gem.mapped.json b/minecode/tests/testfiles/rubygems/mysmallidea-address_standardization-0.4.1.gem.mapped.json index c5fb6489..f0dfd1c9 100644 --- a/minecode/tests/testfiles/rubygems/mysmallidea-address_standardization-0.4.1.gem.mapped.json +++ b/minecode/tests/testfiles/rubygems/mysmallidea-address_standardization-0.4.1.gem.mapped.json @@ -41,6 +41,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -50,6 +52,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -60,6 +63,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -70,6 +74,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/rubygems/mysmallidea-address_standardization-0.4.1.gem.package.json b/minecode/tests/testfiles/rubygems/mysmallidea-address_standardization-0.4.1.gem.package.json index 0186bb4b..643c6617 100644 --- a/minecode/tests/testfiles/rubygems/mysmallidea-address_standardization-0.4.1.gem.package.json +++ b/minecode/tests/testfiles/rubygems/mysmallidea-address_standardization-0.4.1.gem.package.json @@ -41,6 +41,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [ { @@ -50,6 +52,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -60,6 +63,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -70,6 +74,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} } diff --git a/minecode/tests/testfiles/rubygems/mysmallidea-mad_mimi_mailer-0.0.9.gem.package.json b/minecode/tests/testfiles/rubygems/mysmallidea-mad_mimi_mailer-0.0.9.gem.package.json index 0bd632d4..eb7bc682 100644 --- a/minecode/tests/testfiles/rubygems/mysmallidea-mad_mimi_mailer-0.0.9.gem.package.json +++ b/minecode/tests/testfiles/rubygems/mysmallidea-mad_mimi_mailer-0.0.9.gem.package.json @@ -41,6 +41,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [], "repository_homepage_url": null, diff --git a/minecode/tests/testfiles/rubygems/ng-rails-csrf-0.1.0.gem.package.json b/minecode/tests/testfiles/rubygems/ng-rails-csrf-0.1.0.gem.package.json index c5ca5812..0e865a64 100644 --- a/minecode/tests/testfiles/rubygems/ng-rails-csrf-0.1.0.gem.package.json +++ b/minecode/tests/testfiles/rubygems/ng-rails-csrf-0.1.0.gem.package.json @@ -41,6 +41,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [], "repository_homepage_url": null, diff --git a/minecode/tests/testfiles/rubygems/small-0.2.gem.package.json b/minecode/tests/testfiles/rubygems/small-0.2.gem.package.json index c098fbc1..1a0dab63 100644 --- a/minecode/tests/testfiles/rubygems/small-0.2.gem.package.json +++ b/minecode/tests/testfiles/rubygems/small-0.2.gem.package.json @@ -41,6 +41,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [], "repository_homepage_url": null, diff --git a/minecode/tests/testfiles/rubygems/small_wonder-0.1.10.gem.package.json b/minecode/tests/testfiles/rubygems/small_wonder-0.1.10.gem.package.json index 80d0cc11..3712898c 100644 --- a/minecode/tests/testfiles/rubygems/small_wonder-0.1.10.gem.package.json +++ b/minecode/tests/testfiles/rubygems/small_wonder-0.1.10.gem.package.json @@ -41,6 +41,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [ { @@ -50,6 +52,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -60,6 +63,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -70,6 +74,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -80,6 +85,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -90,6 +96,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -100,6 +107,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -110,6 +118,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -120,6 +129,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -130,6 +140,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -140,6 +151,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -150,6 +162,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} } diff --git a/minecode/tests/testfiles/rubygems/sprockets-vendor_gems-0.1.3.gem.package.json b/minecode/tests/testfiles/rubygems/sprockets-vendor_gems-0.1.3.gem.package.json index b76f2146..2933f287 100644 --- a/minecode/tests/testfiles/rubygems/sprockets-vendor_gems-0.1.3.gem.package.json +++ b/minecode/tests/testfiles/rubygems/sprockets-vendor_gems-0.1.3.gem.package.json @@ -41,6 +41,8 @@ "notice_text": null, "source_packages": [], "file_references": [], + "is_private": false, + "is_virtual": false, "extra_data": {}, "dependencies": [ { @@ -50,6 +52,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -60,6 +63,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -70,6 +74,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -80,6 +85,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} }, @@ -90,6 +96,7 @@ "is_runtime": true, "is_optional": false, "is_resolved": false, + "is_direct": true, "resolved_package": {}, "extra_data": {} } From fcff36c197f20ab6ebadd2e6171b45c64cfb86b6 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 15:19:49 -0700 Subject: [PATCH 04/18] Update npm miner test results #518 Signed-off-by: Jono Yang --- .../testfiles/npm/0flux_npm_expected.json | 8 + .../testfiles/npm/29_record_expected.json | 15 +- .../testfiles/npm/554_record_expected.json | 2 + .../testfiles/npm/expected_ticket_439.json | 16 ++ .../testfiles/npm/expected_ticket_440.json | 34 +++ .../testfiles/npm/jsonp-filter-expected.json | 18 +- .../npm/lodash_package-expected.json | 80 +++--- .../testfiles/npm/mapper/index.expected.json | 21 ++ .../npm/microdata-node_expected.json | 265 ++++++++++++++++++ .../testfiles/npm/npm_2112_expected.json | 2 + 10 files changed, 418 insertions(+), 43 deletions(-) diff --git a/minecode/tests/testfiles/npm/0flux_npm_expected.json b/minecode/tests/testfiles/npm/0flux_npm_expected.json index f68f423b..4e3387f5 100644 --- a/minecode/tests/testfiles/npm/0flux_npm_expected.json +++ b/minecode/tests/testfiles/npm/0flux_npm_expected.json @@ -71,6 +71,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://www.npmjs.com/package/0flux", @@ -151,6 +153,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://www.npmjs.com/package/0flux", @@ -231,6 +235,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://www.npmjs.com/package/0flux", @@ -311,6 +317,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://www.npmjs.com/package/0flux", diff --git a/minecode/tests/testfiles/npm/29_record_expected.json b/minecode/tests/testfiles/npm/29_record_expected.json index d0c3f41b..de0c88c6 100644 --- a/minecode/tests/testfiles/npm/29_record_expected.json +++ b/minecode/tests/testfiles/npm/29_record_expected.json @@ -100,7 +100,13 @@ "notice_text":null, "source_packages":[], "file_references":[], - "extra_data":{}, + "is_private":false, + "is_virtual":false, + "extra_data":{ + "engines":{ + "node":">= 0.8.0" + } + }, "dependencies":[ { "purl":"pkg:npm/imagesize", @@ -109,6 +115,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -119,6 +126,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -129,6 +137,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -139,6 +148,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -149,6 +159,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -159,6 +170,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -169,6 +181,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/npm/554_record_expected.json b/minecode/tests/testfiles/npm/554_record_expected.json index f9835fbe..ecaeae1c 100644 --- a/minecode/tests/testfiles/npm/554_record_expected.json +++ b/minecode/tests/testfiles/npm/554_record_expected.json @@ -71,6 +71,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://www.npmjs.com/package/nodotdot", diff --git a/minecode/tests/testfiles/npm/expected_ticket_439.json b/minecode/tests/testfiles/npm/expected_ticket_439.json index 747eacfb..9951985c 100644 --- a/minecode/tests/testfiles/npm/expected_ticket_439.json +++ b/minecode/tests/testfiles/npm/expected_ticket_439.json @@ -79,6 +79,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -88,6 +90,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -98,6 +101,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -108,6 +112,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -199,6 +204,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -208,6 +215,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -299,6 +307,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -308,6 +318,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -318,6 +329,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -409,6 +421,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -418,6 +432,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -428,6 +443,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/npm/expected_ticket_440.json b/minecode/tests/testfiles/npm/expected_ticket_440.json index 02e00bd3..18a15b8d 100644 --- a/minecode/tests/testfiles/npm/expected_ticket_440.json +++ b/minecode/tests/testfiles/npm/expected_ticket_440.json @@ -79,6 +79,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -88,6 +90,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -98,6 +101,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -108,6 +112,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -118,6 +123,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -128,6 +134,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -138,6 +145,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -228,6 +236,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -237,6 +247,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -247,6 +258,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -257,6 +269,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -267,6 +280,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -277,6 +291,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -287,6 +302,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -297,6 +313,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -307,6 +324,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -317,6 +335,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -327,6 +346,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -337,6 +357,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -427,6 +448,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -436,6 +459,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -446,6 +470,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -456,6 +481,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -466,6 +492,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -476,6 +503,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -486,6 +514,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -496,6 +525,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -506,6 +536,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -516,6 +547,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -526,6 +558,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -536,6 +569,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/npm/jsonp-filter-expected.json b/minecode/tests/testfiles/npm/jsonp-filter-expected.json index 184151c8..7cc1e1f3 100644 --- a/minecode/tests/testfiles/npm/jsonp-filter-expected.json +++ b/minecode/tests/testfiles/npm/jsonp-filter-expected.json @@ -76,7 +76,13 @@ "notice_text":null, "source_packages":[], "file_references":[], - "extra_data":{}, + "is_private":false, + "is_virtual":false, + "extra_data":{ + "engines":{ + "node":">= 0.4.5" + } + }, "dependencies":[ { "purl":"pkg:npm/styout", @@ -85,6 +91,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -172,7 +179,13 @@ "notice_text":null, "source_packages":[], "file_references":[], - "extra_data":{}, + "is_private":false, + "is_virtual":false, + "extra_data":{ + "engines":{ + "node":">= 0.4.5" + } + }, "dependencies":[ { "purl":"pkg:npm/styout", @@ -181,6 +194,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/npm/lodash_package-expected.json b/minecode/tests/testfiles/npm/lodash_package-expected.json index ae468fd8..4ac7d18a 100644 --- a/minecode/tests/testfiles/npm/lodash_package-expected.json +++ b/minecode/tests/testfiles/npm/lodash_package-expected.json @@ -1,24 +1,31 @@ { "name":"lodash", "version":"4.17.21", - "description":"Lodash modular utilities.", "keywords":[ "modules", "stdlib", "util" ], - "homepage":"https://lodash.com/", - "repository":{ - "type":"git", - "url":"git+https://github.com/lodash/lodash.git" - }, - "icon":"https://lodash.com/icon.svg", - "license":"MIT", - "main":"lodash.js", "author":{ "name":"John-David Dalton", "email":"john.david.dalton@gmail.com" }, + "license":"MIT", + "_id":"lodash@4.17.21", + "maintainers":[ + { + "name":"mathias", + "email":"mathias@qiwi.be" + }, + { + "name":"jdalton", + "email":"john.david.dalton@gmail.com" + }, + { + "name":"bnjmnt4n", + "email":"benjamin@dev.ofcr.se" + } + ], "contributors":[ { "name":"John-David Dalton", @@ -29,52 +36,45 @@ "email":"mathias@qiwi.be" } ], - "scripts":{ - "test":"echo \"See https://travis-ci.org/lodash-archive/lodash-cli for testing details.\"" - }, - "gitHead":"c6e281b878b315c7a10d90f9c2af4cdb112d9625", + "homepage":"https://lodash.com/", "bugs":{ "url":"https://github.com/lodash/lodash/issues" }, - "_id":"lodash@4.17.21", - "_nodeVersion":"14.15.5", - "_npmVersion":"6.14.11", "dist":{ - "integrity":"sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "shasum":"679591c564c3bffaae8454cf0b3df370c3d6911c", "tarball":"https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "fileCount":1054, - "unpackedSize":1412415, - "npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgMS3ZCRA9TVsSAnZWagAA8+4P/jx+SJ6Ue5oAJjz0L7gw\nLDD5YvP8aoliFq4GYkwUXfVQvOwomIPfa+U5Kao/hDfuwFQ/Bq5D5nSsl2bj\nrjJgvlKXna0SId8AgDgY2fB7zSfninuJvalY4iTWMN8DFSpG0XE2QFfoKpd3\njDmuzcNtgr79QV6DgjOVkHiP1IGNDlLTc1QEKiwo/5CdGQi1q/iCj6dViQMJ\nByuuuV2Qzi3f/FI25cG797WZar1MHhhlcnB50HiVBGp54IZOyuqdqWPduZQo\nvhONtonxPGBm3/J+uAkeUSSyL3Ud+FzLvdg8WEI9gDL0yvU4k0FcsnOONEYn\nngLaKEsw2xAnPBYW3Lf73Jnpwx6FAT3k49kgzxiNYSxEo7x4wiuNtBoDMyNw\nEKj6SZ0bUNmaJgiMfDnnDjCKjI3JrO1hho8z6CkwuvxuWLlW9wSsVayggzAI\nEhfeTeISugVHh332oDY2MI/Ysu8MnVN8fGmqeYQBBFj3aWatuA2NvVjACnX/\n54G7FtCU8TxZpm9shFRSopBx8PeI3r+icx1CT8YVFypY416PLnidHyqtME1G\neuRd1nWEz18hvVUAEHmuvHo+EPP3tITmTTUPQcZGMdBcZC+4UBmPMWX466HE\nbHw4aOnUWMa0sWfsERC5xzRZAb4lgMPEoTOnZyN4usMy7x9TzGZKZvU24HUE\nmpae\r\n=NOmG\r\n-----END PGP SIGNATURE-----\r\n", + "integrity":"sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "signatures":[ { - "keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA", - "sig":"MEUCIF3Yithbtmy1aEBNlfNWbLswAfPIyQUuNUGARD3Ex2t4AiEA6TlN2ZKJCUpS/Sf2Z6MduF1BNSvayHIpu5wAcICcKXw=" + "sig":"MEUCIF3Yithbtmy1aEBNlfNWbLswAfPIyQUuNUGARD3Ex2t4AiEA6TlN2ZKJCUpS/Sf2Z6MduF1BNSvayHIpu5wAcICcKXw=", + "keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA" } - ] + ], + "unpackedSize":1412415, + "npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgMS3ZCRA9TVsSAnZWagAA8+4P/jx+SJ6Ue5oAJjz0L7gw\nLDD5YvP8aoliFq4GYkwUXfVQvOwomIPfa+U5Kao/hDfuwFQ/Bq5D5nSsl2bj\nrjJgvlKXna0SId8AgDgY2fB7zSfninuJvalY4iTWMN8DFSpG0XE2QFfoKpd3\njDmuzcNtgr79QV6DgjOVkHiP1IGNDlLTc1QEKiwo/5CdGQi1q/iCj6dViQMJ\nByuuuV2Qzi3f/FI25cG797WZar1MHhhlcnB50HiVBGp54IZOyuqdqWPduZQo\nvhONtonxPGBm3/J+uAkeUSSyL3Ud+FzLvdg8WEI9gDL0yvU4k0FcsnOONEYn\nngLaKEsw2xAnPBYW3Lf73Jnpwx6FAT3k49kgzxiNYSxEo7x4wiuNtBoDMyNw\nEKj6SZ0bUNmaJgiMfDnnDjCKjI3JrO1hho8z6CkwuvxuWLlW9wSsVayggzAI\nEhfeTeISugVHh332oDY2MI/Ysu8MnVN8fGmqeYQBBFj3aWatuA2NvVjACnX/\n54G7FtCU8TxZpm9shFRSopBx8PeI3r+icx1CT8YVFypY416PLnidHyqtME1G\neuRd1nWEz18hvVUAEHmuvHo+EPP3tITmTTUPQcZGMdBcZC+4UBmPMWX466HE\nbHw4aOnUWMa0sWfsERC5xzRZAb4lgMPEoTOnZyN4usMy7x9TzGZKZvU24HUE\nmpae\r\n=NOmG\r\n-----END PGP SIGNATURE-----\r\n" + }, + "icon":"https://lodash.com/icon.svg", + "main":"lodash.js", + "gitHead":"c6e281b878b315c7a10d90f9c2af4cdb112d9625", + "scripts":{ + "test":"echo \"See https://travis-ci.org/lodash-archive/lodash-cli for testing details.\"" }, "_npmUser":{ "name":"bnjmnt4n", "email":"benjamin@dev.ofcr.se" }, + "repository":{ + "url":"git+https://github.com/lodash/lodash.git", + "type":"git" + }, + "_npmVersion":"6.14.11", + "description":"Lodash modular utilities.", "directories":{}, - "maintainers":[ - { - "name":"mathias", - "email":"mathias@qiwi.be" - }, - { - "name":"jdalton", - "email":"john.david.dalton@gmail.com" - }, - { - "name":"bnjmnt4n", - "email":"benjamin@dev.ofcr.se" - } - ], + "_nodeVersion":"14.15.5", + "_hasShrinkwrap":false, "_npmOperationalInternal":{ - "host":"s3://npm-registry-packages", - "tmp":"tmp/lodash_4.17.21_1613835736675_0.01913912595366596" - }, - "_hasShrinkwrap":false + "tmp":"tmp/lodash_4.17.21_1613835736675_0.01913912595366596", + "host":"s3://npm-registry-packages" + } } \ No newline at end of file diff --git a/minecode/tests/testfiles/npm/mapper/index.expected.json b/minecode/tests/testfiles/npm/mapper/index.expected.json index ffdbec9c..7f774bbd 100644 --- a/minecode/tests/testfiles/npm/mapper/index.expected.json +++ b/minecode/tests/testfiles/npm/mapper/index.expected.json @@ -64,6 +64,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -73,6 +75,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -83,6 +86,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -93,6 +97,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -103,6 +108,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -113,6 +119,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -188,6 +195,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -197,6 +206,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -207,6 +217,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -217,6 +228,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -227,6 +239,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -237,6 +250,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -312,6 +326,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -321,6 +337,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -331,6 +348,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -341,6 +359,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -351,6 +370,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -361,6 +381,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/npm/microdata-node_expected.json b/minecode/tests/testfiles/npm/microdata-node_expected.json index 7cc01b01..662a1dd5 100644 --- a/minecode/tests/testfiles/npm/microdata-node_expected.json +++ b/minecode/tests/testfiles/npm/microdata-node_expected.json @@ -74,6 +74,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -83,6 +85,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -93,6 +96,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -103,6 +107,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -113,6 +118,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -123,6 +129,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -133,6 +140,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -143,6 +151,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -153,6 +162,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -163,6 +173,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -173,6 +184,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -183,6 +195,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -193,6 +206,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -203,6 +217,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -213,6 +228,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -298,6 +314,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -307,6 +325,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -317,6 +336,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -327,6 +347,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -337,6 +358,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -347,6 +369,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -357,6 +380,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -367,6 +391,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -377,6 +402,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -387,6 +413,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -397,6 +424,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -407,6 +435,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -417,6 +446,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -427,6 +457,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -437,6 +468,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -447,6 +479,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -532,6 +565,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -541,6 +576,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -551,6 +587,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -561,6 +598,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -571,6 +609,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -581,6 +620,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -591,6 +631,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -676,6 +717,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -685,6 +728,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -695,6 +739,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -705,6 +750,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -715,6 +761,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -725,6 +772,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -735,6 +783,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -745,6 +794,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -830,6 +880,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -839,6 +891,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -849,6 +902,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -859,6 +913,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -869,6 +924,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -879,6 +935,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -889,6 +946,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -899,6 +957,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -909,6 +968,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -919,6 +979,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -1004,6 +1065,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -1013,6 +1076,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1023,6 +1087,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1033,6 +1098,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1043,6 +1109,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1053,6 +1120,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1063,6 +1131,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -1148,6 +1217,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -1157,6 +1228,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1167,6 +1239,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1177,6 +1250,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1187,6 +1261,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1197,6 +1272,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1207,6 +1283,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -1292,6 +1369,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -1301,6 +1380,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1311,6 +1391,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1321,6 +1402,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1331,6 +1413,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1341,6 +1424,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1351,6 +1435,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -1436,6 +1521,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -1445,6 +1532,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1455,6 +1543,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1465,6 +1554,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1475,6 +1565,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1485,6 +1576,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1495,6 +1587,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -1580,6 +1673,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -1589,6 +1684,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1599,6 +1695,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1609,6 +1706,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1619,6 +1717,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1629,6 +1728,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1639,6 +1739,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -1724,6 +1825,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -1733,6 +1836,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1743,6 +1847,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1753,6 +1858,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1763,6 +1869,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1773,6 +1880,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1783,6 +1891,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1793,6 +1902,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1803,6 +1913,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1813,6 +1924,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1823,6 +1935,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1833,6 +1946,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1843,6 +1957,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1853,6 +1968,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -1938,6 +2054,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -1947,6 +2065,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1957,6 +2076,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1967,6 +2087,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1977,6 +2098,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1987,6 +2109,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1997,6 +2120,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2007,6 +2131,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2017,6 +2142,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2027,6 +2153,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2037,6 +2164,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2047,6 +2175,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2057,6 +2186,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2067,6 +2197,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -2152,6 +2283,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -2161,6 +2294,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2171,6 +2305,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2181,6 +2316,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2191,6 +2327,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2201,6 +2338,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2211,6 +2349,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2221,6 +2360,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2231,6 +2371,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2241,6 +2382,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2251,6 +2393,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2261,6 +2404,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2271,6 +2415,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2281,6 +2426,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2291,6 +2437,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -2376,6 +2523,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -2385,6 +2534,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2395,6 +2545,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2405,6 +2556,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2415,6 +2567,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2425,6 +2578,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2435,6 +2589,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2445,6 +2600,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2455,6 +2611,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2465,6 +2622,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2475,6 +2633,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2485,6 +2644,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2495,6 +2655,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2505,6 +2666,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2515,6 +2677,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2525,6 +2688,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -2610,6 +2774,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -2619,6 +2785,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2629,6 +2796,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2639,6 +2807,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2649,6 +2818,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2659,6 +2829,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2669,6 +2840,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2679,6 +2851,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2689,6 +2862,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2699,6 +2873,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -2784,6 +2959,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -2793,6 +2970,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2803,6 +2981,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2813,6 +2992,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2823,6 +3003,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2833,6 +3014,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2843,6 +3025,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2853,6 +3036,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2863,6 +3047,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2873,6 +3058,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -2958,6 +3144,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -2967,6 +3155,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2977,6 +3166,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2987,6 +3177,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -2997,6 +3188,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3007,6 +3199,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -3092,6 +3285,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -3101,6 +3296,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3111,6 +3307,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3121,6 +3318,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3131,6 +3329,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3141,6 +3340,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -3226,6 +3426,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -3235,6 +3437,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3245,6 +3448,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3255,6 +3459,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3265,6 +3470,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3275,6 +3481,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -3360,6 +3567,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -3369,6 +3578,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3379,6 +3589,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3389,6 +3600,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3399,6 +3611,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3409,6 +3622,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -3494,6 +3708,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -3503,6 +3719,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3513,6 +3730,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3523,6 +3741,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3533,6 +3752,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -3618,6 +3838,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -3627,6 +3849,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3637,6 +3860,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3647,6 +3871,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3657,6 +3882,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3667,6 +3893,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -3752,6 +3979,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -3761,6 +3990,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3771,6 +4001,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3781,6 +4012,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3791,6 +4023,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -3876,6 +4109,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -3885,6 +4120,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3895,6 +4131,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3905,6 +4142,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3915,6 +4153,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3925,6 +4164,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3935,6 +4175,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3945,6 +4186,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3955,6 +4197,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3965,6 +4208,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3975,6 +4219,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3985,6 +4230,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -3995,6 +4241,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4005,6 +4252,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4015,6 +4263,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4025,6 +4274,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -4110,6 +4360,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -4119,6 +4371,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4129,6 +4382,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4139,6 +4393,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4149,6 +4404,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4159,6 +4415,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4169,6 +4426,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } @@ -4254,6 +4512,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -4263,6 +4523,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4273,6 +4534,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4283,6 +4545,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4293,6 +4556,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -4303,6 +4567,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/npm/npm_2112_expected.json b/minecode/tests/testfiles/npm/npm_2112_expected.json index 2647d65e..ad9bcfa3 100644 --- a/minecode/tests/testfiles/npm/npm_2112_expected.json +++ b/minecode/tests/testfiles/npm/npm_2112_expected.json @@ -74,6 +74,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://www.npmjs.com/package/2112", From 47864935282ecd0cfbb8fc3360898218ac2f2092 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 15:32:38 -0700 Subject: [PATCH 05/18] Update golang miner test results #518 Signed-off-by: Jono Yang --- minecode/tests/testfiles/golang/glog_expected.json | 2 ++ minecode/tests/testfiles/golang/math3_expected.json | 2 ++ minecode/tests/testfiles/golang/winter_expected.json | 2 ++ 3 files changed, 6 insertions(+) diff --git a/minecode/tests/testfiles/golang/glog_expected.json b/minecode/tests/testfiles/golang/glog_expected.json index 3200793f..63e72713 100644 --- a/minecode/tests/testfiles/golang/glog_expected.json +++ b/minecode/tests/testfiles/golang/glog_expected.json @@ -31,6 +31,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/golang/math3_expected.json b/minecode/tests/testfiles/golang/math3_expected.json index 1574a6ee..99d44952 100644 --- a/minecode/tests/testfiles/golang/math3_expected.json +++ b/minecode/tests/testfiles/golang/math3_expected.json @@ -31,6 +31,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/golang/winter_expected.json b/minecode/tests/testfiles/golang/winter_expected.json index ec50dfbe..d0186977 100644 --- a/minecode/tests/testfiles/golang/winter_expected.json +++ b/minecode/tests/testfiles/golang/winter_expected.json @@ -31,6 +31,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, From f9a4b0299a0f7b88ff6b3e905f1c7dd6157a50d8 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 15:38:16 -0700 Subject: [PATCH 06/18] Add license_detection field when building eclipse packages #518 Signed-off-by: Jono Yang --- minecode/mappers/eclipse.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/minecode/mappers/eclipse.py b/minecode/mappers/eclipse.py index 53446fbb..2358384b 100644 --- a/minecode/mappers/eclipse.py +++ b/minecode/mappers/eclipse.py @@ -65,6 +65,7 @@ def build_packages_with_json(metadata, purl=None, uri=None): if project_metadata.get('licenses'): common_data['extracted_license_statement'] = [l.get('name') for l in project_metadata.get('licenses', [])] + common_data['license_detections'] = [] # FIXME: this is a download page and NOT a download URL!!!!! for download_url in project_metadata.get('download_url', []): @@ -121,6 +122,7 @@ def build_packages(html_text, purl=None, uri=None): extracted_license_statement.append(license_name) if extracted_license_statement: common_data['extracted_license_statement'] = extracted_license_statement + common_data['license_detections'] = [] for a in page.find_all(name='a'): if a.contents: From def9edbe94c3f67588f1f7c7ca7e84f815fecbd0 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 15:48:39 -0700 Subject: [PATCH 07/18] Set license_detections field when building cran package #518 Signed-off-by: Jono Yang --- minecode/mappers/cran.py | 1 + 1 file changed, 1 insertion(+) diff --git a/minecode/mappers/cran.py b/minecode/mappers/cran.py index 1da1fb94..a3edc61d 100644 --- a/minecode/mappers/cran.py +++ b/minecode/mappers/cran.py @@ -138,6 +138,7 @@ def build_packages_from_html(metadata, uri=None, purl=None): common_data['dependencies'] = get_dependencies(value) if extracted_license_statement: common_data['extracted_license_statement'] = extracted_license_statement + common_data['license_detections'] = [] if download_urls: # for else statement will have else running always if there is no break statement for download_url in download_urls: From 00b57803e3e53e1f077c30e9f9b49b0f6d4a426f Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 15:48:54 -0700 Subject: [PATCH 08/18] Update haxe miner test results #518 Signed-off-by: Jono Yang --- minecode/tests/testfiles/haxe/project_package.json-expected | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/minecode/tests/testfiles/haxe/project_package.json-expected b/minecode/tests/testfiles/haxe/project_package.json-expected index 063caa10..202d00db 100644 --- a/minecode/tests/testfiles/haxe/project_package.json-expected +++ b/minecode/tests/testfiles/haxe/project_package.json-expected @@ -71,6 +71,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -80,6 +82,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -90,6 +93,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -100,6 +104,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } From 807849ec339cfa93fd8346749caf506684bd45d2 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 15:51:21 -0700 Subject: [PATCH 09/18] Update maven miner test results #518 Signed-off-by: Jono Yang --- .../increment2/expected_mini_package.json | 6 +++ .../maven/mapper/axis-1.4.pom.package.json | 7 ++++ .../commons-jaxrs-1.21.pom.package.json | 19 +++++++++ .../commons-pool-1.5.7.pom.package.json | 3 ++ .../maven-all-1.0-RELEASE.pom.package.json | 3 ++ ...sql-connector-java-5.1.27.pom.package.json | 2 + .../mapper/struts-menu-2.4.2.pom.package.json | 17 ++++++++ .../mapper/xbean-jmx-2.0.pom.package.json | 6 +++ .../common-object-1.0.2.pom.package.json | 6 +++ .../empty/osgl-http-1.1.2.pom.package.json | 7 ++++ .../argus-webservices-2.7.0.pom.package.json | 13 ++++++ .../argus-webservices-2.8.0.pom.package.json | 13 ++++++ .../loop/coreplugin-1.0.0.pom.package.json | 2 + ...jacuzzi-annotations-0.2.1.pom.package.json | 2 + .../jacuzzi-database-0.2.1.pom.package.json | 5 +++ .../ojcms-beans-0.1-beta.pom.package.json | 3 ++ .../loop/pkg-2.0.13.1005.pom.package.json | 2 + .../parse/jds-2.17.0718b.pom.package.json | 7 ++++ .../parsing/parse/jds-3.0.1.pom.package.json | 7 ++++ .../maven-javanet-plugin-1.7.pom.package.json | 9 +++++ ...docs-maven-plugin-1.0-RC1.pom.package.json | 40 +++++++++++++++++++ .../pom/ant-antlr-1.10.1-package_after.json | 4 ++ .../pom/ant-antlr-1.10.1-package_before.json | 4 ++ .../pulsar-client-1x-2.5.1-package_after.json | 5 +++ ...pulsar-client-1x-2.5.1-package_before.json | 5 +++ 25 files changed, 197 insertions(+) diff --git a/minecode/tests/testfiles/maven/index/increment2/expected_mini_package.json b/minecode/tests/testfiles/maven/index/increment2/expected_mini_package.json index fed410d1..74c0cb67 100644 --- a/minecode/tests/testfiles/maven/index/increment2/expected_mini_package.json +++ b/minecode/tests/testfiles/maven/index/increment2/expected_mini_package.json @@ -33,6 +33,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -77,6 +79,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -119,6 +123,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/maven/mapper/axis-1.4.pom.package.json b/minecode/tests/testfiles/maven/mapper/axis-1.4.pom.package.json index 1331b35e..f649ad7a 100644 --- a/minecode/tests/testfiles/maven/mapper/axis-1.4.pom.package.json +++ b/minecode/tests/testfiles/maven/mapper/axis-1.4.pom.package.json @@ -57,6 +57,8 @@ "pkg:maven/axis/axis@1.4?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -66,6 +68,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -76,6 +79,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -86,6 +90,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -96,6 +101,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -106,6 +112,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/mapper/commons-jaxrs-1.21.pom.package.json b/minecode/tests/testfiles/maven/mapper/commons-jaxrs-1.21.pom.package.json index 82d6b228..abbff242 100644 --- a/minecode/tests/testfiles/maven/mapper/commons-jaxrs-1.21.pom.package.json +++ b/minecode/tests/testfiles/maven/mapper/commons-jaxrs-1.21.pom.package.json @@ -115,6 +115,8 @@ "pkg:maven/edu.psu.swe.commons/commons-jaxrs@1.21?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -124,6 +126,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -134,6 +137,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -144,6 +148,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -154,6 +159,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -164,6 +170,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -174,6 +181,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -184,6 +192,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -194,6 +203,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -204,6 +214,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -214,6 +225,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -224,6 +236,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -234,6 +247,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -244,6 +258,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -254,6 +269,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -264,6 +280,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -274,6 +291,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -284,6 +302,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/mapper/commons-pool-1.5.7.pom.package.json b/minecode/tests/testfiles/maven/mapper/commons-pool-1.5.7.pom.package.json index 0c11c40d..9b15c179 100644 --- a/minecode/tests/testfiles/maven/mapper/commons-pool-1.5.7.pom.package.json +++ b/minecode/tests/testfiles/maven/mapper/commons-pool-1.5.7.pom.package.json @@ -105,6 +105,8 @@ "pkg:maven/commons-pool/commons-pool@1.5.7?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -114,6 +116,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/mapper/maven-all-1.0-RELEASE.pom.package.json b/minecode/tests/testfiles/maven/mapper/maven-all-1.0-RELEASE.pom.package.json index d240d812..aac20aac 100644 --- a/minecode/tests/testfiles/maven/mapper/maven-all-1.0-RELEASE.pom.package.json +++ b/minecode/tests/testfiles/maven/mapper/maven-all-1.0-RELEASE.pom.package.json @@ -80,6 +80,8 @@ "pkg:maven/date.yetao.maven/maven-all@1.0-RELEASE?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -89,6 +91,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/mapper/mysql-connector-java-5.1.27.pom.package.json b/minecode/tests/testfiles/maven/mapper/mysql-connector-java-5.1.27.pom.package.json index d3badbd6..9e47bbca 100644 --- a/minecode/tests/testfiles/maven/mapper/mysql-connector-java-5.1.27.pom.package.json +++ b/minecode/tests/testfiles/maven/mapper/mysql-connector-java-5.1.27.pom.package.json @@ -95,6 +95,8 @@ "pkg:maven/mysql/mysql-connector-java@5.1.27?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.27/", diff --git a/minecode/tests/testfiles/maven/mapper/struts-menu-2.4.2.pom.package.json b/minecode/tests/testfiles/maven/mapper/struts-menu-2.4.2.pom.package.json index 36bdf66a..885e7d41 100644 --- a/minecode/tests/testfiles/maven/mapper/struts-menu-2.4.2.pom.package.json +++ b/minecode/tests/testfiles/maven/mapper/struts-menu-2.4.2.pom.package.json @@ -70,6 +70,8 @@ "pkg:maven/struts-menu/struts-menu@2.4.2?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -79,6 +81,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -89,6 +92,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -99,6 +103,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -109,6 +114,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -119,6 +125,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -129,6 +136,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -139,6 +147,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -149,6 +158,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -159,6 +169,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -169,6 +180,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -179,6 +191,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -189,6 +202,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -199,6 +213,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -209,6 +224,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -219,6 +235,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/mapper/xbean-jmx-2.0.pom.package.json b/minecode/tests/testfiles/maven/mapper/xbean-jmx-2.0.pom.package.json index f924563c..c38793bb 100644 --- a/minecode/tests/testfiles/maven/mapper/xbean-jmx-2.0.pom.package.json +++ b/minecode/tests/testfiles/maven/mapper/xbean-jmx-2.0.pom.package.json @@ -34,6 +34,8 @@ "pkg:maven/org.xbean/xbean-jmx@2.0?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -43,6 +45,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -53,6 +56,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -63,6 +67,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -73,6 +78,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/parsing/empty/common-object-1.0.2.pom.package.json b/minecode/tests/testfiles/maven/parsing/empty/common-object-1.0.2.pom.package.json index 8761ce77..b3fa38bd 100644 --- a/minecode/tests/testfiles/maven/parsing/empty/common-object-1.0.2.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/empty/common-object-1.0.2.pom.package.json @@ -65,6 +65,8 @@ "pkg:maven/org.xson/common-object@1.0.2?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -74,6 +76,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -84,6 +87,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -94,6 +98,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -104,6 +109,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/parsing/empty/osgl-http-1.1.2.pom.package.json b/minecode/tests/testfiles/maven/parsing/empty/osgl-http-1.1.2.pom.package.json index de69ce20..d11a6d7c 100644 --- a/minecode/tests/testfiles/maven/parsing/empty/osgl-http-1.1.2.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/empty/osgl-http-1.1.2.pom.package.json @@ -57,6 +57,8 @@ "pkg:maven/org.osgl/osgl-http@1.1.2?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -66,6 +68,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -76,6 +79,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -86,6 +90,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -96,6 +101,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -106,6 +112,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/parsing/loop/argus-webservices-2.7.0.pom.package.json b/minecode/tests/testfiles/maven/parsing/loop/argus-webservices-2.7.0.pom.package.json index 2438c70b..c1ff6645 100644 --- a/minecode/tests/testfiles/maven/parsing/loop/argus-webservices-2.7.0.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/loop/argus-webservices-2.7.0.pom.package.json @@ -36,6 +36,8 @@ "pkg:maven/com.salesforce.argus/argus-webservices@%24%7Bproject.version%7D?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -45,6 +47,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -55,6 +58,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -65,6 +69,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -75,6 +80,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -85,6 +91,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -95,6 +102,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -105,6 +113,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -115,6 +124,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -125,6 +135,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -135,6 +146,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -145,6 +157,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/parsing/loop/argus-webservices-2.8.0.pom.package.json b/minecode/tests/testfiles/maven/parsing/loop/argus-webservices-2.8.0.pom.package.json index 2438c70b..c1ff6645 100644 --- a/minecode/tests/testfiles/maven/parsing/loop/argus-webservices-2.8.0.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/loop/argus-webservices-2.8.0.pom.package.json @@ -36,6 +36,8 @@ "pkg:maven/com.salesforce.argus/argus-webservices@%24%7Bproject.version%7D?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -45,6 +47,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -55,6 +58,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -65,6 +69,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -75,6 +80,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -85,6 +91,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -95,6 +102,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -105,6 +113,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -115,6 +124,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -125,6 +135,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -135,6 +146,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -145,6 +157,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/parsing/loop/coreplugin-1.0.0.pom.package.json b/minecode/tests/testfiles/maven/parsing/loop/coreplugin-1.0.0.pom.package.json index 62ce2578..cde503e4 100644 --- a/minecode/tests/testfiles/maven/parsing/loop/coreplugin-1.0.0.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/loop/coreplugin-1.0.0.pom.package.json @@ -34,6 +34,8 @@ "pkg:maven/net.sourceforge.findbugs/coreplugin@1.0.0?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://repo1.maven.org/maven2/net/sourceforge/findbugs/coreplugin/1.0.0/", diff --git a/minecode/tests/testfiles/maven/parsing/loop/jacuzzi-annotations-0.2.1.pom.package.json b/minecode/tests/testfiles/maven/parsing/loop/jacuzzi-annotations-0.2.1.pom.package.json index 169550cd..427080bd 100644 --- a/minecode/tests/testfiles/maven/parsing/loop/jacuzzi-annotations-0.2.1.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/loop/jacuzzi-annotations-0.2.1.pom.package.json @@ -34,6 +34,8 @@ "pkg:maven/com.github.albertoanguita/jacuzzi-annotations@%24%7Bversion%7D?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://repo1.maven.org/maven2/com/github/albertoanguita/jacuzzi-annotations/${version}/", diff --git a/minecode/tests/testfiles/maven/parsing/loop/jacuzzi-database-0.2.1.pom.package.json b/minecode/tests/testfiles/maven/parsing/loop/jacuzzi-database-0.2.1.pom.package.json index 7172be96..1185d6bb 100644 --- a/minecode/tests/testfiles/maven/parsing/loop/jacuzzi-database-0.2.1.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/loop/jacuzzi-database-0.2.1.pom.package.json @@ -34,6 +34,8 @@ "pkg:maven/com.github.albertoanguita/jacuzzi-database@%24%7Bversion%7D?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -43,6 +45,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -53,6 +56,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -63,6 +67,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/parsing/loop/ojcms-beans-0.1-beta.pom.package.json b/minecode/tests/testfiles/maven/parsing/loop/ojcms-beans-0.1-beta.pom.package.json index 6130d97d..ca2d22ca 100644 --- a/minecode/tests/testfiles/maven/parsing/loop/ojcms-beans-0.1-beta.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/loop/ojcms-beans-0.1-beta.pom.package.json @@ -34,6 +34,8 @@ "pkg:maven/com.github.simondan.ojcms/ojcms-beans@%24%7Bproject.version%7D?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -43,6 +45,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/parsing/loop/pkg-2.0.13.1005.pom.package.json b/minecode/tests/testfiles/maven/parsing/loop/pkg-2.0.13.1005.pom.package.json index 15efff5f..7771b2ae 100644 --- a/minecode/tests/testfiles/maven/parsing/loop/pkg-2.0.13.1005.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/loop/pkg-2.0.13.1005.pom.package.json @@ -34,6 +34,8 @@ "pkg:maven/org.jvnet.updatecenter2/pkg@%24%7Bversion%7D?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://repo1.maven.org/maven2/org/jvnet/updatecenter2/pkg/${version}/", diff --git a/minecode/tests/testfiles/maven/parsing/parse/jds-2.17.0718b.pom.package.json b/minecode/tests/testfiles/maven/parsing/parse/jds-2.17.0718b.pom.package.json index 1221bf6b..5a582d32 100644 --- a/minecode/tests/testfiles/maven/parsing/parse/jds-2.17.0718b.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/parse/jds-2.17.0718b.pom.package.json @@ -65,6 +65,8 @@ "pkg:maven/io.github.subiyacryolite/jds@2.17.0718b?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -74,6 +76,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -84,6 +87,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -94,6 +98,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -104,6 +109,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -114,6 +120,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/parsing/parse/jds-3.0.1.pom.package.json b/minecode/tests/testfiles/maven/parsing/parse/jds-3.0.1.pom.package.json index 7f7d07ac..b3ea743c 100644 --- a/minecode/tests/testfiles/maven/parsing/parse/jds-3.0.1.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/parse/jds-3.0.1.pom.package.json @@ -65,6 +65,8 @@ "pkg:maven/io.github.subiyacryolite/jds@3.0.1?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -74,6 +76,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -84,6 +87,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -94,6 +98,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -104,6 +109,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -114,6 +120,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/parsing/parse/maven-javanet-plugin-1.7.pom.package.json b/minecode/tests/testfiles/maven/parsing/parse/maven-javanet-plugin-1.7.pom.package.json index 2bdbedce..8111cffa 100644 --- a/minecode/tests/testfiles/maven/parsing/parse/maven-javanet-plugin-1.7.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/parse/maven-javanet-plugin-1.7.pom.package.json @@ -54,6 +54,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -63,6 +65,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -73,6 +76,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -83,6 +87,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -93,6 +98,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -103,6 +109,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -113,6 +120,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -123,6 +131,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/parsing/parse/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.package.json b/minecode/tests/testfiles/maven/parsing/parse/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.package.json index 6a551678..fd0c65f0 100644 --- a/minecode/tests/testfiles/maven/parsing/parse/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.package.json +++ b/minecode/tests/testfiles/maven/parsing/parse/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.package.json @@ -34,6 +34,8 @@ "pkg:maven/com.github.vincentrussell/springmvc-rest-docs-maven-plugin@1.0-RC1?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -43,6 +45,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -53,6 +56,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -63,6 +67,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -73,6 +78,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -83,6 +89,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -93,6 +100,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -103,6 +111,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -113,6 +122,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -123,6 +133,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -133,6 +144,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -143,6 +155,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -153,6 +166,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -163,6 +177,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -173,6 +188,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -183,6 +199,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -193,6 +210,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -203,6 +221,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -213,6 +232,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -223,6 +243,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -233,6 +254,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -243,6 +265,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -253,6 +276,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -263,6 +287,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -273,6 +298,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -283,6 +309,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -293,6 +320,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -303,6 +331,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -313,6 +342,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -323,6 +353,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -333,6 +364,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -343,6 +375,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -353,6 +386,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -363,6 +397,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -373,6 +408,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -383,6 +419,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -393,6 +430,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -403,6 +441,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -413,6 +452,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/pom/ant-antlr-1.10.1-package_after.json b/minecode/tests/testfiles/maven/pom/ant-antlr-1.10.1-package_after.json index 6ceb5775..72bf1891 100644 --- a/minecode/tests/testfiles/maven/pom/ant-antlr-1.10.1-package_after.json +++ b/minecode/tests/testfiles/maven/pom/ant-antlr-1.10.1-package_after.json @@ -42,6 +42,8 @@ "pkg:maven/org.apache.ant/ant-antlr@1.10.1?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{ "history":[ "Field `declared_license_expression` has been updated using values obtained from the parent POM pkg:maven/org.apache.ant/ant-parent@1.10.1", @@ -56,6 +58,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -66,6 +69,7 @@ "is_runtime":true, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/pom/ant-antlr-1.10.1-package_before.json b/minecode/tests/testfiles/maven/pom/ant-antlr-1.10.1-package_before.json index 36bcfdee..9074090d 100644 --- a/minecode/tests/testfiles/maven/pom/ant-antlr-1.10.1-package_before.json +++ b/minecode/tests/testfiles/maven/pom/ant-antlr-1.10.1-package_before.json @@ -34,6 +34,8 @@ "pkg:maven/org.apache.ant/ant-antlr@1.10.1?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -43,6 +45,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -53,6 +56,7 @@ "is_runtime":true, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/pom/pulsar-client-1x-2.5.1-package_after.json b/minecode/tests/testfiles/maven/pom/pulsar-client-1x-2.5.1-package_after.json index 8d84a655..77b00b37 100644 --- a/minecode/tests/testfiles/maven/pom/pulsar-client-1x-2.5.1-package_after.json +++ b/minecode/tests/testfiles/maven/pom/pulsar-client-1x-2.5.1-package_after.json @@ -42,6 +42,8 @@ "pkg:maven/org.apache.pulsar/pulsar-client-1x@2.5.1?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{ "history":[ "Field `declared_license_expression` has been updated using values obtained from the parent POM pkg:maven/org.apache/apache@18", @@ -57,6 +59,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -67,6 +70,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -77,6 +81,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/maven/pom/pulsar-client-1x-2.5.1-package_before.json b/minecode/tests/testfiles/maven/pom/pulsar-client-1x-2.5.1-package_before.json index e8797fb1..39406626 100644 --- a/minecode/tests/testfiles/maven/pom/pulsar-client-1x-2.5.1-package_before.json +++ b/minecode/tests/testfiles/maven/pom/pulsar-client-1x-2.5.1-package_before.json @@ -34,6 +34,8 @@ "pkg:maven/org.apache.pulsar/pulsar-client-1x@2.5.1?classifier=sources" ], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[ { @@ -43,6 +45,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -53,6 +56,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -63,6 +67,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} } From b141767e2ea2876336b67c76b98f26ce6b1cda98 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 15:54:53 -0700 Subject: [PATCH 10/18] Update pypi miner test results #518 Signed-off-by: Jono Yang --- .../testfiles/pypi/expected-CAGE-1.1.2.json | 2 ++ .../testfiles/pypi/expected-CAGE-1.1.3.json | 2 ++ .../pypi/expected-boolean.py-2.0.dev3.json | 6 +++++ .../testfiles/pypi/expected-lxml-3.2.0.json | 24 +++++++++++++++++++ .../pypi/map/expected-3to2-1.1.1.json | 2 ++ 5 files changed, 36 insertions(+) diff --git a/minecode/tests/testfiles/pypi/expected-CAGE-1.1.2.json b/minecode/tests/testfiles/pypi/expected-CAGE-1.1.2.json index 13b96934..939edc49 100644 --- a/minecode/tests/testfiles/pypi/expected-CAGE-1.1.2.json +++ b/minecode/tests/testfiles/pypi/expected-CAGE-1.1.2.json @@ -78,6 +78,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/pypi/expected-CAGE-1.1.3.json b/minecode/tests/testfiles/pypi/expected-CAGE-1.1.3.json index 5d64c9a3..25cf7e39 100644 --- a/minecode/tests/testfiles/pypi/expected-CAGE-1.1.3.json +++ b/minecode/tests/testfiles/pypi/expected-CAGE-1.1.3.json @@ -78,6 +78,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/pypi/expected-boolean.py-2.0.dev3.json b/minecode/tests/testfiles/pypi/expected-boolean.py-2.0.dev3.json index 4fc61c35..70eef64b 100644 --- a/minecode/tests/testfiles/pypi/expected-boolean.py-2.0.dev3.json +++ b/minecode/tests/testfiles/pypi/expected-boolean.py-2.0.dev3.json @@ -69,6 +69,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -147,6 +149,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -225,6 +229,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/pypi/expected-lxml-3.2.0.json b/minecode/tests/testfiles/pypi/expected-lxml-3.2.0.json index 7ecd4e9b..1171ff4a 100644 --- a/minecode/tests/testfiles/pypi/expected-lxml-3.2.0.json +++ b/minecode/tests/testfiles/pypi/expected-lxml-3.2.0.json @@ -64,6 +64,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -137,6 +139,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -210,6 +214,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -283,6 +289,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -356,6 +364,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -429,6 +439,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -502,6 +514,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -575,6 +589,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -648,6 +664,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -721,6 +739,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -794,6 +814,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -867,6 +889,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/pypi/map/expected-3to2-1.1.1.json b/minecode/tests/testfiles/pypi/map/expected-3to2-1.1.1.json index 655fd9cb..e1621871 100644 --- a/minecode/tests/testfiles/pypi/map/expected-3to2-1.1.1.json +++ b/minecode/tests/testfiles/pypi/map/expected-3to2-1.1.1.json @@ -64,6 +64,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, From 5d260ca47d0c68ce7910b705c3008c9b41be83a8 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 15:57:05 -0700 Subject: [PATCH 11/18] Update miner test results #518 Signed-off-by: Jono Yang --- .../bitbucket/map/downloads_expected.json | 2 + .../map/downloads_many_expected.json | 2 + .../bitbucket/map/repository_expected.json | 2 + .../bitbucket/map/tweakmsg_expected.json | 2 + .../expected_json_readmefile_cpanmapper.json | 2 + .../expected_json_readmefile_cpanmapper2.json | 2 + .../dockerhub/expected_dockerhubmapper.json | 2 + .../index-v2-visited-expected-mapped.json | 332 ++++++++++++++++++ .../freebsd/indexfile_expected_mapper.json | 36 ++ .../freedesktop/hal_project_expected.json | 2 + .../libinput_project_expected.json | 2 + .../mapper_calendar_builder_expected.json | 4 + .../mojombo_grit_result_mapper_expected.json | 62 ++++ .../microservice-express-mongo_expected.json | 2 + .../gstreamer/mapper_build_from_url-expected | 2 + .../model_utils/expected_updated_fields.json | 134 +++++++ .../nuget/nuget_mapper_expected.json | 2 + .../repomd_parser/centos/expected.json | 6 + .../repomd_parser/cloudera/expected.json | 6 + .../repomd_parser/cloudera2/expected.json | 6 + .../repomd_parser/opensuse/expected.json | 6 + .../repomd_parser/pgpool/expected.json | 6 + .../repomd_parser/postgresql/expected.json | 6 + 23 files changed, 628 insertions(+) diff --git a/minecode/tests/testfiles/bitbucket/map/downloads_expected.json b/minecode/tests/testfiles/bitbucket/map/downloads_expected.json index 95d5fd90..062103ff 100644 --- a/minecode/tests/testfiles/bitbucket/map/downloads_expected.json +++ b/minecode/tests/testfiles/bitbucket/map/downloads_expected.json @@ -32,6 +32,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/bitbucket/map/downloads_many_expected.json b/minecode/tests/testfiles/bitbucket/map/downloads_many_expected.json index 145ed164..a329c28e 100644 --- a/minecode/tests/testfiles/bitbucket/map/downloads_many_expected.json +++ b/minecode/tests/testfiles/bitbucket/map/downloads_many_expected.json @@ -32,6 +32,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/bitbucket/map/repository_expected.json b/minecode/tests/testfiles/bitbucket/map/repository_expected.json index f417e1f3..b9555ce2 100644 --- a/minecode/tests/testfiles/bitbucket/map/repository_expected.json +++ b/minecode/tests/testfiles/bitbucket/map/repository_expected.json @@ -39,6 +39,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/bitbucket/map/tweakmsg_expected.json b/minecode/tests/testfiles/bitbucket/map/tweakmsg_expected.json index f3b2a6a7..fc3e90ec 100644 --- a/minecode/tests/testfiles/bitbucket/map/tweakmsg_expected.json +++ b/minecode/tests/testfiles/bitbucket/map/tweakmsg_expected.json @@ -39,6 +39,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/cpan/expected_json_readmefile_cpanmapper.json b/minecode/tests/testfiles/cpan/expected_json_readmefile_cpanmapper.json index e63346dd..2beb8d7c 100644 --- a/minecode/tests/testfiles/cpan/expected_json_readmefile_cpanmapper.json +++ b/minecode/tests/testfiles/cpan/expected_json_readmefile_cpanmapper.json @@ -41,6 +41,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/cpan/expected_json_readmefile_cpanmapper2.json b/minecode/tests/testfiles/cpan/expected_json_readmefile_cpanmapper2.json index f15b4cf4..14f809ee 100644 --- a/minecode/tests/testfiles/cpan/expected_json_readmefile_cpanmapper2.json +++ b/minecode/tests/testfiles/cpan/expected_json_readmefile_cpanmapper2.json @@ -33,6 +33,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/dockerhub/expected_dockerhubmapper.json b/minecode/tests/testfiles/dockerhub/expected_dockerhubmapper.json index 88dba269..a49dedf2 100644 --- a/minecode/tests/testfiles/dockerhub/expected_dockerhubmapper.json +++ b/minecode/tests/testfiles/dockerhub/expected_dockerhubmapper.json @@ -32,6 +32,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/fdroid/index-v2-visited-expected-mapped.json b/minecode/tests/testfiles/fdroid/index-v2-visited-expected-mapped.json index 184d9e7e..ad733c73 100644 --- a/minecode/tests/testfiles/fdroid/index-v2-visited-expected-mapped.json +++ b/minecode/tests/testfiles/fdroid/index-v2-visited-expected-mapped.json @@ -58,6 +58,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/An.stop", @@ -125,6 +127,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/An.stop", @@ -192,6 +196,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/An.stop", @@ -259,6 +265,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/An.stop", @@ -326,6 +334,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/SpeedoMeterApp.main", @@ -393,6 +403,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/SpeedoMeterApp.main", @@ -460,6 +472,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/a2dp.Vol", @@ -527,6 +541,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/a2dp.Vol", @@ -594,6 +610,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/a2dp.Vol", @@ -661,6 +679,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/a2dp.Vol", @@ -728,6 +748,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/a2dp.Vol", @@ -795,6 +817,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/a2dp.Vol", @@ -863,6 +887,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/aarddict.android", @@ -931,6 +957,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/aarddict.android", @@ -999,6 +1027,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/aarddict.android", @@ -1067,6 +1097,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/aarddict.android", @@ -1135,6 +1167,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/aarddict.android", @@ -1203,6 +1237,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/aarddict.android", @@ -1278,6 +1314,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ac.robinson.mediaphone", @@ -1353,6 +1391,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ac.robinson.mediaphone", @@ -1428,6 +1468,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ac.robinson.mediaphone", @@ -1503,6 +1545,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ac.robinson.mediaphone", @@ -1578,6 +1622,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ac.robinson.mediaphone", @@ -1653,6 +1699,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ac.robinson.mediaphone", @@ -1728,6 +1776,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/acr.browser.lightning", @@ -1803,6 +1853,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/acr.browser.lightning", @@ -1878,6 +1930,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/acr.browser.lightning", @@ -1953,6 +2007,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/acr.browser.lightning", @@ -2028,6 +2084,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/acr.browser.lightning", @@ -2103,6 +2161,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/acr.browser.lightning", @@ -2178,6 +2238,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ademar.bitac", @@ -2253,6 +2315,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ademar.bitac", @@ -2328,6 +2392,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ademar.bitac", @@ -2403,6 +2469,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ademar.bitac", @@ -2478,6 +2546,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ademar.textlauncher", @@ -2553,6 +2623,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ademar.textlauncher", @@ -2628,6 +2700,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ademar.textlauncher", @@ -2703,6 +2777,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ademar.textlauncher", @@ -2778,6 +2854,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agersant.polaris", @@ -2853,6 +2931,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agersant.polaris", @@ -2928,6 +3008,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agersant.polaris", @@ -3003,6 +3085,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agersant.polaris", @@ -3078,6 +3162,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agersant.polaris", @@ -3153,6 +3239,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agersant.polaris", @@ -3220,6 +3308,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agrigolo.chubbyclick", @@ -3287,6 +3377,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agrigolo.chubbyclick", @@ -3354,6 +3446,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agrigolo.chubbyclick", @@ -3421,6 +3515,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agrigolo.chubbyclick", @@ -3488,6 +3584,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agrigolo.chubbyclick", @@ -3555,6 +3653,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/agrigolo.chubbyclick", @@ -3622,6 +3722,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ai.susi", @@ -3689,6 +3791,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ai.susi", @@ -3756,6 +3860,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ai.susi", @@ -3823,6 +3929,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ai.susi", @@ -3890,6 +3998,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ai.susi", @@ -3957,6 +4067,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/ai.susi", @@ -4025,6 +4137,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/akk.astro.droid.moonphase", @@ -4093,6 +4207,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/akk.astro.droid.moonphase", @@ -4161,6 +4277,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/akk.astro.droid.moonphase", @@ -4229,6 +4347,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/akk.astro.droid.moonphase", @@ -4296,6 +4416,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.ed.exportcontacts", @@ -4363,6 +4485,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.ed.exportcontacts", @@ -4430,6 +4554,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.ed.importcontacts", @@ -4497,6 +4623,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.ed.importcontacts", @@ -4564,6 +4692,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.ed.importcontacts", @@ -4631,6 +4761,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.ed.importcontacts", @@ -4698,6 +4830,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.ed.importcontacts", @@ -4765,6 +4899,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.ed.importcontacts", @@ -4832,6 +4968,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.zoom.mbrowser", @@ -4899,6 +5037,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.zoom.mbrowser", @@ -4966,6 +5106,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.zoom.mbrowser", @@ -5033,6 +5175,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.zoom.mbrowser", @@ -5100,6 +5244,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.zoom.mbrowser", @@ -5167,6 +5313,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.zoom.mbrowser", @@ -5234,6 +5382,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.zoom.mlauncher", @@ -5301,6 +5451,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.zoom.mlauncher", @@ -5368,6 +5520,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.zoom.mlauncher", @@ -5435,6 +5589,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/am.zoom.mlauncher", @@ -5502,6 +5658,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/amirz.dngprocessor", @@ -5569,6 +5727,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/amirz.dngprocessor", @@ -5645,6 +5805,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/amirz.rootless.nexuslauncher", @@ -5721,6 +5883,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/amirz.rootless.nexuslauncher", @@ -5796,6 +5960,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/androdns.android.leetdreams.ch.androdns", @@ -5871,6 +6037,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/androdns.android.leetdreams.ch.androdns", @@ -5946,6 +6114,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/androdns.android.leetdreams.ch.androdns", @@ -6021,6 +6191,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/androdns.android.leetdreams.ch.androdns", @@ -6096,6 +6268,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.androidVNC", @@ -6171,6 +6345,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.androidVNC", @@ -6238,6 +6414,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.game.prboom", @@ -6305,6 +6483,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.game.prboom", @@ -6380,6 +6560,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.jonas.fakestandby", @@ -6455,6 +6637,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.jonas.fakestandby", @@ -6530,6 +6714,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.jonas.fakestandby", @@ -6605,6 +6791,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.jonas.fakestandby", @@ -6680,6 +6868,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.jonas.fakestandby", @@ -6755,6 +6945,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.jonas.fakestandby", @@ -6823,6 +7015,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.nachiketa.ebookdownloader", @@ -6891,6 +7085,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.nachiketa.ebookdownloader", @@ -6959,6 +7155,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.nachiketa.ebookdownloader", @@ -7027,6 +7225,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/android.nachiketa.ebookdownloader", @@ -7094,6 +7294,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/anupam.acrylic", @@ -7161,6 +7363,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/anupam.acrylic", @@ -7228,6 +7432,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/anupam.acrylic", @@ -7295,6 +7501,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/anupam.acrylic", @@ -7362,6 +7570,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/anupam.acrylic", @@ -7429,6 +7639,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/anupam.acrylic", @@ -7505,6 +7717,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.alextran.immich", @@ -7581,6 +7795,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.alextran.immich", @@ -7657,6 +7873,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.alextran.immich", @@ -7733,6 +7951,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.alextran.immich", @@ -7809,6 +8029,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.alextran.immich", @@ -7885,6 +8107,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.alextran.immich", @@ -7952,6 +8176,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crescentcash.src", @@ -8019,6 +8245,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crescentcash.src", @@ -8086,6 +8314,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crescentcash.src", @@ -8153,6 +8383,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crescentcash.src", @@ -8220,6 +8452,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crescentcash.src", @@ -8287,6 +8521,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crescentcash.src", @@ -8354,6 +8590,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crossword.yourealwaysbe.forkyz", @@ -8421,6 +8659,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crossword.yourealwaysbe.forkyz", @@ -8488,6 +8728,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crossword.yourealwaysbe.forkyz", @@ -8555,6 +8797,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crossword.yourealwaysbe.forkyz", @@ -8622,6 +8866,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crossword.yourealwaysbe.forkyz", @@ -8689,6 +8935,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.crossword.yourealwaysbe.forkyz", @@ -8756,6 +9004,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.easytoken", @@ -8823,6 +9073,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.easytoken", @@ -8890,6 +9142,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.easytoken", @@ -8957,6 +9211,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.easytoken", @@ -9024,6 +9280,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.easytoken", @@ -9091,6 +9349,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.easytoken", @@ -9166,6 +9426,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.fedilabtube", @@ -9241,6 +9503,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.fedilabtube", @@ -9316,6 +9580,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.mobilizon", @@ -9391,6 +9657,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.mobilizon", @@ -9466,6 +9734,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.mobilizon", @@ -9541,6 +9811,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.mobilizon", @@ -9616,6 +9888,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.mobilizon", @@ -9691,6 +9965,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.mobilizon", @@ -9758,6 +10034,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizeme", @@ -9825,6 +10103,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizeme", @@ -9892,6 +10172,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizeme", @@ -9959,6 +10241,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizeme", @@ -10026,6 +10310,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizeme", @@ -10093,6 +10379,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizeme", @@ -10160,6 +10448,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizemelite", @@ -10227,6 +10517,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizemelite", @@ -10294,6 +10586,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizemelite", @@ -10361,6 +10655,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizemelite", @@ -10428,6 +10724,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizemelite", @@ -10495,6 +10793,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.nitterizemelite", @@ -10562,6 +10862,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.openmaps", @@ -10629,6 +10931,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.openmaps", @@ -10696,6 +11000,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.openmaps", @@ -10763,6 +11069,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.openmaps", @@ -10830,6 +11138,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.openmaps", @@ -10897,6 +11207,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.openmaps", @@ -10972,6 +11284,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.tubelab", @@ -11047,6 +11361,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.fedilab.tubelab", @@ -11122,6 +11438,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.intra", @@ -11197,6 +11515,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.intra", @@ -11264,6 +11584,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.librenews.io.librenews", @@ -11331,6 +11653,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.librenews.io.librenews", @@ -11398,6 +11722,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.librenews.io.librenews", @@ -11465,6 +11791,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.librenews.io.librenews", @@ -11532,6 +11860,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.librenews.io.librenews", @@ -11599,6 +11929,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":"https://f-droid.org/en/packages/app.librenews.io.librenews", diff --git a/minecode/tests/testfiles/freebsd/indexfile_expected_mapper.json b/minecode/tests/testfiles/freebsd/indexfile_expected_mapper.json index 375dde91..690cffbc 100644 --- a/minecode/tests/testfiles/freebsd/indexfile_expected_mapper.json +++ b/minecode/tests/testfiles/freebsd/indexfile_expected_mapper.json @@ -48,6 +48,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -104,6 +106,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -184,6 +188,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -262,6 +268,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -341,6 +349,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -396,6 +406,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -451,6 +463,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -507,6 +521,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -563,6 +579,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -618,6 +636,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -673,6 +693,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -728,6 +750,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -783,6 +807,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -838,6 +864,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -893,6 +921,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -973,6 +1003,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -1053,6 +1085,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -1131,6 +1165,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/freedesktop/hal_project_expected.json b/minecode/tests/testfiles/freedesktop/hal_project_expected.json index ac368975..3bb1b91a 100644 --- a/minecode/tests/testfiles/freedesktop/hal_project_expected.json +++ b/minecode/tests/testfiles/freedesktop/hal_project_expected.json @@ -32,6 +32,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/freedesktop/libinput_project_expected.json b/minecode/tests/testfiles/freedesktop/libinput_project_expected.json index 0bb4d89f..2ee14d91 100644 --- a/minecode/tests/testfiles/freedesktop/libinput_project_expected.json +++ b/minecode/tests/testfiles/freedesktop/libinput_project_expected.json @@ -32,6 +32,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/github/mapper_calendar_builder_expected.json b/minecode/tests/testfiles/github/mapper_calendar_builder_expected.json index 06d3cd73..a5b4856d 100644 --- a/minecode/tests/testfiles/github/mapper_calendar_builder_expected.json +++ b/minecode/tests/testfiles/github/mapper_calendar_builder_expected.json @@ -40,6 +40,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -90,6 +92,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/github/mojombo_grit_result_mapper_expected.json b/minecode/tests/testfiles/github/mojombo_grit_result_mapper_expected.json index 1bf15ece..2a6cc0c3 100644 --- a/minecode/tests/testfiles/github/mojombo_grit_result_mapper_expected.json +++ b/minecode/tests/testfiles/github/mojombo_grit_result_mapper_expected.json @@ -40,6 +40,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -90,6 +92,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -140,6 +144,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -190,6 +196,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -240,6 +248,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -290,6 +300,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -340,6 +352,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -390,6 +404,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -440,6 +456,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -490,6 +508,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -540,6 +560,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -590,6 +612,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -640,6 +664,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -690,6 +716,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -740,6 +768,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -790,6 +820,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -840,6 +872,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -890,6 +924,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -940,6 +976,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -990,6 +1028,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1040,6 +1080,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1090,6 +1132,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1140,6 +1184,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1190,6 +1236,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1240,6 +1288,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1290,6 +1340,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1340,6 +1392,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1390,6 +1444,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1440,6 +1496,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1490,6 +1548,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1540,6 +1600,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/gitlab/microservice-express-mongo_expected.json b/minecode/tests/testfiles/gitlab/microservice-express-mongo_expected.json index f9731760..415ecba6 100644 --- a/minecode/tests/testfiles/gitlab/microservice-express-mongo_expected.json +++ b/minecode/tests/testfiles/gitlab/microservice-express-mongo_expected.json @@ -32,6 +32,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/gstreamer/mapper_build_from_url-expected b/minecode/tests/testfiles/gstreamer/mapper_build_from_url-expected index 1008d394..f8349426 100644 --- a/minecode/tests/testfiles/gstreamer/mapper_build_from_url-expected +++ b/minecode/tests/testfiles/gstreamer/mapper_build_from_url-expected @@ -32,6 +32,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/model_utils/expected_updated_fields.json b/minecode/tests/testfiles/model_utils/expected_updated_fields.json index fcd5ffa6..b4a951ea 100644 --- a/minecode/tests/testfiles/model_utils/expected_updated_fields.json +++ b/minecode/tests/testfiles/model_utils/expected_updated_fields.json @@ -145,6 +145,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -155,6 +156,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -165,6 +167,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -175,6 +178,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -185,6 +189,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -195,6 +200,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -205,6 +211,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -215,6 +222,7 @@ "is_runtime":false, "is_optional":true, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -225,6 +233,7 @@ "is_runtime":true, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -235,6 +244,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -245,6 +255,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -255,6 +266,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -265,6 +277,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -275,6 +288,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -285,6 +299,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -295,6 +310,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -305,6 +321,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -315,6 +332,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -325,6 +343,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -335,6 +354,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -345,6 +365,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -355,6 +376,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -365,6 +387,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -375,6 +398,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -385,6 +409,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -395,6 +420,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -405,6 +431,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -415,6 +442,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -425,6 +453,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -435,6 +464,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -445,6 +475,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -455,6 +486,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -465,6 +497,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -475,6 +508,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -485,6 +519,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -495,6 +530,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -505,6 +541,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -515,6 +552,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -525,6 +563,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -535,6 +574,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -545,6 +585,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -555,6 +596,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -565,6 +607,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -575,6 +618,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -585,6 +629,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -595,6 +640,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -605,6 +651,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -615,6 +662,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -625,6 +673,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -635,6 +684,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -645,6 +695,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -655,6 +706,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -665,6 +717,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -675,6 +728,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -685,6 +739,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -695,6 +750,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -705,6 +761,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -715,6 +772,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -725,6 +783,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -735,6 +794,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -745,6 +805,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -755,6 +816,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -765,6 +827,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -775,6 +838,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -785,6 +849,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -795,6 +860,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -805,6 +871,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -815,6 +882,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -825,6 +893,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -835,6 +904,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -845,6 +915,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -855,6 +926,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -865,6 +937,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -875,6 +948,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -885,6 +959,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -895,6 +970,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -905,6 +981,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -915,6 +992,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -925,6 +1003,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -935,6 +1014,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -945,6 +1025,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -955,6 +1036,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -965,6 +1047,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -975,6 +1058,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -985,6 +1069,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -995,6 +1080,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1005,6 +1091,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1015,6 +1102,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1025,6 +1113,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1035,6 +1124,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1045,6 +1135,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1055,6 +1146,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1065,6 +1157,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1075,6 +1168,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1085,6 +1179,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1095,6 +1190,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1105,6 +1201,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1115,6 +1212,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1125,6 +1223,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1135,6 +1234,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1145,6 +1245,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1155,6 +1256,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1165,6 +1267,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1175,6 +1278,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1185,6 +1289,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1195,6 +1300,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1205,6 +1311,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1215,6 +1322,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1225,6 +1333,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1235,6 +1344,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1245,6 +1355,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1255,6 +1366,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1265,6 +1377,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1275,6 +1388,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1285,6 +1399,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1295,6 +1410,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1305,6 +1421,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1315,6 +1432,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1325,6 +1443,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1335,6 +1454,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1345,6 +1465,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1355,6 +1476,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":false, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1365,6 +1487,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1375,6 +1498,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1385,6 +1509,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1395,6 +1520,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1405,6 +1531,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1415,6 +1542,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1425,6 +1553,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1435,6 +1564,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1445,6 +1575,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1455,6 +1586,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1465,6 +1597,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} }, @@ -1475,6 +1608,7 @@ "is_runtime":false, "is_optional":false, "is_resolved":true, + "is_direct":true, "resolved_package":{}, "extra_data":{} } diff --git a/minecode/tests/testfiles/nuget/nuget_mapper_expected.json b/minecode/tests/testfiles/nuget/nuget_mapper_expected.json index f7af895a..be2daa25 100644 --- a/minecode/tests/testfiles/nuget/nuget_mapper_expected.json +++ b/minecode/tests/testfiles/nuget/nuget_mapper_expected.json @@ -71,6 +71,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/repodata_rpms/repomd_parser/centos/expected.json b/minecode/tests/testfiles/repodata_rpms/repomd_parser/centos/expected.json index ca5e1941..f7486d35 100644 --- a/minecode/tests/testfiles/repodata_rpms/repomd_parser/centos/expected.json +++ b/minecode/tests/testfiles/repodata_rpms/repomd_parser/centos/expected.json @@ -56,6 +56,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -121,6 +123,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -186,6 +190,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/repodata_rpms/repomd_parser/cloudera/expected.json b/minecode/tests/testfiles/repodata_rpms/repomd_parser/cloudera/expected.json index 11c1bf41..9751bb4e 100644 --- a/minecode/tests/testfiles/repodata_rpms/repomd_parser/cloudera/expected.json +++ b/minecode/tests/testfiles/repodata_rpms/repomd_parser/cloudera/expected.json @@ -56,6 +56,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -121,6 +123,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -186,6 +190,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/repodata_rpms/repomd_parser/cloudera2/expected.json b/minecode/tests/testfiles/repodata_rpms/repomd_parser/cloudera2/expected.json index c1a09dfb..e93850f0 100644 --- a/minecode/tests/testfiles/repodata_rpms/repomd_parser/cloudera2/expected.json +++ b/minecode/tests/testfiles/repodata_rpms/repomd_parser/cloudera2/expected.json @@ -56,6 +56,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -121,6 +123,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -186,6 +190,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/repodata_rpms/repomd_parser/opensuse/expected.json b/minecode/tests/testfiles/repodata_rpms/repomd_parser/opensuse/expected.json index 932d7ce4..8143edae 100644 --- a/minecode/tests/testfiles/repodata_rpms/repomd_parser/opensuse/expected.json +++ b/minecode/tests/testfiles/repodata_rpms/repomd_parser/opensuse/expected.json @@ -56,6 +56,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -121,6 +123,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -186,6 +190,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/repodata_rpms/repomd_parser/pgpool/expected.json b/minecode/tests/testfiles/repodata_rpms/repomd_parser/pgpool/expected.json index 80f54d42..73a2ba8d 100644 --- a/minecode/tests/testfiles/repodata_rpms/repomd_parser/pgpool/expected.json +++ b/minecode/tests/testfiles/repodata_rpms/repomd_parser/pgpool/expected.json @@ -56,6 +56,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -121,6 +123,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -186,6 +190,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, diff --git a/minecode/tests/testfiles/repodata_rpms/repomd_parser/postgresql/expected.json b/minecode/tests/testfiles/repodata_rpms/repomd_parser/postgresql/expected.json index 7a77f748..233861ae 100644 --- a/minecode/tests/testfiles/repodata_rpms/repomd_parser/postgresql/expected.json +++ b/minecode/tests/testfiles/repodata_rpms/repomd_parser/postgresql/expected.json @@ -56,6 +56,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -121,6 +123,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, @@ -186,6 +190,8 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, From 1aa5b57023872aa00e7939e7ec7c78462eb763bf Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 16:14:40 -0700 Subject: [PATCH 12/18] Set license_detections field #518 Signed-off-by: Jono Yang --- minecode/mappers/bower.py | 1 + minecode/mappers/cpan.py | 1 + minecode/mappers/googlecode.py | 2 ++ minecode/mappers/nuget.py | 2 ++ minecode/mappers/openssl.py | 1 + minecode/mappers/packagist.py | 1 + minecode/mappers/sourceforge.py | 1 + minecode/tests/testfiles/bower/expected_28msec_bower.json | 2 ++ .../testfiles/bower/expected_mapper_example1_bower.json | 2 ++ .../tests/testfiles/sourceforge/mapper_odanur_expected.json | 6 +++++- 10 files changed, 18 insertions(+), 1 deletion(-) diff --git a/minecode/mappers/bower.py b/minecode/mappers/bower.py index 5567bf3a..ffc1a8fa 100644 --- a/minecode/mappers/bower.py +++ b/minecode/mappers/bower.py @@ -81,6 +81,7 @@ def build_packages_from_jsonfile(metadata, uri=None, purl=None): keywords=keywords_content, homepage_url=content.get('homepage'), datasource_id='bower_json', + license_detections=[], ) if extracted_license_statement: diff --git a/minecode/mappers/cpan.py b/minecode/mappers/cpan.py index ac25f47a..e8c5e620 100644 --- a/minecode/mappers/cpan.py +++ b/minecode/mappers/cpan.py @@ -57,6 +57,7 @@ def build_packages_from_release_json(metadata, uri=None): version=release.get('version'), download_url=release.get('download_url'), extracted_license_statement=extracted_license_statement, + license_detections=[], # the date format passing is like: # "2014-04-20T21:30:13" release_date=parse_date(release.get('date')), diff --git a/minecode/mappers/googlecode.py b/minecode/mappers/googlecode.py index 16bd8f11..03e09312 100644 --- a/minecode/mappers/googlecode.py +++ b/minecode/mappers/googlecode.py @@ -54,6 +54,7 @@ def build_packages_from_projectsjson_v2(metadata, purl=None, uri=None): license_name = metadata.get('license') if license_name: common_data['extracted_license_statement'] = license_name + common_data['license_detections'] = [] keywords = [] labels = metadata.get('labels') @@ -100,6 +101,7 @@ def build_packages_from_projectsjson_v1(metadata, purl=None, uri=None): license_name = metadata.get('license') if license_name: common_data['extracted_license_statement'] = license_name + common_data['license_detections'] = [] keywords = [] labels = metadata.get('labels') diff --git a/minecode/mappers/nuget.py b/minecode/mappers/nuget.py index e4a8d63d..d939f980 100644 --- a/minecode/mappers/nuget.py +++ b/minecode/mappers/nuget.py @@ -64,6 +64,7 @@ def build_packages_with_json(metadata, purl=None): homepage_url=metadata.get('projectUrl'), description=description, extracted_license_statement=licenseUrl, + license_detections=[], copyright=copyr, parties=authors, keywords=keywords, @@ -168,6 +169,7 @@ def build_packages_from_html(metadata, uri, purl=None): description=description, download_url=download_url, extracted_license_statement=license_value, + license_detections=[], copyright=copyright_value ) package = scan_models.Package.from_package_data( diff --git a/minecode/mappers/openssl.py b/minecode/mappers/openssl.py index 0881e245..fd76ac51 100644 --- a/minecode/mappers/openssl.py +++ b/minecode/mappers/openssl.py @@ -53,6 +53,7 @@ def build_packages(resource_uri, purl=None): size=resource_uri.size, release_date=parse_date(resource_uri.last_modified_date), extracted_license_statement='OpenSSL License', + license_detections=[], homepage_url='https://www.openssl.org/', download_url=uri, copyright='Copyright (c) 1998-2018 The OpenSSL Project\nCopyright (c) 1995-1998 Eric A. Young, Tim J. Hudson\nAll rights reserved.', diff --git a/minecode/mappers/packagist.py b/minecode/mappers/packagist.py index b4713216..3c474c42 100644 --- a/minecode/mappers/packagist.py +++ b/minecode/mappers/packagist.py @@ -77,6 +77,7 @@ def build_packages_with_json(metadata, purl=None, uri=None): extracted_license_statement.add(lic) if extracted_license_statement: common['extracted_license_statement'] = list(extracted_license_statement) + common['license_detections'] = [] dependencies = [] for name, version in version_content.get('require', {}).items(): diff --git a/minecode/mappers/sourceforge.py b/minecode/mappers/sourceforge.py index 48dc8086..8b2b40b0 100644 --- a/minecode/mappers/sourceforge.py +++ b/minecode/mappers/sourceforge.py @@ -51,6 +51,7 @@ def build_packages_from_metafile(metadata, purl=None, uri=None): name=metadata.get('shortname', metadata.get('name')), description=description, homepage_url=metadata.get('external_homepage', metadata.get('url')), + license_detections=[], ) devs = metadata.get('developers') or [] diff --git a/minecode/tests/testfiles/bower/expected_28msec_bower.json b/minecode/tests/testfiles/bower/expected_28msec_bower.json index ad8c0c07..0718ef3d 100644 --- a/minecode/tests/testfiles/bower/expected_28msec_bower.json +++ b/minecode/tests/testfiles/bower/expected_28msec_bower.json @@ -40,6 +40,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/bower/expected_mapper_example1_bower.json b/minecode/tests/testfiles/bower/expected_mapper_example1_bower.json index 56a791d8..f74bf0cb 100644 --- a/minecode/tests/testfiles/bower/expected_mapper_example1_bower.json +++ b/minecode/tests/testfiles/bower/expected_mapper_example1_bower.json @@ -74,6 +74,8 @@ "extracted_license_statement":"- NewBSD\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json b/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json index f00aed6e..5fb55772 100644 --- a/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json +++ b/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json @@ -40,12 +40,16 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:sourceforge/odanur?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "sourceforge_metadata" ], From 9f52137f93c772edf33ad436f36997bbc06e6e07 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 16:14:57 -0700 Subject: [PATCH 13/18] Bump dependencies #518 Signed-off-by: Jono Yang --- setup.cfg | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/setup.cfg b/setup.cfg index 9d09122c..1bfa9fa6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,34 +35,34 @@ packages = find: include_package_data = true zip_safe = false install_requires = - arrow == 1.2.3 - bitarray == 2.6.0 + arrow == 1.3.0 + bitarray == 2.9.2 debian-inspector == 31.1.0 commoncode == 31.2.1 - Django == 5.0.6 + Django == 5.0.7 django-environ == 0.11.2 django-rq == 2.10.2 - djangorestframework == 3.15.1 + djangorestframework == 3.15.2 django-filter == 24.2 - drf-spectacular == 0.26.5 + drf-spectacular == 0.27.2 fetchcode == 0.5.1 gunicorn == 22.0.0 - ftputil == 5.0.4 + ftputil == 5.1.0 jawa == 2.2.0 - markdown == 3.5.1 - natsort == 8.2.0 - packageurl-python == 0.15.0 - psycopg[binary] == 3.1.19 - PyGithub == 1.56 + markdown == 3.6 + natsort == 8.4.0 + packageurl-python == 0.15.4 + psycopg[binary] == 3.2.1 + PyGithub == 2.3.0 reppy2 == 0.3.6 rq-scheduler == 0.13.1 rubymarshal == 1.0.3 - scancode-toolkit[packages] @ git+https://github.com/nexB/scancode-toolkit.git@684360f2ca01bc676368bc8621eed65065bf0f11 + scancode-toolkit[packages] == 32.2.1 urlpy == 0.5 matchcode-toolkit == 5.1.0 purl2vcs == 1.0.2 univers == 30.11.0 - scancodeio @ git+https://github.com/nexB/scancode.io.git@07b48c0224f5c2ad1b2972b693702ef685f16c98 + scancodeio == 34.7.1 gitpython == 3.1.43 setup_requires = setuptools_scm[toml] >= 4 From 5aff5e3a4a49f9eaa7da0b361263f4ed995b1f34 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Tue, 6 Aug 2024 13:13:32 -0700 Subject: [PATCH 14/18] Update package type for cpan and php #518 Signed-off-by: Jono Yang --- minecode/mappers/cpan.py | 2 +- minecode/mappers/packagist.py | 2 +- .../cpan/expected_json_cpanmapper.json | 4 +- .../cpan/expected_release_search.json | 216 +++++++++++++----- ...pected_release_search_author_MIYAGAWA.json | 136 ++++++++--- .../cpan/expected_yaml_cpanmapper.json | 4 +- ...aglist_00f100_cakephp-opauth_expected.json | 8 +- 7 files changed, 278 insertions(+), 94 deletions(-) diff --git a/minecode/mappers/cpan.py b/minecode/mappers/cpan.py index e8c5e620..1f57231f 100644 --- a/minecode/mappers/cpan.py +++ b/minecode/mappers/cpan.py @@ -178,7 +178,7 @@ def build_packages_from_metafile(metadata, uri=None, purl=None): # https://spdx.org/spdx-specification-21-web-version#h.49x2ik5 vcs_repo = vcs_tool + '+' + vcs_repo common_data = dict( - datasource_id="cpan_metadata_json", + datasource_id="cpan_meta_json", type='cpan', name=name, description=content.get('abstract', name), diff --git a/minecode/mappers/packagist.py b/minecode/mappers/packagist.py index 3c474c42..fe70fe7d 100644 --- a/minecode/mappers/packagist.py +++ b/minecode/mappers/packagist.py @@ -42,7 +42,7 @@ def build_packages_with_json(metadata, purl=None, uri=None): primary_language = package.get('language') for version_content in package.get('versions').values(): common = dict( - datasource_id='composer_json', + datasource_id='php_composer_json', type='composer', name=version_content.get('name'), description=version_content.get('description'), diff --git a/minecode/tests/testfiles/cpan/expected_json_cpanmapper.json b/minecode/tests/testfiles/cpan/expected_json_cpanmapper.json index 7f09c92e..97adc650 100644 --- a/minecode/tests/testfiles/cpan/expected_json_cpanmapper.json +++ b/minecode/tests/testfiles/cpan/expected_json_cpanmapper.json @@ -67,12 +67,14 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, - "datasource_id":"cpan_metadata_json", + "datasource_id":"cpan_meta_json", "purl":"pkg:cpan/Regexp-Common@2016010701" } ] \ No newline at end of file diff --git a/minecode/tests/testfiles/cpan/expected_release_search.json b/minecode/tests/testfiles/cpan/expected_release_search.json index bbec0cd3..099f5628 100644 --- a/minecode/tests/testfiles/cpan/expected_release_search.json +++ b/minecode/tests/testfiles/cpan/expected_release_search.json @@ -63,6 +63,8 @@ "extracted_license_statement":"- bsd\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -72,7 +74,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDJ-1.00@1.00" }, @@ -140,6 +142,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -149,7 +153,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Win32-Snarl-0.03@0.03" }, @@ -217,6 +221,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -226,7 +232,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDJ-1.03@1.03" }, @@ -294,6 +300,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -303,7 +311,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-1.09@1.09" }, @@ -371,6 +379,8 @@ "extracted_license_statement":"- bsd\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -380,7 +390,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDJ-1.01@1.01" }, @@ -448,6 +458,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -457,7 +469,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/WWW-Jawbone-Up-1.32.1@1.32.1" }, @@ -525,6 +537,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -534,7 +548,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-MPD-0.02@0.02" }, @@ -602,6 +616,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -611,7 +627,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDJ-1.07@1.07" }, @@ -679,6 +695,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -688,7 +706,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.03@0.03" }, @@ -756,6 +774,8 @@ "extracted_license_statement":"- bsd\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -765,7 +785,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-MPD-0.06@0.06" }, @@ -833,6 +853,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -842,7 +864,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-Sybil-0.1@0.1" }, @@ -910,6 +932,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -919,7 +943,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-0.02@0.02" }, @@ -987,6 +1011,8 @@ "extracted_license_statement":"- unknown\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -996,7 +1022,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-0.01@0.01" }, @@ -1064,6 +1090,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1073,7 +1101,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Win32-Snarl-withoutworldwriteables@0.04" }, @@ -1141,6 +1169,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1150,7 +1180,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.06@0.06" }, @@ -1218,6 +1248,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1227,7 +1259,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDJ-1.09@1.09" }, @@ -1295,6 +1327,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1304,7 +1338,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/WWW-Jawbone-Up-1.32.4@1.32.4" }, @@ -1372,6 +1406,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1381,7 +1417,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-0.04@0.04" }, @@ -1449,6 +1485,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1458,7 +1496,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDSync-0.01@0.01" }, @@ -1526,6 +1564,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1535,7 +1575,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.05@0.05" }, @@ -1603,6 +1643,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1612,7 +1654,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/WWW-Jawbone-Up-1.32.2@1.32.2" }, @@ -1680,6 +1722,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1689,7 +1733,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-MPD-0.05@0.05" }, @@ -1757,6 +1801,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1766,7 +1812,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/WWW-Jawbone-Up-1.32.3@1.32.3" }, @@ -1834,6 +1880,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1843,7 +1891,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.04@0.04" }, @@ -1911,6 +1959,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1920,7 +1970,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDJ-1.02@1.02" }, @@ -1988,6 +2038,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1997,7 +2049,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/WWW-Jawbone-Up-1.32.0@1.32.0" }, @@ -2065,6 +2117,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2074,7 +2128,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.01@0.01" }, @@ -2142,6 +2196,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2151,7 +2207,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-1.08@1.08" }, @@ -2219,6 +2275,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2228,7 +2286,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDJ-1.05@1.05" }, @@ -2296,6 +2354,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2305,7 +2365,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDJ-1.08@1.08" }, @@ -2373,6 +2433,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2382,7 +2444,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-MPD-0.04@0.04" }, @@ -2450,6 +2512,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2459,7 +2523,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-0.05@0.05" }, @@ -2527,6 +2591,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2536,7 +2602,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/win32-snarl-1.01@0.04" }, @@ -2604,6 +2670,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2613,7 +2681,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-Sybil-0.4@0.4" }, @@ -2681,6 +2749,8 @@ "extracted_license_statement":"- bsd\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2690,7 +2760,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-1.10@1.10" }, @@ -2758,6 +2828,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2767,7 +2839,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-1.1@1.1" }, @@ -2835,6 +2907,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2844,7 +2918,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-1.07@1.07" }, @@ -2912,6 +2986,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2921,7 +2997,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-1.06@1.06" }, @@ -2989,6 +3065,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2998,7 +3076,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.02@0.02" }, @@ -3066,6 +3144,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3075,7 +3155,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDJ-1.04@1.04" }, @@ -3143,6 +3223,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3152,7 +3234,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDJ-1.06@1.06" }, @@ -3220,6 +3302,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3229,7 +3313,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-MPD-0.01@0.01" }, @@ -3297,6 +3381,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3306,7 +3392,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-MPD-0.03@0.03" }, @@ -3374,6 +3460,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3383,7 +3471,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-0.03@0.03" }, @@ -3451,6 +3539,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3460,7 +3550,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-0.02-withoutworldwriteables@0.02" }, @@ -3528,6 +3618,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3537,7 +3629,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Win32-Snarl-1.00@0.04" }, @@ -3605,6 +3697,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3614,7 +3708,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-Sybil-0.2@0.2" }, @@ -3682,6 +3776,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3691,7 +3787,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-Sybil-0.3@0.3" }, @@ -3759,6 +3855,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3768,7 +3866,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Win32-Snarl-0.01@0.01" }, @@ -3836,6 +3934,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3845,7 +3945,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Win32-Snarl-0.02@0.02" }, @@ -3913,6 +4013,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3922,7 +4024,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-Snarl-1.09-TRIAL@1.09" }, @@ -3990,6 +4092,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -3999,7 +4103,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-MPD-0.07@0.07" }, @@ -4067,6 +4171,8 @@ "extracted_license_statement":"- mit\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -4076,7 +4182,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-MPDSync-0.02@0.02" }, @@ -4144,6 +4250,8 @@ "extracted_license_statement":"- bsd\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -4153,7 +4261,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/App-Sybil-0.5@0.5" } diff --git a/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json b/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json index aede200e..cc15ea37 100644 --- a/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json +++ b/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json @@ -63,6 +63,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -72,7 +74,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0037@1.0037" }, @@ -140,6 +142,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -149,7 +153,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0005@1.0005" }, @@ -217,6 +221,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -226,7 +232,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0009@1.0009" }, @@ -294,6 +300,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -303,7 +311,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0001@1.0001" }, @@ -371,6 +379,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -380,7 +390,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0002@1.0002" }, @@ -448,6 +458,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -457,7 +469,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0014@1.0014" }, @@ -525,6 +537,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -534,7 +548,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0027@1.0027" }, @@ -602,6 +616,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -611,7 +627,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0028@1.0028" }, @@ -679,6 +695,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -688,7 +706,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0018@1.0018" }, @@ -756,6 +774,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -765,7 +785,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0020@1.0020" }, @@ -833,6 +853,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -842,7 +864,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0022@1.0022" }, @@ -910,6 +932,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -919,7 +943,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0021@1.0021" }, @@ -987,6 +1011,8 @@ "extracted_license_statement":"- unknown\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -996,7 +1022,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Bundle-Sledge-0.04@0.04" }, @@ -1064,6 +1090,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1073,7 +1101,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Video-Subtitle-SRT-0.01@0.01" }, @@ -1141,6 +1169,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1150,7 +1180,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0032@1.0032" }, @@ -1218,6 +1248,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1227,7 +1259,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Carmel-v0.1.34@v0.1.34" }, @@ -1295,6 +1327,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1304,7 +1338,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Plack-1.0046@1.0046" }, @@ -1372,6 +1406,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1381,7 +1417,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Filesys-Notify-Simple-0.12@0.12" }, @@ -1449,6 +1485,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1458,7 +1496,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/carton-v0.9.10@v0.9.10" }, @@ -1526,6 +1564,8 @@ "extracted_license_statement":"- perl_5\n- http://dev.perl.org/licenses/\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1535,7 +1575,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/carton-v0.9_8@v0.9_8" }, @@ -1603,6 +1643,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1612,7 +1654,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/carton-v0.9.50-TRIAL@v0.9.50" }, @@ -1680,6 +1722,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1689,7 +1733,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/carton-v0.9.57-TRIAL@v0.9.57" }, @@ -1757,6 +1801,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1766,7 +1812,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/carton-v0.9.59-TRIAL@v0.9.59" }, @@ -1834,6 +1880,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1843,7 +1891,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/carton-v0.9.61-TRIAL@v0.9.61" }, @@ -1911,6 +1959,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1920,7 +1970,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/carton-v0.9.67-TRIAL@v0.9.67" }, @@ -1988,6 +2038,8 @@ "extracted_license_statement":"- unknown\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -1997,7 +2049,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/WebService-Google-Suggest-0.02@0.02" }, @@ -2065,6 +2117,8 @@ "extracted_license_statement":"- unknown\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2074,7 +2128,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/HTTP-MobileAgent-0.16@0.16" }, @@ -2142,6 +2196,8 @@ "extracted_license_statement":"- unknown\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2151,7 +2207,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Email-Find-0.09@0.09" }, @@ -2219,6 +2275,8 @@ "extracted_license_statement":"- unknown\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2228,7 +2286,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/POE-Component-YahooMessenger-0.04@0.04" }, @@ -2296,6 +2354,8 @@ "extracted_license_statement":"- perl_5\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2305,7 +2365,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Kwiki-Emoticon-0.01@0.01" }, @@ -2373,6 +2433,8 @@ "extracted_license_statement":"- unknown\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2382,7 +2444,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Net-IPAddr-Find-0.01@0.01" }, @@ -2450,6 +2512,8 @@ "extracted_license_statement":"- unknown\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2459,7 +2523,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Email-Valid-Loose-0.03@0.03" }, @@ -2527,6 +2591,8 @@ "extracted_license_statement":"- unknown\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2536,7 +2602,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Kwiki-TypeKey-0.07@0.07" }, @@ -2604,6 +2670,8 @@ "extracted_license_statement":"- unknown\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -2613,7 +2681,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_release_json" + "cpan_meta_json" ], "purl":"pkg:cpan/Text-Emoticon-Yahoo-0.01@0.01" } diff --git a/minecode/tests/testfiles/cpan/expected_yaml_cpanmapper.json b/minecode/tests/testfiles/cpan/expected_yaml_cpanmapper.json index b87b9ba6..4eb7c0ef 100644 --- a/minecode/tests/testfiles/cpan/expected_yaml_cpanmapper.json +++ b/minecode/tests/testfiles/cpan/expected_yaml_cpanmapper.json @@ -64,12 +64,14 @@ "notice_text":null, "source_packages":[], "file_references":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "dependencies":[], "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, - "datasource_id":"cpan_metadata_json", + "datasource_id":"cpan_meta_json", "purl":"pkg:cpan/variable@2009110702" } ] \ No newline at end of file diff --git a/minecode/tests/testfiles/packagist/packaglist_00f100_cakephp-opauth_expected.json b/minecode/tests/testfiles/packagist/packaglist_00f100_cakephp-opauth_expected.json index 7311f8ff..1c2ce312 100644 --- a/minecode/tests/testfiles/packagist/packaglist_00f100_cakephp-opauth_expected.json +++ b/minecode/tests/testfiles/packagist/packaglist_00f100_cakephp-opauth_expected.json @@ -76,14 +76,18 @@ "extracted_license_statement":"- MIT\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:composer/00f100/cakephp-opauth@dev-master?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ - "composer_json" + "php_composer_json" ], "purl":"pkg:composer/00f100/cakephp-opauth@dev-master" } From e4202436510fb5843417d5a5c6174dfcc0695fdc Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Tue, 6 Aug 2024 15:07:09 -0700 Subject: [PATCH 15/18] Update Dockerfile and compose files #518 Signed-off-by: Jono Yang --- Dockerfile | 47 ++++++++++++++++++++++++++++++++------- docker-compose.common.yml | 10 +++++++-- docker-compose.yml | 2 ++ 3 files changed, 49 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 64447f8b..d2e9faeb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,23 @@ # Copyright (c) nexB Inc. and others. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -FROM --platform=linux/amd64 python:3.11 +FROM --platform=linux/amd64 python:3.12-slim -WORKDIR /app +LABEL org.opencontainers.image.source="https://github.com/nexB/purldb" +LABEL org.opencontainers.image.description="PurlDB" +LABEL org.opencontainers.image.licenses="Apache-2.0" -# Python settings: Force unbuffered stdout and stderr (i.e. they are flushed to terminal immediately) +ENV APP_NAME purldb +ENV APP_USER app +ENV APP_DIR /opt/$APP_NAME +ENV VENV_LOCATION /opt/$APP_NAME/venv + +# Force Python unbuffered stdout and stderr (they are flushed to terminal immediately) ENV PYTHONUNBUFFERED 1 -# Python settings: do not write pyc files +# Do not write Python .pyc files ENV PYTHONDONTWRITEBYTECODE 1 +# Add the app dir in the Python path for entry points availability +ENV PYTHONPATH $PYTHONPATH:$APP_DIR # OS requirements as per # https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html @@ -33,9 +42,31 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +# Create the APP_USER group and user +RUN addgroup --system $APP_USER \ + && adduser --system --group --home=$APP_DIR $APP_USER \ + && chown $APP_USER:$APP_USER $APP_DIR + +# Create the /var/APP_NAME directory with proper permission for APP_USER +RUN mkdir -p /var/$APP_NAME \ + && chown $APP_USER:$APP_USER /var/$APP_NAME + +# Setup the work directory and the user as APP_USER for the remaining stages +WORKDIR $APP_DIR +USER $APP_USER + +# Create the virtualenv +RUN python -m venv $VENV_LOCATION +# Enable the virtualenv, similar effect as "source activate" +ENV PATH $VENV_LOCATION/bin:$PATH + +# Create static/ and workspace/ directories +RUN mkdir -p /var/$APP_NAME/static/ \ + && mkdir -p /var/$APP_NAME/workspace/ + # Install the dependencies before the codebase COPY for proper Docker layer caching -COPY setup.cfg setup.py requirements.txt /app/ -RUN pip install --no-cache-dir -c requirements.txt . +COPY --chown=$APP_USER:$APP_USER setup.cfg setup.py $APP_DIR/ +RUN pip install --no-cache-dir . -# Copy the codebase -COPY . /app +# Copy the codebase and set the proper permissions for the APP_USER +COPY --chown=$APP_USER:$APP_USER . $APP_DIR diff --git a/docker-compose.common.yml b/docker-compose.common.yml index a887a6f6..a0256022 100644 --- a/docker-compose.common.yml +++ b/docker-compose.common.yml @@ -5,6 +5,8 @@ services: - docker_purldb.env volumes: - db_data:/var/lib/postgresql/data/ + shm_size: "1gb" + restart: always redis: image: redis @@ -15,7 +17,7 @@ services: web: build: . - command: sh -c " + command: wait-for-it --strict --timeout=60 db:5432 -- sh -c " python manage_purldb.py migrate && python manage_purldb.py collectstatic --no-input --verbosity 0 --clear && gunicorn purldb_project.wsgi:application --bind :8000 --timeout 600 --workers 8" @@ -24,9 +26,10 @@ services: expose: - 8000 volumes: + - .env:/opt/purldb/.env - /etc/purldb/:/etc/purldb/ - - static:/var/purldb/static/ - temp_data:/tmp/minecode/ + - static:/var/purldb/static/ depends_on: - db @@ -36,6 +39,7 @@ services: env_file: - docker_purldb.env volumes: + - .env:/opt/purldb/.env - /etc/purldb/:/etc/purldb/ profiles: - priority_queue @@ -49,6 +53,7 @@ services: env_file: - docker_purldb.env volumes: + - .env:/opt/purldb/.env - /etc/purldb/:/etc/purldb/ depends_on: - redis @@ -61,6 +66,7 @@ services: env_file: - docker_purldb.env volumes: + - .env:/opt/purldb/.env - /etc/purldb/:/etc/purldb/ - temp_data:/tmp/minecode/ depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index 01bfbed3..58066d55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,9 +12,11 @@ services: - "traefik.http.routers.web.entrypoints=web" volumes: - ./etc/nginx/conf.d/:/etc/nginx/conf.d/ + - /var/www/html:/var/www/html - static:/var/purldb/static/ depends_on: - web + restart: always traefik: image: "traefik:v2.10" From 8490e122e0c0d5e4aaa47f22d3acef4ed1768831 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Wed, 7 Aug 2024 11:13:25 -0700 Subject: [PATCH 16/18] Create .dockerignore file #518 * Update system packages installed in docker image Signed-off-by: Jono Yang --- .dockerignore | 39 +++++++++++++++++++++++++++++++++++++++ Dockerfile | 15 ++++++++++++--- 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..81629a83 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,39 @@ + +**/*.egg-info +**/.* +**/.*cache +**/.DS_Store +**/.aof +**/.aws +**/.git +**/.github +**/.gitignore +**/.idea +**/.ssh +**/.venv +**/.vscode +**/bin +**/build +**/coverage +**/dist +**/docs +**/env +**/etc +**/lib +**/var +**/venv +.dockerignore +.env +.readthedocs.yaml +CHANGELOG.rst +CODE_OF_CONDUCT.rst +Dockerfile +MANIFEST.in +Makefile +README.rst +azure-pipelines.yml +configure +docker*.env +docker-compose.*yml +pyvenv.cfg +traefik.yml diff --git a/Dockerfile b/Dockerfile index d2e9faeb..5d91e321 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,16 +28,25 @@ RUN apt-get update \ zlib1g \ libxml2-dev \ libxslt1-dev \ + libgomp1 \ + libsqlite3-0 \ + libgcrypt20 \ libpopt0 \ - bzip2 \ + libzstd1 \ + libgpgme11 \ + libdevmapper1.02.1 \ + libguestfs-tools \ + linux-image-amd64 \ + git \ + wait-for-it \ + universal-ctags \ + gettext \ tar \ unzip \ zip \ libsasl2-dev \ libldap-dev \ openssl \ - wait-for-it \ - git \ cvs \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From c866be4899f822e15acdeca60aad228397289a96 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Thu, 8 Aug 2024 15:51:56 -0700 Subject: [PATCH 17/18] Use latest development branch of sctk #518 Signed-off-by: Jono Yang --- minecode/mappers/cran.py | 2 +- .../testfiles/apache/projects_expected.json | 72 +++--------- .../cpan/expected_release_search.json | 108 +++++++++--------- ...pected_release_search_author_MIYAGAWA.json | 68 +++++------ .../testfiles/cran/mapper_ANN2_expected.json | 14 +++ .../testfiles/cran/mapper_abe_expected.json | 8 ++ .../eclipse/Acceleo_projects_expected.json | 20 ++++ .../eclipse/eclipse_birt_expected.json | 2 + ...che-extras.org_124799961-qian_project.json | 2 + .../v2_api/package_expected_project.json | 2 + .../nuget/nuget_mapper_log4net_expected.json | 20 ++++ .../openssl/openssl_mapper_expected.json | 2 + ...aglist_00f100_cakephp-opauth_expected.json | 4 +- .../sourceforge/mapper_niftyphp_expected.json | 2 + .../sourceforge/mapper_odanur_expected.json | 4 +- .../sourceforge/mapper_omonoql_expected.json | 2 + .../mapper_openstunts_expected.json | 2 + setup.cfg | 2 +- 18 files changed, 186 insertions(+), 150 deletions(-) diff --git a/minecode/mappers/cran.py b/minecode/mappers/cran.py index a3edc61d..6b7dc359 100644 --- a/minecode/mappers/cran.py +++ b/minecode/mappers/cran.py @@ -20,7 +20,7 @@ @map_router.route('https://cloud.r-project.org/web/packages/[\w\-\.]/index.html') -class CpanMetaFileMapper(Mapper): +class CranMetaFileMapper(Mapper): def get_packages(self, uri, resource_uri): """ diff --git a/minecode/tests/testfiles/apache/projects_expected.json b/minecode/tests/testfiles/apache/projects_expected.json index 56b72658..17286787 100644 --- a/minecode/tests/testfiles/apache/projects_expected.json +++ b/minecode/tests/testfiles/apache/projects_expected.json @@ -41,9 +41,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/abdera@1.7.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -100,9 +98,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/activemq?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -158,9 +154,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.7.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -216,9 +210,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.7.0?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -274,9 +266,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.5?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -332,9 +322,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.4?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -390,9 +378,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.3?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -448,9 +434,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.2?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -506,9 +490,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -564,9 +546,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.6.0?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -622,9 +602,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.4?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -680,9 +658,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.3?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -738,9 +714,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.2?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -796,9 +770,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.5.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -854,9 +826,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.4.5?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -912,9 +882,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/accumulo@1.3.6?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -970,9 +938,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/ace@0.8.1?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], @@ -1030,9 +996,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:apache/airavata@0.11?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "apache_json" ], diff --git a/minecode/tests/testfiles/cpan/expected_release_search.json b/minecode/tests/testfiles/cpan/expected_release_search.json index 099f5628..edb727e0 100644 --- a/minecode/tests/testfiles/cpan/expected_release_search.json +++ b/minecode/tests/testfiles/cpan/expected_release_search.json @@ -74,7 +74,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDJ-1.00@1.00" }, @@ -153,7 +153,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Win32-Snarl-0.03@0.03" }, @@ -232,7 +232,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDJ-1.03@1.03" }, @@ -311,7 +311,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-1.09@1.09" }, @@ -390,7 +390,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDJ-1.01@1.01" }, @@ -469,7 +469,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/WWW-Jawbone-Up-1.32.1@1.32.1" }, @@ -548,7 +548,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-MPD-0.02@0.02" }, @@ -627,7 +627,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDJ-1.07@1.07" }, @@ -706,7 +706,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.03@0.03" }, @@ -785,7 +785,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-MPD-0.06@0.06" }, @@ -864,7 +864,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-Sybil-0.1@0.1" }, @@ -943,7 +943,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-0.02@0.02" }, @@ -1022,7 +1022,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-0.01@0.01" }, @@ -1101,7 +1101,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Win32-Snarl-withoutworldwriteables@0.04" }, @@ -1180,7 +1180,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.06@0.06" }, @@ -1259,7 +1259,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDJ-1.09@1.09" }, @@ -1338,7 +1338,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/WWW-Jawbone-Up-1.32.4@1.32.4" }, @@ -1417,7 +1417,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-0.04@0.04" }, @@ -1496,7 +1496,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDSync-0.01@0.01" }, @@ -1575,7 +1575,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.05@0.05" }, @@ -1654,7 +1654,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/WWW-Jawbone-Up-1.32.2@1.32.2" }, @@ -1733,7 +1733,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-MPD-0.05@0.05" }, @@ -1812,7 +1812,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/WWW-Jawbone-Up-1.32.3@1.32.3" }, @@ -1891,7 +1891,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.04@0.04" }, @@ -1970,7 +1970,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDJ-1.02@1.02" }, @@ -2049,7 +2049,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/WWW-Jawbone-Up-1.32.0@1.32.0" }, @@ -2128,7 +2128,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.01@0.01" }, @@ -2207,7 +2207,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-1.08@1.08" }, @@ -2286,7 +2286,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDJ-1.05@1.05" }, @@ -2365,7 +2365,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDJ-1.08@1.08" }, @@ -2444,7 +2444,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-MPD-0.04@0.04" }, @@ -2523,7 +2523,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-0.05@0.05" }, @@ -2602,7 +2602,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/win32-snarl-1.01@0.04" }, @@ -2681,7 +2681,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-Sybil-0.4@0.4" }, @@ -2760,7 +2760,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-1.10@1.10" }, @@ -2839,7 +2839,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-1.1@1.1" }, @@ -2918,7 +2918,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-1.07@1.07" }, @@ -2997,7 +2997,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-1.06@1.06" }, @@ -3076,7 +3076,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Dancer-Plugin-IRCNotice-0.02@0.02" }, @@ -3155,7 +3155,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDJ-1.04@1.04" }, @@ -3234,7 +3234,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDJ-1.06@1.06" }, @@ -3313,7 +3313,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-MPD-0.01@0.01" }, @@ -3392,7 +3392,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-MPD-0.03@0.03" }, @@ -3471,7 +3471,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-0.03@0.03" }, @@ -3550,7 +3550,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-0.02-withoutworldwriteables@0.02" }, @@ -3629,7 +3629,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Win32-Snarl-1.00@0.04" }, @@ -3708,7 +3708,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-Sybil-0.2@0.2" }, @@ -3787,7 +3787,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-Sybil-0.3@0.3" }, @@ -3866,7 +3866,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Win32-Snarl-0.01@0.01" }, @@ -3945,7 +3945,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Win32-Snarl-0.02@0.02" }, @@ -4024,7 +4024,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-Snarl-1.09-TRIAL@1.09" }, @@ -4103,7 +4103,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-MPD-0.07@0.07" }, @@ -4182,7 +4182,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-MPDSync-0.02@0.02" }, @@ -4261,7 +4261,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:ABERNDT&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/App-Sybil-0.5@0.5" } diff --git a/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json b/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json index cc15ea37..2a343bfa 100644 --- a/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json +++ b/minecode/tests/testfiles/cpan/expected_release_search_author_MIYAGAWA.json @@ -74,7 +74,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0037@1.0037" }, @@ -153,7 +153,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0005@1.0005" }, @@ -232,7 +232,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0009@1.0009" }, @@ -311,7 +311,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0001@1.0001" }, @@ -390,7 +390,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0002@1.0002" }, @@ -469,7 +469,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0014@1.0014" }, @@ -548,7 +548,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0027@1.0027" }, @@ -627,7 +627,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0028@1.0028" }, @@ -706,7 +706,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0018@1.0018" }, @@ -785,7 +785,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0020@1.0020" }, @@ -864,7 +864,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0022@1.0022" }, @@ -943,7 +943,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0021@1.0021" }, @@ -1022,7 +1022,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Bundle-Sledge-0.04@0.04" }, @@ -1101,7 +1101,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Video-Subtitle-SRT-0.01@0.01" }, @@ -1180,7 +1180,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0032@1.0032" }, @@ -1259,7 +1259,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Carmel-v0.1.34@v0.1.34" }, @@ -1338,7 +1338,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Plack-1.0046@1.0046" }, @@ -1417,7 +1417,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Filesys-Notify-Simple-0.12@0.12" }, @@ -1496,7 +1496,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/carton-v0.9.10@v0.9.10" }, @@ -1575,7 +1575,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/carton-v0.9_8@v0.9_8" }, @@ -1654,7 +1654,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/carton-v0.9.50-TRIAL@v0.9.50" }, @@ -1733,7 +1733,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/carton-v0.9.57-TRIAL@v0.9.57" }, @@ -1812,7 +1812,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/carton-v0.9.59-TRIAL@v0.9.59" }, @@ -1891,7 +1891,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/carton-v0.9.61-TRIAL@v0.9.61" }, @@ -1970,7 +1970,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/carton-v0.9.67-TRIAL@v0.9.67" }, @@ -2049,7 +2049,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/WebService-Google-Suggest-0.02@0.02" }, @@ -2128,7 +2128,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/HTTP-MobileAgent-0.16@0.16" }, @@ -2207,7 +2207,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Email-Find-0.09@0.09" }, @@ -2286,7 +2286,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/POE-Component-YahooMessenger-0.04@0.04" }, @@ -2365,7 +2365,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Kwiki-Emoticon-0.01@0.01" }, @@ -2444,7 +2444,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Net-IPAddr-Find-0.01@0.01" }, @@ -2523,7 +2523,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Email-Valid-Loose-0.03@0.03" }, @@ -2602,7 +2602,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Kwiki-TypeKey-0.07@0.07" }, @@ -2681,7 +2681,7 @@ "https://fastapi.metacpan.org/release/_search?q=author:MIYAGAWA&size=5000" ], "datasource_ids":[ - "cpan_meta_json" + "cpan_release_json" ], "purl":"pkg:cpan/Text-Emoticon-Yahoo-0.01@0.01" } diff --git a/minecode/tests/testfiles/cran/mapper_ANN2_expected.json b/minecode/tests/testfiles/cran/mapper_ANN2_expected.json index 519297ed..0a03d333 100644 --- a/minecode/tests/testfiles/cran/mapper_ANN2_expected.json +++ b/minecode/tests/testfiles/cran/mapper_ANN2_expected.json @@ -85,6 +85,8 @@ "extracted_license_statement":"- ../../licenses/GPL-3\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -184,6 +186,8 @@ "extracted_license_statement":"- ../../licenses/GPL-3\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -283,6 +287,8 @@ "extracted_license_statement":"- ../../licenses/GPL-3\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -382,6 +388,8 @@ "extracted_license_statement":"- ../../licenses/GPL-3\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -481,6 +489,8 @@ "extracted_license_statement":"- ../../licenses/GPL-3\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -580,6 +590,8 @@ "extracted_license_statement":"- ../../licenses/GPL-3\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -679,6 +691,8 @@ "extracted_license_statement":"- ../../licenses/GPL-3\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/cran/mapper_abe_expected.json b/minecode/tests/testfiles/cran/mapper_abe_expected.json index 9c0cfcb6..032b140c 100644 --- a/minecode/tests/testfiles/cran/mapper_abe_expected.json +++ b/minecode/tests/testfiles/cran/mapper_abe_expected.json @@ -122,6 +122,8 @@ "extracted_license_statement":"- ../../licenses/GPL-2\n- ../../licenses/GPL-3\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -258,6 +260,8 @@ "extracted_license_statement":"- ../../licenses/GPL-2\n- ../../licenses/GPL-3\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -394,6 +398,8 @@ "extracted_license_statement":"- ../../licenses/GPL-2\n- ../../licenses/GPL-3\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -530,6 +536,8 @@ "extracted_license_statement":"- ../../licenses/GPL-2\n- ../../licenses/GPL-3\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/eclipse/Acceleo_projects_expected.json b/minecode/tests/testfiles/eclipse/Acceleo_projects_expected.json index bbbd2774..1876c684 100644 --- a/minecode/tests/testfiles/eclipse/Acceleo_projects_expected.json +++ b/minecode/tests/testfiles/eclipse/Acceleo_projects_expected.json @@ -55,6 +55,8 @@ "extracted_license_statement":"- Eclipse Public License 1.0\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -122,6 +124,8 @@ "extracted_license_statement":"- Eclipse Public License 1.0\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -189,6 +193,8 @@ "extracted_license_statement":"- Eclipse Public License 1.0\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -256,6 +262,8 @@ "extracted_license_statement":"- Eclipse Public License 1.0\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -323,6 +331,8 @@ "extracted_license_statement":"- Eclipse Public License 1.0\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -390,6 +400,8 @@ "extracted_license_statement":"- Eclipse Public License 1.0\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -457,6 +469,8 @@ "extracted_license_statement":"- Eclipse Public License 1.0\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -524,6 +538,8 @@ "extracted_license_statement":"- Eclipse Public License 1.0\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -591,6 +607,8 @@ "extracted_license_statement":"- Eclipse Public License 1.0\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -658,6 +676,8 @@ "extracted_license_statement":"- Eclipse Public License 1.0\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/eclipse/eclipse_birt_expected.json b/minecode/tests/testfiles/eclipse/eclipse_birt_expected.json index bd0a6381..f9994867 100644 --- a/minecode/tests/testfiles/eclipse/eclipse_birt_expected.json +++ b/minecode/tests/testfiles/eclipse/eclipse_birt_expected.json @@ -55,6 +55,8 @@ "extracted_license_statement":"- Eclipse Public License 1.0\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/googlecode/mapper_expected_v2_apache-extras.org_124799961-qian_project.json b/minecode/tests/testfiles/googlecode/mapper_expected_v2_apache-extras.org_124799961-qian_project.json index c6573a4c..b1f53fcd 100644 --- a/minecode/tests/testfiles/googlecode/mapper_expected_v2_apache-extras.org_124799961-qian_project.json +++ b/minecode/tests/testfiles/googlecode/mapper_expected_v2_apache-extras.org_124799961-qian_project.json @@ -55,6 +55,8 @@ "extracted_license_statement":"asf20", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/googlecode/v2_api/package_expected_project.json b/minecode/tests/testfiles/googlecode/v2_api/package_expected_project.json index d6c8b89f..78f0eec9 100644 --- a/minecode/tests/testfiles/googlecode/v2_api/package_expected_project.json +++ b/minecode/tests/testfiles/googlecode/v2_api/package_expected_project.json @@ -62,6 +62,8 @@ "extracted_license_statement":"gpl2", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/nuget/nuget_mapper_log4net_expected.json b/minecode/tests/testfiles/nuget/nuget_mapper_log4net_expected.json index fb755ff2..da76271e 100644 --- a/minecode/tests/testfiles/nuget/nuget_mapper_log4net_expected.json +++ b/minecode/tests/testfiles/nuget/nuget_mapper_log4net_expected.json @@ -55,6 +55,8 @@ "extracted_license_statement":"Apache-2.0 License", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -124,6 +126,8 @@ "extracted_license_statement":"Apache-2.0 License", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -193,6 +197,8 @@ "extracted_license_statement":"Apache-2.0 License", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -262,6 +268,8 @@ "extracted_license_statement":"Apache-2.0 License", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -331,6 +339,8 @@ "extracted_license_statement":"Apache-2.0 License", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -400,6 +410,8 @@ "extracted_license_statement":"Apache-2.0 License", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -469,6 +481,8 @@ "extracted_license_statement":"Apache-2.0 License", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -538,6 +552,8 @@ "extracted_license_statement":"Apache-2.0 License", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -607,6 +623,8 @@ "extracted_license_statement":"Apache-2.0 License", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, @@ -676,6 +694,8 @@ "extracted_license_statement":"Apache-2.0 License", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/openssl/openssl_mapper_expected.json b/minecode/tests/testfiles/openssl/openssl_mapper_expected.json index 3a1871a3..f9c85a84 100644 --- a/minecode/tests/testfiles/openssl/openssl_mapper_expected.json +++ b/minecode/tests/testfiles/openssl/openssl_mapper_expected.json @@ -55,6 +55,8 @@ "extracted_license_statement":"OpenSSL License", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/packagist/packaglist_00f100_cakephp-opauth_expected.json b/minecode/tests/testfiles/packagist/packaglist_00f100_cakephp-opauth_expected.json index 1c2ce312..185b4370 100644 --- a/minecode/tests/testfiles/packagist/packaglist_00f100_cakephp-opauth_expected.json +++ b/minecode/tests/testfiles/packagist/packaglist_00f100_cakephp-opauth_expected.json @@ -83,9 +83,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:composer/00f100/cakephp-opauth@dev-master?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "php_composer_json" ], diff --git a/minecode/tests/testfiles/sourceforge/mapper_niftyphp_expected.json b/minecode/tests/testfiles/sourceforge/mapper_niftyphp_expected.json index 86ee4ae9..660a66f3 100644 --- a/minecode/tests/testfiles/sourceforge/mapper_niftyphp_expected.json +++ b/minecode/tests/testfiles/sourceforge/mapper_niftyphp_expected.json @@ -103,6 +103,8 @@ "extracted_license_statement":"- bsd\n- BSD License\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json b/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json index 5fb55772..5070deed 100644 --- a/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json +++ b/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json @@ -47,9 +47,7 @@ "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:sourceforge/odanur?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[ - null - ], + "datafile_paths":[], "datasource_ids":[ "sourceforge_metadata" ], diff --git a/minecode/tests/testfiles/sourceforge/mapper_omonoql_expected.json b/minecode/tests/testfiles/sourceforge/mapper_omonoql_expected.json index 1a6b6878..880e6d92 100644 --- a/minecode/tests/testfiles/sourceforge/mapper_omonoql_expected.json +++ b/minecode/tests/testfiles/sourceforge/mapper_omonoql_expected.json @@ -116,6 +116,8 @@ "extracted_license_statement":"- gpl\n- GNU General Public License version 2.0 (GPLv2)\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/sourceforge/mapper_openstunts_expected.json b/minecode/tests/testfiles/sourceforge/mapper_openstunts_expected.json index ac166c70..555e7f95 100644 --- a/minecode/tests/testfiles/sourceforge/mapper_openstunts_expected.json +++ b/minecode/tests/testfiles/sourceforge/mapper_openstunts_expected.json @@ -102,6 +102,8 @@ "extracted_license_statement":"- gpl\n- GNU General Public License version 2.0 (GPLv2)\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/setup.cfg b/setup.cfg index 1bfa9fa6..11742517 100644 --- a/setup.cfg +++ b/setup.cfg @@ -57,7 +57,7 @@ install_requires = reppy2 == 0.3.6 rq-scheduler == 0.13.1 rubymarshal == 1.0.3 - scancode-toolkit[packages] == 32.2.1 + scancode-toolkit[packages] @ git+https://github.com/nexB/scancode-toolkit.git@99a44381cbfddc439b8d9620acb4ea93e5e71d66 urlpy == 0.5 matchcode-toolkit == 5.1.0 purl2vcs == 1.0.2 From cd61cdd05cee1835b186dc743a17555f06eed644 Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Thu, 8 Aug 2024 15:58:56 -0700 Subject: [PATCH 18/18] Update requirements files #518 Signed-off-by: Jono Yang --- requirements-dev.txt | 53 +++++++++++++------------- requirements.txt | 88 ++++++++++++++++++++++---------------------- 2 files changed, 71 insertions(+), 70 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index ed0d0e6c..1ef1aef5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,11 +1,10 @@ alabaster==0.7.16 annotated-types==0.7.0 -anyio==4.3.0 -babel==2.15.0 -backports.tarfile==1.1.1 -black==24.4.2 -bracex==2.4 -bump-my-version==0.21.1 +anyio==4.4.0 +babel==2.16.0 +black==24.8.0 +bracex==2.5 +bump-my-version==0.25.1 doc8==1.1.1 docutils==0.20.1 execnet==2.1.1 @@ -16,19 +15,19 @@ isort==5.13.2 jaraco.classes==3.4.0 jaraco.context==5.3.0 jeepney==0.8.0 -keyring==25.2.1 +keyring==25.3.0 mypy-extensions==1.0.0 -nh3==0.2.17 +nh3==0.2.18 pathspec==0.12.1 pbr==6.0.0 pkginfo==1.10.0 platformdirs==4.2.2 prompt-toolkit==3.0.36 -pycodestyle==2.11.1 -pydantic==2.7.1 -pydantic-settings==2.2.1 -pydantic_core==2.18.2 -pytest==8.2.1 +pycodestyle==2.12.1 +pydantic==2.8.2 +pydantic-settings==2.4.0 +pydantic_core==2.20.1 +pytest==8.3.2 pytest-django==4.8.0 pytest-rerunfailures==14.0 pytest-xdist==3.6.1 @@ -38,29 +37,29 @@ requests-toolbelt==1.0.0 restructuredtext_lint==1.4.0 rfc3986==2.0.0 rich==13.7.1 -rich-click==1.8.2 +rich-click==1.8.3 secretstorage==3.3.3 sniffio==1.3.1 snowballstemmer==2.2.0 -sphinx==7.3.7 +sphinx==7.4.7 sphinx-autobuild==2024.4.16 sphinx-copybutton==0.5.2 -sphinx-reredirects==0.1.3 sphinx-rtd-dark-mode==1.3.0 sphinx-rtd-theme==2.0.0 -sphinxcontrib-applehelp==1.0.8 -sphinxcontrib-devhelp==1.0.6 -sphinxcontrib-htmlhelp==2.0.5 +sphinx_reredirects==0.1.5 +sphinxcontrib-applehelp==2.0.0 +sphinxcontrib-devhelp==2.0.0 +sphinxcontrib-htmlhelp==2.1.0 sphinxcontrib-jquery==4.1 sphinxcontrib-jsmath==1.0.1 -sphinxcontrib-qthelp==1.0.7 -sphinxcontrib-serializinghtml==1.1.10 -starlette==0.37.2 +sphinxcontrib-qthelp==2.0.0 +sphinxcontrib-serializinghtml==2.0.0 +starlette==0.38.2 stevedore==5.2.0 -tomlkit==0.12.5 -twine==5.1.0 -uvicorn==0.29.0 +tomlkit==0.13.0 +twine==5.1.1 +uvicorn==0.30.5 vendorize==0.3.0 -watchfiles==0.21.0 -wcmatch==8.5.2 +watchfiles==0.23.0 +wcmatch==9.0 websockets==12.0 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index c2ed5ba9..8520859c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,18 +1,19 @@ aboutcode-toolkit==10.1.0 -arrow==1.2.3 +arrow==1.3.0 asgiref==3.8.1 -attrs==23.2.0 +attrs==24.2.0 banal==1.0.6 beartype==0.18.5 beautifulsoup4==4.12.3 binaryornot==0.4.4 -bitarray==2.6.0 +bitarray==2.9.2 bleach==6.1.0 boolean.py==4.0 -certifi==2024.2.2 -cffi==1.16.0 +certifi==2024.7.4 +cffi==1.17.0 chardet==5.2.0 charset-normalizer==3.3.2 +clamd==1.0.2 click==8.1.7 colorama==0.4.6 commoncode==31.2.1 @@ -20,22 +21,22 @@ construct==2.10.70 container-inspector==33.0.0 crispy-bootstrap3==2024.1 crontab==1.0.1 -cryptography==42.0.7 -cyclonedx-python-lib==7.3.4 +cryptography==43.0.0 +cyclonedx-python-lib==7.5.1 debian_inspector==31.1.0 defusedxml==0.7.1 Deprecated==1.2.14 -Django==5.0.6 -django-crispy-forms==2.1 +Django==5.0.7 +django-crispy-forms==2.2 django-environ==0.11.2 django-filter==24.2 django-probes==1.7.0 django-rq==2.10.2 django-taggit==5.0.1 -djangorestframework==3.15.1 +djangorestframework==3.15.2 dockerfile-parse==2.0.1 dparse2==0.7.0 -drf-spectacular==0.26.5 +drf-spectacular==0.27.2 elf-inspector==0.0.1 et-xmlfile==1.1.0 extractcode==31.0.0 @@ -48,8 +49,8 @@ fingerprints==1.2.3 flot==0.7.2 fontawesomefree==6.5.1 freezegun==1.5.1 -ftfy==6.2.0 -ftputil==5.0.4 +ftfy==6.2.3 +ftputil==5.1.0 fusepy==3.0.1 gemfileparser2==0.9.3 gitdb==4.0.11 @@ -59,54 +60,54 @@ gunicorn==22.0.0 html5lib==1.1 htmllistparse==0.6.1 idna==3.7 -importlib_metadata==7.1.0 +importlib_metadata==8.0.0 inflection==0.5.1 intbitset==3.1.0 isodate==0.6.1 -jaraco.functools==4.0.1 +jaraco.functools==4.0.2 javaproperties==0.8.1 jawa==2.2.0 Jinja2==3.1.4 -jsonschema==4.22.0 +jsonschema==4.23.0 jsonschema-specifications==2023.12.1 jsonstreams==0.6.0 license-expression==30.3.0 lxml==5.2.2 -Markdown==3.5.1 +Markdown==3.6 markdown-it-py==3.0.0 MarkupSafe==2.1.5 matchcode-toolkit==5.1.0 mdurl==0.1.2 mock==5.1.0 -more-itertools==10.2.0 -natsort==8.2.0 +more-itertools==10.4.0 +natsort==8.4.0 normality==2.5.0 -openpyxl==3.1.2 +openpyxl==3.1.5 packagedcode-msitools==0.101.210706 -packageurl-python==0.15.0 -packaging==24.0 +packageurl-python==0.15.4 +packaging==24.1 packvers==21.5 parameter-expansion-patched==0.3.1 -pdfminer.six==20231228 +pdfminer.six==20240706 pefile==2023.2.7 -pip==22.2.2 +pip==24.1 pip-requirements-parser==32.0.1 pkginfo2==30.0.0 pluggy==1.5.0 plugincode==32.0.0 ply==3.11 -psycopg==3.1.19 -psycopg-binary==3.1.19 +psycopg==3.2.1 +psycopg-binary==3.2.1 publicsuffix2==2.20191221 -py-serializable==1.0.3 +py-serializable==1.1.0 pyahocorasick==2.1.0 pycparser==2.22 pyelftools==0.31 -PyGithub==1.56 +PyGithub==2.3.0 pygmars==0.8.0 Pygments==2.18.0 pyinstrument==4.6.2 -PyJWT==2.8.0 +PyJWT==2.9.0 pymaven-patch==0.3.2 PyNaCl==1.5.0 pyparsing==3.1.2 @@ -114,22 +115,22 @@ python-dateutil==2.9.0.post0 python-dotenv==1.0.1 python-inspector==0.12.0 pytz==2024.1 -PyYAML==6.0.1 +PyYAML==6.0.2 rdflib==7.0.0 -redis==5.0.4 +redis==5.0.7 referencing==0.35.1 -regipy==4.2.1 +regipy==4.3.0 reppy2==0.3.6 -requests==2.32.2 +requests==2.32.3 resolvelib==1.0.1 -rpds-py==0.18.1 +rpds-py==0.20.0 rpm-inspector-rpm==4.16.1.3.210404 rq==1.16.2 rq-scheduler==0.13.1 rubymarshal==1.0.3 saneyaml==0.6.0 -scancode-toolkit @ git+https://github.com/nexB/scancode-toolkit.git@684360f2ca01bc676368bc8621eed65065bf0f11 -scancodeio==34.5.0 +scancode-toolkit @ git+https://github.com/nexB/scancode-toolkit.git@99a44381cbfddc439b8d9620acb4ea93e5e71d66 +scancodeio==34.7.1 semantic-version==2.10.0 semver==3.0.2 setuptools==70.0.0 @@ -139,7 +140,7 @@ sortedcontainers==2.4.0 soupsieve==2.5 source-inspector==0.5.1 spdx-tools==0.8.2 -sqlparse==0.5.0 +sqlparse==0.5.1 text-unidecode==1.3 toml==0.10.2 tree-sitter==0.22.0 @@ -151,18 +152,19 @@ tree-sitter-java==0.21.0 tree-sitter-javascript==0.21.2 tree-sitter-python==0.21.0 tree-sitter-rust==0.21.2 -typecode==30.0.1 +typecode==30.0.2 typecode-libmagic==5.39.210531 -typing_extensions==4.11.0 +types-python-dateutil==2.9.0.20240316 +typing_extensions==4.12.2 univers==30.11.0 uritemplate==4.1.1 -uritools==4.0.2 -urllib3==2.2.1 +uritools==4.0.3 +urllib3==2.2.2 urlpy==0.5 wcwidth==0.2.13 webencodings==0.5.1 -wheel==0.37.1 +wheel==0.43.0 wrapt==1.16.0 XlsxWriter==3.2.0 xmltodict==0.13.0 -zipp==3.18.2 +zipp==3.19.2