From 68128fb334d8a274971776ca88b8b438104eca12 Mon Sep 17 00:00:00 2001 From: Draga Doncila Date: Tue, 4 Jun 2024 13:58:32 +1000 Subject: [PATCH 1/3] Update extended summary with manifest visibility and excluding removed plugins --- scripts/reindex.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/reindex.py b/scripts/reindex.py index c846b459d9..094ec33ea0 100644 --- a/scripts/reindex.py +++ b/scripts/reindex.py @@ -159,6 +159,7 @@ def conda_data_wrapper(args): "name": name, "version": meta["version"], "display_name": data["display_name"], + "visibility": data["visibility"], "summary": meta["summary"], "author": meta["author"], "license": meta["license"], @@ -187,10 +188,10 @@ def conda_data_wrapper(args): { **pkg, "pypi_versions": sorted( - active_pypi_versions.get(pkg["name"], []), key=Version, reverse=True + vs, key=Version, reverse=True ), } - for pkg in PYPI_INDEX + for pkg in PYPI_INDEX if len(vs := active_pypi_versions.get(pkg["name"], []) > 0) ] # now check conda for each package and write data to public/conda/{package}.json From 5096e714c8378c8627a0db2b35f1fbd14cb73a14 Mon Sep 17 00:00:00 2001 From: Draga Doncila Date: Tue, 4 Jun 2024 14:03:07 +1000 Subject: [PATCH 2/3] Add visibility field to test --- tests/test_output.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_output.py b/tests/test_output.py index fa893b5910..ed267e36b4 100644 --- a/tests/test_output.py +++ b/tests/test_output.py @@ -29,6 +29,7 @@ def test_manifests_are_valid(mf_file): assert data["name"], "package has no name" assert data["package_metadata"]["version"], "package has no version" + assert data["visibility"], "package has no visibility" contributions = data["contributions"] if not any(contributions.values()): From 38a67c65bec6715e97fc285a7af299594329a3aa Mon Sep 17 00:00:00 2001 From: Draga Doncila Date: Tue, 4 Jun 2024 14:07:56 +1000 Subject: [PATCH 3/3] fix list comp --- scripts/reindex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/reindex.py b/scripts/reindex.py index 094ec33ea0..82a088f481 100644 --- a/scripts/reindex.py +++ b/scripts/reindex.py @@ -191,7 +191,7 @@ def conda_data_wrapper(args): vs, key=Version, reverse=True ), } - for pkg in PYPI_INDEX if len(vs := active_pypi_versions.get(pkg["name"], []) > 0) + for pkg in PYPI_INDEX if len(vs := active_pypi_versions.get(pkg["name"], [])) > 0 ] # now check conda for each package and write data to public/conda/{package}.json