Merge pull request #3644 from learningequality/unstable

Hotfixes release for development ending 2022-09-16

.eslintrc.js

@@ -1,17 +1,14 @@
 const esLintConfig = require('kolibri-tools/.eslintrc');
-const webpack = require('./webpack.config.js')();
 
 esLintConfig.globals = {
   $: false,
   _: false,
   MathQuill: false,
   HandlebarsIntl: false,
   MathJax: false,
-  Sentry: false,
   jest: false,
-  Raven: false,
 };
-esLintConfig.settings['import/resolver'] = 'webpack';
+esLintConfig.settings['import/resolver']['webpack'] = { config: 'webpack.config.js'};
 
 // Vuetify's helper attributes use hyphens and they would
 // not be recognized if auto-formatted to camel case

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# Automatically update versions for pip and npm
+
+version: 2
+updates:
+
+  # Maintain dependencies for Python
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  # Maintain dependencies for Javascript
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/deploytest.yml

@@ -1,6 +1,12 @@
 name: Build and deploy tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - unstable
+    - hotfixes
+    - master
+  pull_request:
 
 jobs:
   pre_job:
@@ -14,7 +20,7 @@ jobs:
         uses: fkirc/skip-duplicate-actions@master
         with:
           github_token: ${{ github.token }}
-          paths: '["**.py", "requirements.txt", ".github/workflows/deploytest.yml", "**.vue", "**.js", "yarn.lock"]'
+          paths: '["**.py", "requirements.txt", ".github/workflows/deploytest.yml", "**.vue", "**.js", "yarn.lock", "package.json"]'
   build_assets:
     name: Build frontend assets
     needs: pre_job
@@ -25,7 +31,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: '10.x'
+        node-version: '16.x'
     - name: Cache Node.js modules
       uses: actions/cache@v2
       with:
@@ -38,18 +44,18 @@ jobs:
         yarn --frozen-lockfile
         npm rebuild node-sass
     - name: Build frontend
-      run: yarn run build -p
+      run: yarn run build
   make_messages:
     name: Build all message files
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.6
+    - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: 3.9
     - name: pip cache
       uses: actions/cache@v2
       with:
@@ -65,7 +71,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: '10.x'
+        node-version: '16.x'
     - name: Cache Node.js modules
       uses: actions/cache@v2
       with:

.github/workflows/frontendlint.yml

@@ -1,6 +1,12 @@
 name: Javascript Linting
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - unstable
+    - hotfixes
+    - master
+  pull_request:
 
 jobs:
   pre_job:
@@ -14,7 +20,7 @@ jobs:
         uses: fkirc/skip-duplicate-actions@master
         with:
           github_token: ${{ github.token }}
-          paths: '["**.vue", "**.js", "yarn.lock"]'
+          paths: '["**.vue", "**.js", "yarn.lock", ".github/workflows/frontendlint.yml"]'
   test:
     name: Frontend linting
     needs: pre_job
@@ -25,7 +31,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: '10.x'
+        node-version: '16.x'
     - name: Cache Node.js modules
       uses: actions/cache@v2
       with:
@@ -38,7 +44,7 @@ jobs:
         yarn --frozen-lockfile
         npm rebuild node-sass
     - name: Run tests
-      run: yarn run lint-all:fix
+      run: yarn run lint-frontend:format
     - name: Check for modified files
       if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository
       id: git-check

.github/workflows/frontendtest.yml

@@ -1,6 +1,12 @@
 name: Javascript Tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - unstable
+    - hotfixes
+    - master
+  pull_request:
 
 jobs:
   pre_job:
@@ -25,7 +31,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: '10.x'
+        node-version: '16.x'
     - name: Cache Node.js modules
       uses: actions/cache@v2
       with:

.github/workflows/pythontest.yml

@@ -1,6 +1,12 @@
 name: Python tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - unstable
+    - hotfixes
+    - master
+  pull_request:
 
 jobs:
   pre_job:
@@ -44,7 +50,7 @@ jobs:
       # Label used to access the service container
       redis:
         # Docker Hub image
-        image: redis:4.0.9
+        image: redis:6.0.9
         # Set health checks to wait until redis has started
         options: >-
           --health-cmd "redis-cli ping"
@@ -64,10 +70,10 @@ jobs:
                     -v /tmp/minio_data:/data \
                     -v /tmp/minio_config:/root/.minio \
                     minio/minio server /data
-    - name: Set up Python 3.6
+    - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: 3.9
     - name: pip cache
       uses: actions/cache@v2
       with:

.gitignore

@@ -65,10 +65,13 @@ docs/_build/
 # PyBuilder
 target/
 
-# virtualenv
+# virtualenv, pipenv, etc
+.env
+.envrc
 venv
 .venv
 Pipfile
+Pipfile.lock
 
 Thumbs.db
 .DS_Store

.pre-commit-config.yaml

@@ -20,6 +20,6 @@ repos:
       -   id: frontend-lint
           name: Linting of JS, Vue, SCSS and CSS files
           description: This hook handles all frontend linting for Kolibri Studio
-          entry: yarn run lint --write --pattern
+          entry: yarn run lint-frontend:format
           language: system
           files: \.(js|vue|scss|less|css)$

.stylelintrc.js

@@ -9,6 +9,7 @@ module.exports = {
      */
     'selector-max-id': null, // This would require a major refactor
     'at-rule-no-unknown': null, // we're using LESS
-    'scss/at-rule-no-unknown': null // we're using LESS
+    'scss/at-rule-no-unknown': null, // we're using LESS
+    'csstree/validator': null // this triggers issues with unknown at rules too.
   },
 };