From a0da810f65deb45ee7478acf8d56655baaf0f023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= Date: Wed, 14 Jun 2023 17:52:03 -0300 Subject: [PATCH] Stop bundling collections They are now fetched from Github. --- .dockerignore | 2 -- .gitignore | 2 -- Makefile | 14 -------------- src/kolibri_android/kolibri_utils.py | 3 --- 4 files changed, 21 deletions(-) diff --git a/.dockerignore b/.dockerignore index 73ef5261..6934078b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,10 +6,8 @@ README.md # Downloaded and unpacked assets _explore/ apps-bundle.zip -collections.zip assets/welcomeScreen/ src/apps-bundle/ -src/collections/ src/kolibri/ whl/ diff --git a/.gitignore b/.gitignore index 93565418..f8289c8e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,8 @@ # Downloaded and unpacked assets _explore/ apps-bundle.zip -collections.zip assets/welcomeScreen/ src/apps-bundle/ -src/collections/ src/kolibri/ whl/ diff --git a/Makefile b/Makefile index 5f32d04c..e6e4b20e 100644 --- a/Makefile +++ b/Makefile @@ -139,19 +139,6 @@ clean-apps-bundle: src/apps-bundle: clean-apps-bundle apps-bundle.zip unzip -qo apps-bundle.zip -d src/apps-bundle -.PHONY: collections.zip -collections.zip: - wget -N https://github.com/endlessm/endless-key-collections/archive/refs/heads/main.zip - mv main.zip collections.zip - -clean-collections: - - rm -rf src/collections - -src/collections: clean-collections collections.zip - unzip -qo collections.zip - mv endless-key-collections-main/json/ src/collections - rm -rf endless-key-collections-main - clean-local-kolibri-explore-plugin: # The * is to also remove the VERSION.dist-info directory: - rm -rf ${EXPLOREPLUGIN_TARGET}/kolibri_explore_plugin* @@ -185,7 +172,6 @@ DIST_DEPS = \ src/kolibri \ src/evil_kolibri \ src/apps-bundle \ - src/collections \ assets/welcomeScreen \ needs-version \ dist/version.json diff --git a/src/kolibri_android/kolibri_utils.py b/src/kolibri_android/kolibri_utils.py index 29094d57..b3952b11 100644 --- a/src/kolibri_android/kolibri_utils.py +++ b/src/kolibri_android/kolibri_utils.py @@ -90,9 +90,6 @@ def _init_kolibri_env(): os.environ["KOLIBRI_APPS_BUNDLE_PATH"] = SCRIPT_PATH.joinpath( "apps-bundle", "apps" ).as_posix() - os.environ["KOLIBRI_CONTENT_COLLECTIONS_PATH"] = SCRIPT_PATH.joinpath( - "collections" - ).as_posix() node_id = get_android_node_id()