Merge pull request #111 from learningequality/linting

Attempt to fix linting.

.github/workflows/pre-commit.yml

@@ -1,6 +1,12 @@
 name: Linting
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+    branches:
+    - main
 
 jobs:
   pre_job:
@@ -24,5 +30,5 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: 3.11
+        python-version: '3.10'
     - uses: pre-commit/[email protected]

.gitignore

@@ -129,12 +129,9 @@ dmypy.json
 
 # ignores specific to this project.
 *.whl
-src/kolibri
 src/*.dist-info
 # generated files
-assets/preseeded_kolibri_home
-src/stdlib_imports.py
 tmpenv
 whl
 package
-kolibri
+kolibrisrc

.pre-commit-config.yaml

@@ -14,7 +14,8 @@ repos:
     rev: v3.9.0
     hooks:
     -   id: reorder-python-imports
-        language_version: python3.11
+        language_version: python3
+        args: [--application-directories=.:src, --py37-plus]
 -   repo: https://github.com/python/black
     rev: 22.3.0
     hooks:

Makefile

@@ -13,7 +13,7 @@ guard-%:
 	fi
 
 needs-version:
-	$(eval KOLIBRI_VERSION ?= $(shell python3 -c "import os; import sys; sys.path = [os.path.abspath('kolibri')] + sys.path; from pkginfo import Installed; print(Installed('kolibri').version)"))
+	$(eval KOLIBRI_VERSION ?= $(shell python3 -c "import os; import sys; sys.path = [os.path.abspath('kolibrisrc')] + sys.path; from pkginfo import Installed; print(Installed('kolibri').version)"))
 	$(eval APP_VERSION ?= $(shell python3 read_version.py))
 
 clean:
@@ -24,17 +24,17 @@ clean-whl:
 	mkdir whl
 
 install-whl:
-	rm -rf kolibri
-	pip3 install ${whl} -t kolibri/
+	rm -rf kolibrisrc
+	pip3 install ${whl} -t kolibrisrc/
 	# Read SQLAlchemy version from the unpacked whl file to avoid hard coding.
 	# Manually install the sqlalchemy version
-	@version=$$(grep -Eo '__version__ = "([0-9]+\.[0-9]+\.[0-9]+)"' kolibri/kolibri/dist/sqlalchemy/__init__.py | grep -Eo "([0-9]+\.[0-9]+\.[0-9]+)"); \
+	@version=$$(grep -Eo '__version__ = "([0-9]+\.[0-9]+\.[0-9]+)"' kolibrisrc/kolibri/dist/sqlalchemy/__init__.py | grep -Eo "([0-9]+\.[0-9]+\.[0-9]+)"); \
 	pip3 install sqlalchemy==$$version --no-binary :all:
 	# Delete sqlalchemy from the dist folder
-	rm -rf kolibri/kolibri/dist/sqlalchemy
-	rm -rf kolibri/kolibri/dist/SQLAlchemy*
+	rm -rf kolibrisrc/kolibri/dist/sqlalchemy
+	rm -rf kolibrisrc/kolibri/dist/SQLAlchemy*
 	# This doesn't exist in 0.15, so don't error if it doesn't exist.
-	echo "3.3.1" > kolibri/kolibri/dist/importlib_resources/version.txt || true
+	echo "3.3.1" > kolibrisrc/kolibri/dist/importlib_resources/version.txt || true
 
 get-whl: clean-whl
 # The eval and shell commands here are evaluated when the recipe is parsed, so we put the cleanup

build_config/dmgbuild_settings.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 # Symlinks to create
 symlinks = {"Applications": "/Applications"}
 

kolibri.spec

@@ -8,7 +8,7 @@ from glob import glob
 
 block_cipher = None
 
-sys.path = [os.path.abspath('kolibri')] + sys.path
+sys.path = [os.path.abspath('kolibrisrc')] + sys.path
 
 import kolibri
 kolibri_version = kolibri.__version__
@@ -26,7 +26,7 @@ locale_datas = [
 
 a = Analysis(
     [os.path.join('src', 'kolibri_app', '__main__.py')],
-    pathex=['kolibri', os.path.join('kolibri', 'kolibri', 'dist')],
+    pathex=['kolibrisrc', os.path.join('kolibrisrc', 'kolibri', 'dist')],
     binaries=[],
     datas=[('src/kolibri_app/assets/*.*', 'kolibri_app/assets')] + locale_datas,
     hiddenimports=[],

src/kolibri_app/__init__.py

@@ -1,9 +1,9 @@
 import os
 
-from kolibri_app.constants import MAC
-
 from kolibri.main import enable_plugin
 
+from kolibri_app.constants import MAC
+
 __version__ = "0.3.0"
 
 os.environ["KOLIBRI_INSTALLER_VERSION"] = __version__

src/kolibri_app/application.py

@@ -4,16 +4,16 @@
 from threading import Thread
 
 import wx
-from kolibri_app.constants import APP_NAME
-from kolibri_app.logger import logging
-from kolibri_app.view import KolibriView
-from magicbus.plugins import SimplePlugin
-
 from kolibri.main import initialize
 from kolibri.plugins.app.utils import interface
 from kolibri.plugins.app.utils import SHARE_FILE
 from kolibri.utils.conf import KOLIBRI_HOME
 from kolibri.utils.server import KolibriProcessBus
+from magicbus.plugins import SimplePlugin
+
+from kolibri_app.constants import APP_NAME
+from kolibri_app.logger import logging
+from kolibri_app.view import KolibriView
 
 
 share_file = None

src/kolibri_app/django_app_settings.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from kolibri.deployment.default.settings.base import *  # noqa
 
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False

src/kolibri_app/logger.py

@@ -21,10 +21,10 @@ class LoggerWriter(io.IOBase):
     def __init__(self, writer):
         self._writer = writer
         self._msg = ""
-    
+
     def readable(self):
         return False
-    
+
     def writable(self):
         return True
 

src/kolibri_app/view.py

@@ -5,13 +5,14 @@
 from io import BytesIO
 
 import wx
+from wx import html2
+
 from kolibri_app.constants import APP_NAME
 from kolibri_app.constants import LINUX
 from kolibri_app.constants import MAC
 from kolibri_app.constants import WINDOWS
 from kolibri_app.i18n import _
 from kolibri_app.i18n import locale_info
-from wx import html2
 
 
 html2.WebView.MSWSetEmulationLevel(html2.WEBVIEWIE_EMU_IE11)