Release v0.16.x

.github/workflows/build_whl.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Install Ubuntu dependencies
       run: |
         apt-get -y -qq update
-        apt-get install -y gettext sudo
+        apt-get install -y gettext sudo sqlite3
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:

.github/workflows/pr_build_kolibri.yml

@@ -34,10 +34,10 @@ jobs:
   dmg:
     name: Build DMG file
     needs: whl
-    uses: learningequality/kolibri-app/.github/workflows/build_mac.yml@main
+    uses: learningequality/kolibri-app/.github/workflows/build_mac.yml@v0.4.2
     with:
       whl-file-name: ${{ needs.whl.outputs.whl-file-name }}
-      ref: main
+      ref: v0.4.2
   deb:
     name: Build DEB file
     needs: whl
@@ -48,14 +48,14 @@ jobs:
   exe:
     name: Build EXE file
     needs: whl
-    uses: learningequality/kolibri-installer-windows/.github/workflows/[email protected].0
+    uses: learningequality/kolibri-installer-windows/.github/workflows/[email protected].4
     with:
       whl-file-name: ${{ needs.whl.outputs.whl-file-name }}
-      ref: v1.6.0
+      ref: v1.6.4
   apk:
     name: Build APK file
     needs: whl
-    uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].0
+    uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].3
     with:
       tar-file-name: ${{ needs.whl.outputs.tar-file-name }}
-      ref: v0.1.0
+      ref: v0.1.3

.github/workflows/release_kolibri.yml

@@ -35,11 +35,11 @@ jobs:
   dmg:
     name: Build DMG file
     needs: whl
-    uses: learningequality/kolibri-app/.github/workflows/[email protected].0
+    uses: learningequality/kolibri-app/.github/workflows/[email protected].2
     with:
       whl-file-name: ${{ needs.whl.outputs.whl-file-name }}
       release: true
-      ref: v0.4.0
+      ref: v0.4.2
     secrets:
       KOLIBRI_MAC_APP_IDENTITY: ${{ secrets.KOLIBRI_MAC_APP_IDENTITY }}
       KOLIBRI_MAC_APP_CERTIFICATE: ${{ secrets.KOLIBRI_MAC_APP_CERTIFICATE }}
@@ -69,11 +69,11 @@ jobs:
   exe:
     name: Build EXE file
     needs: whl
-    uses: learningequality/kolibri-installer-windows/.github/workflows/[email protected].0
+    uses: learningequality/kolibri-installer-windows/.github/workflows/[email protected].4
     with:
       whl-file-name: ${{ needs.whl.outputs.whl-file-name }}
       release: true
-      ref: v1.6.0
+      ref: v1.6.4
     secrets:
       KOLIBRI_WINDOWS_INSTALLER_CERTIFICATE: ${{ secrets.KOLIBRI_WINDOWS_INSTALLER_CERTIFICATE }}
       KOLIBRI_WINDOWS_INSTALLER_CERTIFICATE_PASSWORD: ${{ secrets.KOLIBRI_WINDOWS_INSTALLER_CERTIFICATE_PASSWORD }}
@@ -86,10 +86,10 @@ jobs:
   zip:
     name: Build Raspberry Pi Image
     needs: deb
-    uses: learningequality/pi-gen/.github/workflows/[email protected].0
+    uses: learningequality/pi-gen/.github/workflows/[email protected].1
     with:
       deb-file-name: ${{ needs.deb.outputs.deb-file-name }}
-      ref: v0.16.0
+      ref: v0.16.1
   upload_zip:
     uses: ./.github/workflows/upload_github_release_asset.yml
     needs: zip
@@ -99,11 +99,11 @@ jobs:
   apk:
     name: Build Android APK
     needs: whl
-    uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].0
+    uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].3
     with:
       tar-file-name: ${{ needs.whl.outputs.tar-file-name }}
       release: true
-      ref: v0.1.0
+      ref: v0.1.3
     secrets:
       KOLIBRI_ANDROID_APP_PRODUCTION_KEYSTORE: ${{ secrets.KOLIBRI_ANDROID_APP_PRODUCTION_KEYSTORE }}
       KOLIBRI_ANDROID_APP_PRODUCTION_KEYSTORE_PASSWORD: ${{ secrets.KOLIBRI_ANDROID_APP_PRODUCTION_KEYSTORE_PASSWORD }}
@@ -128,6 +128,38 @@ jobs:
       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
       TESTPYPI_API_TOKEN: ${{ secrets.TESTPYPI_API_TOKEN }}
       PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
