Skip to content

Commit

Permalink
Upgrade to Kolibri 0.16.0-beta5
Browse files Browse the repository at this point in the history
This release fixes cancelling of tasks so that stopping the worker
instance actually stops the running tasks instead of waiting until they
complete.

The patch is no longer needed since it was merged upstream.

Helps: endlessm/kolibri-explore-plugin#769
  • Loading branch information
dbnicholson committed Sep 8, 2023
1 parent bf3f202 commit 78d1ac8
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 27 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pipeline {
// URL for the Kolibri wheel to include.
// FIXME: It would be nice to cache this somehow.
// FIXME: Go back to use an official release once that happens on GitHub for 0.16.
KOLIBRI_WHL_URL = 'https://github.com/learningequality/kolibri/releases/download/v0.16.0-beta1/kolibri-0.16.0b1-py2.py3-none-any.whl'
KOLIBRI_WHL_URL = 'https://github.com/learningequality/kolibri/releases/download/v0.16.0-beta5/kolibri-0.16.0b5-py2.py3-none-any.whl'

// Both p4a and gradle cache outputs in the home directory.
// Point it inside the workspace.
Expand Down
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@ src/kolibri: clean
# End of cleanup.
# patch Django to allow migrations to be pyc files, as p4a compiles and deletes the originals
sed -i 's/if name.endswith(".py"):/if name.endswith(".py") or name.endswith(".pyc"):/g' src/kolibri/dist/django/db/migrations/loader.py
# Apply kolibri patches
patch -d src/ -p1 < patches/0001-Add-track-progress-information-to-channelimport.patch

.PHONY: apps-bundle.zip
apps-bundle.zip:
Expand Down
24 changes: 0 additions & 24 deletions patches/0001-Add-track-progress-information-to-channelimport.patch

This file was deleted.

0 comments on commit 78d1ac8

Please sign in to comment.