tutor/tutor-xqueue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: cleanup with black and isort

Browse Source
This commit is contained in:
Emad Rad 2023-11-24 15:38:15 +03:30 committed by Régis Behmo
parent add702220c
commit e1eea67baf
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tutorxqueue/__about__.py
View File

@ -1,2 +1 @@
__version__ = "16.0.2" __version__ = "16.0.2"

48
tutorxqueue/plugin.py
View File

@ -8,11 +8,11 @@ from glob import glob
import click import click
import pkg_resources import pkg_resources
import requests import requests
from tutor import config as tutor_config from tutor import config as tutor_config
from tutor.__about__ import __version_suffix__ from tutor.__about__ import __version_suffix__
from tutor import exceptions from tutor import exceptions
from tutor import hooks as tutor_hooks from tutor import hooks as tutor_hooks
from tutor.__about__ import __version_suffix__
from .__about__ import __version__ from .__about__ import __version__
@ -21,11 +21,6 @@ if __version_suffix__:
__version__ += "-" + __version_suffix__ __version__ += "-" + __version_suffix__
config = { config = {
"unique": {
"AUTH_PASSWORD": "{{ 8|random_string }}",
"MYSQL_PASSWORD": "{{ 8|random_string }}",
"SECRET_KEY": "{{ 24|random_string }}",
},
"defaults": { "defaults": {
"VERSION": __version__, "VERSION": __version__,
"AUTH_USERNAME": "lms", "AUTH_USERNAME": "lms",
@ -36,6 +31,11 @@ config = {
"REPOSITORY": "https://github.com/openedx/xqueue", "REPOSITORY": "https://github.com/openedx/xqueue",
"REPOSITORY_VERSION": "{{ OPENEDX_COMMON_VERSION }}", "REPOSITORY_VERSION": "{{ OPENEDX_COMMON_VERSION }}",
}, },
"unique": {
"AUTH_PASSWORD": "{{ 8|random_string }}",
"MYSQL_PASSWORD": "{{ 8|random_string }}",
"SECRET_KEY": "{{ 24|random_string }}",
},
} }
# Initialization hooks # Initialization hooks
@ -61,21 +61,27 @@ for service, template_path in MY_INIT_TASKS:
tutor_hooks.Filters.CLI_DO_INIT_TASKS.add_item((service, init_task)) tutor_hooks.Filters.CLI_DO_INIT_TASKS.add_item((service, init_task))
# Image management # Image management
tutor_hooks.Filters.IMAGES_BUILD.add_item(( tutor_hooks.Filters.IMAGES_BUILD.add_item(
"xqueue", (
("plugins", "xqueue", "build", "xqueue"), "xqueue",
"{{ XQUEUE_DOCKER_IMAGE }}", ("plugins", "xqueue", "build", "xqueue"),
(), "{{ XQUEUE_DOCKER_IMAGE }}",
)) (),
)
)
tutor_hooks.Filters.IMAGES_PULL.add_item(( tutor_hooks.Filters.IMAGES_PULL.add_item(
"xqueue", (
"{{ XQUEUE_DOCKER_IMAGE }}", "xqueue",
)) "{{ XQUEUE_DOCKER_IMAGE }}",
tutor_hooks.Filters.IMAGES_PUSH.add_item(( )
"xqueue", )
"{{ XQUEUE_DOCKER_IMAGE }}", tutor_hooks.Filters.IMAGES_PUSH.add_item(
)) (
"xqueue",
"{{ XQUEUE_DOCKER_IMAGE }}",
)
)
@tutor_hooks.Filters.COMPOSE_MOUNTS.add() @tutor_hooks.Filters.COMPOSE_MOUNTS.add()
@ -245,7 +251,6 @@ submissions.add_command(show_submission)
submissions.add_command(grade_submission) submissions.add_command(grade_submission)
command.add_command(submissions) command.add_command(submissions)
####### Boilerplate code
# Add the "templates" folder as a template root # Add the "templates" folder as a template root
tutor_hooks.Filters.ENV_TEMPLATE_ROOTS.add_item( tutor_hooks.Filters.ENV_TEMPLATE_ROOTS.add_item(
pkg_resources.resource_filename("tutorxqueue", "templates") pkg_resources.resource_filename("tutorxqueue", "templates")
@ -288,6 +293,7 @@ tutor_hooks.Filters.CONFIG_OVERRIDES.add_items(
# Xqueue Public Host # Xqueue Public Host
######################################## ########################################
@tutor_hooks.Filters.APP_PUBLIC_HOSTS.add() @tutor_hooks.Filters.APP_PUBLIC_HOSTS.add()
def _xqueue_public_hosts( def _xqueue_public_hosts(
hosts: list[str], context_name: t.Literal["local", "dev"] hosts: list[str], context_name: t.Literal["local", "dev"]