+  gcs_upload:
+    name: Upload to Google Cloud Storage for LE Downloads
+    runs-on: ubuntu-latest
+    needs: [whl, pex, dmg, deb, exe, zip, apk]
+    strategy:
+      matrix:
+        filename: [
+          '${{ needs.whl.outputs.whl-file-name }}',
+          '${{ needs.whl.outputs.tar-file-name }}',
+          '${{ needs.pex.outputs.pex-file-name }}',
+          '${{ needs.dmg.outputs.dmg-file-name }}',
+          '${{ needs.deb.outputs.deb-file-name }}',
+          '${{ needs.exe.outputs.exe-file-name }}',
+          '${{ needs.zip.outputs.zip-file-name }}',
+          '${{ needs.apk.outputs.apk-file-name }}',
+        ]
+    steps:
+    - name: Download ${{ matrix.filename }} artifact
+      uses: actions/download-artifact@v4
+      with:
+        name: ${{ matrix.filename }}
+        path: dist
+    - uses: 'google-github-actions/auth@v2'
+      with:
+        credentials_json: '${{ secrets.GH_UPLOADER_GCP_SA_CREDENTIALS }}'
+    - name: 'Set up Cloud SDK'
+      uses: 'google-github-actions/setup-gcloud@v2'
+    - name: Upload files to Google Cloud Storage
+      uses: 'google-github-actions/upload-cloud-storage@v2'
+      with:
+        path: 'dist/${{ matrix.filename }}'
+        destination: '${{ secrets.KOLIBRI_PUBLIC_RELEASE_GCS_BUCKET }}/downloads/kolibri/${{ github.event.release.name }}'
   block_release_step:
   # This step ties to the release environment which requires manual approval
   # before it can execute. Once manual approval has been granted, the release is
@@ -153,52 +185,37 @@ jobs:
       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
       TESTPYPI_API_TOKEN: ${{ secrets.TESTPYPI_API_TOKEN }}
       PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
-  gcs_upload:
-    name: Upload to Google Cloud Storage
-    if: ${{ !github.event.release.prerelease }}
+  bck_gcs_upload:
+    name: Upload WHL file to Google Cloud Storage for BCK
+    if: ${{ !github.event.release.prerelease && github.event.release.name == 'latest'}}
     runs-on: ubuntu-latest
-    needs: [block_release_step, whl, pex, dmg, deb, exe, zip, apk]
-    strategy:
-      matrix:
-        filename: [
-          '${{ needs.whl.outputs.whl-file-name }}',
-          '${{ needs.whl.outputs.tar-file-name }}',
-          '${{ needs.pex.outputs.pex-file-name }}',
-          '${{ needs.dmg.outputs.dmg-file-name }}',
-          '${{ needs.deb.outputs.deb-file-name }}',
-          '${{ needs.exe.outputs.exe-file-name }}',
-          '${{ needs.zip.outputs.zip-file-name }}',
-          '${{ needs.apk.outputs.apk-file-name }}',
-        ]
+    needs: [block_release_step, whl]
     steps:
-    - name: Download ${{ matrix.filename }} artifact
+    - name: Download WHL artifact
       uses: actions/download-artifact@v4
       with:
-        name: ${{ matrix.filename }}
+        name: ${{ needs.whl.outputs.whl-file-name }}
         path: dist
+    - name: Zip whl file
+      run: zip -j dist/kolibri.zip dist/${{ needs.whl.outputs.whl-file-name }}
     - uses: 'google-github-actions/auth@v2'
       with:
         credentials_json: '${{ secrets.GH_UPLOADER_GCP_SA_CREDENTIALS }}'
     - name: 'Set up Cloud SDK'
       uses: 'google-github-actions/setup-gcloud@v2'
-    - name: Upload files to Google Cloud Storage
-      uses: 'google-github-actions/upload-cloud-storage@v2'
-      with:
-        path: 'dist/${{ matrix.filename }}'
-        destination: '${{ secrets.KOLIBRI_PUBLIC_RELEASE_GCS_BUCKET }}/downloads/kolibri/${{ github.event.release.name }}/${{ matrix.filename }}'
     - name: Upload to BCK bucket
-      if: ${{ github.event.release.name == 'latest' }} && ${{ endsWith(matrix.filename, '.whl') }}
       uses: 'google-github-actions/upload-cloud-storage@v2'
       with:
-        path: 'dist/${{ matrix.filename }}'
-        destination: '${{ secrets.BCK_PROD_BUILD_ARTIFACT_GCS_BUCKET }}/${{ matrix.filename }}'
+        path: 'dist/kolibri.zip'
+        destination: '${{ secrets.BCK_PROD_BUILD_ARTIFACT_GCS_BUCKET }}'
+        parent: false
   android_release:
     name: Release Android App
     if: ${{ !github.event.release.prerelease }}
     needs: [apk, block_release_step]
-    uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].0
+    uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].3
     with:
       version-code: ${{ needs.apk.outputs.version-code }}
-      ref: v0.1.0
+      ref: v0.1.3
     secrets:
       KOLIBRI_ANDROID_PLAY_STORE_API_SERVICE_ACCOUNT_JSON: ${{ secrets.KOLIBRI_ANDROID_PLAY_STORE_API_SERVICE_ACCOUNT_JSON }}

.github/workflows/tox.yml

@@ -122,11 +122,11 @@ jobs:
   macos:
     name: Python unit tests on Mac OS
     needs: pre_job
-    runs-on: macos-latest
+    runs-on: macos-13
     strategy:
       max-parallel: 5
       matrix:
