From e1eea67bafae37c8ef6eafea71c4a0725d824896 Mon Sep 17 00:00:00 2001 From: Emad Rad Date: Fri, 24 Nov 2023 15:38:15 +0330 Subject: [PATCH] chore: cleanup with black and isort --- tutorxqueue/__about__.py | 1 - tutorxqueue/plugin.py | 48 ++++++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/tutorxqueue/__about__.py b/tutorxqueue/__about__.py index 99e36f2..eabf3d3 100644 --- a/tutorxqueue/__about__.py +++ b/tutorxqueue/__about__.py @@ -1,2 +1 @@ __version__ = "16.0.2" - diff --git a/tutorxqueue/plugin.py b/tutorxqueue/plugin.py index 727f5ac..d17541f 100644 --- a/tutorxqueue/plugin.py +++ b/tutorxqueue/plugin.py @@ -8,11 +8,11 @@ from glob import glob import click import pkg_resources import requests - from tutor import config as tutor_config from tutor.__about__ import __version_suffix__ from tutor import exceptions from tutor import hooks as tutor_hooks +from tutor.__about__ import __version_suffix__ from .__about__ import __version__ @@ -21,11 +21,6 @@ if __version_suffix__: __version__ += "-" + __version_suffix__ config = { - "unique": { - "AUTH_PASSWORD": "{{ 8|random_string }}", - "MYSQL_PASSWORD": "{{ 8|random_string }}", - "SECRET_KEY": "{{ 24|random_string }}", - }, "defaults": { "VERSION": __version__, "AUTH_USERNAME": "lms", @@ -36,6 +31,11 @@ config = { "REPOSITORY": "https://github.com/openedx/xqueue", "REPOSITORY_VERSION": "{{ OPENEDX_COMMON_VERSION }}", }, + "unique": { + "AUTH_PASSWORD": "{{ 8|random_string }}", + "MYSQL_PASSWORD": "{{ 8|random_string }}", + "SECRET_KEY": "{{ 24|random_string }}", + }, } # 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)) # Image management -tutor_hooks.Filters.IMAGES_BUILD.add_item(( - "xqueue", - ("plugins", "xqueue", "build", "xqueue"), - "{{ XQUEUE_DOCKER_IMAGE }}", - (), -)) +tutor_hooks.Filters.IMAGES_BUILD.add_item( + ( + "xqueue", + ("plugins", "xqueue", "build", "xqueue"), + "{{ XQUEUE_DOCKER_IMAGE }}", + (), + ) +) -tutor_hooks.Filters.IMAGES_PULL.add_item(( - "xqueue", - "{{ XQUEUE_DOCKER_IMAGE }}", -)) -tutor_hooks.Filters.IMAGES_PUSH.add_item(( - "xqueue", - "{{ XQUEUE_DOCKER_IMAGE }}", -)) +tutor_hooks.Filters.IMAGES_PULL.add_item( + ( + "xqueue", + "{{ XQUEUE_DOCKER_IMAGE }}", + ) +) +tutor_hooks.Filters.IMAGES_PUSH.add_item( + ( + "xqueue", + "{{ XQUEUE_DOCKER_IMAGE }}", + ) +) @tutor_hooks.Filters.COMPOSE_MOUNTS.add() @@ -245,7 +251,6 @@ submissions.add_command(show_submission) submissions.add_command(grade_submission) command.add_command(submissions) -####### Boilerplate code # Add the "templates" folder as a template root tutor_hooks.Filters.ENV_TEMPLATE_ROOTS.add_item( pkg_resources.resource_filename("tutorxqueue", "templates") @@ -288,6 +293,7 @@ tutor_hooks.Filters.CONFIG_OVERRIDES.add_items( # Xqueue Public Host ######################################## + @tutor_hooks.Filters.APP_PUBLIC_HOSTS.add() def _xqueue_public_hosts( hosts: list[str], context_name: t.Literal["local", "dev"]