Skip to content

Stop bundling collections #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
manuq wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Stop bundling collections #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# Downloaded and unpacked assets
_explore/
apps-bundle.zip
collections.zip
assets/welcomeScreen/
src/apps-bundle/
src/collections/
src/kolibri/
whl/

Expand Down
14 changes: 0 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down Expand Up @@ -185,7 +172,6 @@ DIST_DEPS = \
src/kolibri \
src/evil_kolibri \
src/apps-bundle \
src/collections \
assets/welcomeScreen \
needs-version \
dist/version.json
Expand Down
3 changes: 0 additions & 3 deletions src/kolibri_android/kolibri_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down