-        python-version: [3.6]
+        python-version: ['3.10']
 
     steps:
     - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -64,6 +64,11 @@ repos:
         kolibri/core/logger/migrations/0003_auto_20170531_1140\.py|
         kolibri/core/logger/migrations/0005_auto_20180514_1419\.py|
       )$
+  - id: no-swappable-auth-migrations
+    name: No migrations with swappable auth models (settings.AUTH_USER_MODEL)
+    entry: settings\.AUTH_USER_MODEL
+    language: pygrep
+    files: migrations/.*\.py$
 -   repo: https://github.com/isidentical/teyit
     rev: 0.4.3
     hooks:

AUTHORS.md

@@ -99,3 +99,4 @@ If you have contributed to Kolibri, feel free to add your name and Github accoun
 | Kris Katkus | katkuskris |
 | Garvit Singhal | GarvitSinghal47 |
 | Mazen Oweiss | moweiss |
+| Nikhil Sharma | ThEditor |

MANIFEST.in

@@ -14,7 +14,6 @@ recursive-include kolibri/utils *
 recursive-include kolibri/*/static *.*
 recursive-include kolibri/*/build/ *.json
 recursive-include kolibri/plugins/*/build *.json
-include kolibri/plugins/*/content_types.json
 
 recursive-exclude kolibri/* *pyc
 recursive-exclude kolibri/* *pyo
@@ -27,3 +26,14 @@ exclude kolibri/plugins/*/buildConfig.js
 
 recursive-exclude kolibri/dist *pyc
 prune kolibri/dist/*/__pycache___
+
+# Exclude the unused Django GIS and Humanize app
+prune kolibri/dist/django/contrib/gis
+prune kolibri/dist/django/contrib/humanize
+
+# Exclude all test directories
+prune kolibri/**/tests
+prune kolibri/**/test
+prune kolibri/**/testing
+# Except the Django one which is needed by rest_framework
+recursive-include kolibri/dist/django/test *.py

Makefile

@@ -188,7 +188,7 @@ writeversion:
 	@echo "Current version is now `cat kolibri/VERSION`"
 
 preseeddb:
-	PYTHONPATH=".:$PYTHONPATH" python build_tools/preseed_home.py
+	./build_tools/preseed_home.sh
 
 setrequirements:
 	rm -r requirements.txt || true # remove requirements.txt

build_tools/logo.py

@@ -0,0 +1,82 @@
+import argparse
+import os
+import tempfile
+
+import cairosvg
+from PIL import Image
+
+
+# The default input size is based off the current size of the Kolibri logo SVG
+def convert_svg_to_image(
+    svg_file_path, output_file_path, input_size=200, final_size=None
+):
+    ext = os.path.splitext(output_file_path)[1].lower()
+    temp_png_file = tempfile.NamedTemporaryFile(suffix=ext, delete=False)
+    # Scale up, but don't scale down, as we don't want to lose quality
+    cairosvg.svg2png(
+        url=svg_file_path,
+        write_to=temp_png_file.name,
+        scale=final_size / input_size
+        if final_size and final_size > input_size
+        else 1.0,
+    )
+
+    with Image.open(temp_png_file.name) as img:
+        # Convert image to RGBA if not already in that mode
+        if img.mode != "RGBA":
+            img = img.convert("RGBA")
+
+        # Get the bounding box
+        bbox = img.getbbox()
+
+        # Crop the image to the contents
+        img_cropped = img.crop(bbox)
+
+        # Determine the dimensions for a square based on the cropped image
+        max_dim = max(img_cropped.size)
+        square_size = (max_dim, max_dim)
+
+        # Create a new square image with a transparent background
+        square_img = Image.new("RGBA", square_size, (0, 0, 0, 0))
+
+        # Calculate top-left corner coordinates to paste the cropped image centered in the square canvas
+        paste_position = (
+            (max_dim - img_cropped.width) // 2,
+            (max_dim - img_cropped.height) // 2,
+        )
+        square_img.paste(img_cropped, paste_position)
+
+        if final_size:
+            # If a final size is specified, resize the square image to these dimensions
+            square_img = square_img.resize((final_size, final_size), Image.LANCZOS)
+
+        # Remove the dot from the extension and convert to uppercase
+        output_format = ext[1:].upper()
+
+        if output_format == "JPG":
+            output_format = "JPEG"  # Adjust for JPEG
+
+        # Convert RGBA to RGB for JPEG, as JPEG does not support transparency
+        if output_format == "JPEG":
+            square_img = square_img.convert("RGB")
+
+        # Save the final result
+        square_img.save(output_file_path, format=output_format)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Convert SVG to cropped and optionally resized image file - will infer the type from the extension."
+    )
+    parser.add_argument("svg_file", help="Path to the input SVG file.")
+    parser.add_argument("image_file", help="Path to the output file.")
+    parser.add_argument(
+        "--size",
+        type=int,
+        help="Optional final size to resize the output image to a square of this size.",
+        default=None,
+    )
+
+    args = parser.parse_args()
+
+    convert_svg_to_image(args.svg_file, args.image_file, final_size=args.size)