From 28a8c759c335107f10909b9a2ff7e7418eb944da Mon Sep 17 00:00:00 2001 From: Richard Tibbles Date: Fri, 4 Mar 2022 10:27:48 -0800 Subject: [PATCH] Upgrade order imports hook and fix linting. --- .pre-commit-config.yaml | 2 +- README.md | 2 +- src/kolibri_app/__init__.py | 3 +-- src/kolibri_app/application.py | 9 ++++----- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5d316c6..b2c669b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: - id: end-of-file-fixer exclude: '^.+?(\.json|\.po)$' - repo: https://github.com/asottile/reorder_python_imports - rev: v1.3.3 + rev: v2.7.1 hooks: - id: reorder-python-imports language_version: python3.9 diff --git a/README.md b/README.md index 7b8513c..47775e7 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ To export the necessary p12 certificate used for codesigning, first be sure to h Then, be sure that the certificate is valid (selecting it will show a checkmark and say that it is valid), and that it has an associated private key. You can check if there is a private key in keychain access. Next to the name on the left, there should be a toggle, which would open to show that there is a private key, associated with your name. This is the bundle that is able to be exported. Using a certificate without this associated private key will NOT work. -Once you have confirmed that the private key is linked with the certificate, right click, Export, and then select p12 as the file option. If there is no p12 as an option, your certificate does not have the private key. +Once you have confirmed that the private key is linked with the certificate, right click, Export, and then select p12 as the file option. If there is no p12 as an option, your certificate does not have the private key. Choose a password that will be associate with the certificate, and enter when prompted (also, write it down because you will not access it again). Add the password and the file in 1Password for team access. diff --git a/src/kolibri_app/__init__.py b/src/kolibri_app/__init__.py index be7abf6..70c54fe 100644 --- a/src/kolibri_app/__init__.py +++ b/src/kolibri_app/__init__.py @@ -1,8 +1,7 @@ import os -from kolibri_app.constants import MAC - from kolibri.main import enable_plugin +from kolibri_app.constants import MAC __version__ = "0.3.0" diff --git a/src/kolibri_app/application.py b/src/kolibri_app/application.py index bc4d357..820cc4e 100644 --- a/src/kolibri_app/application.py +++ b/src/kolibri_app/application.py @@ -4,16 +4,15 @@ 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 kolibri_app.constants import APP_NAME +from kolibri_app.logger import logging +from kolibri_app.view import KolibriView +from magicbus.plugins import SimplePlugin share_file = None