From ee0dfd755c23d61d1b89a5c71587c8580248518c Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 22 Mar 2022 01:35:17 -0400 Subject: [PATCH 01/47] added illumidesk secret option --- src/formgradernext/requirements.txt | 1 + src/graderservice/graderservice/graderservice.py | 2 +- src/graderservice/requirements.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 5fce9ae0..9c032da6 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -212,6 +212,7 @@ webencodings==0.5.1 # via bleach widgetsnbextension==3.5.2 # via ipywidgets +secretsmanager-illumidesk==0.0.1 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/src/graderservice/graderservice/graderservice.py b/src/graderservice/graderservice/graderservice.py index 5981cabf..7ef2904b 100644 --- a/src/graderservice/graderservice/graderservice.py +++ b/src/graderservice/graderservice/graderservice.py @@ -6,7 +6,7 @@ from os import path from pathlib import Path from secrets import token_hex - +from secretsmanager.secretsmanager import SecretsManager from kubernetes import client from kubernetes import config from kubernetes.config import ConfigException diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index aea7f9e2..323ddf6b 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -73,5 +73,6 @@ websocket-client==0.59.0 werkzeug==2.0.0 # via flask +secretsmanager-illumidesk==0.0.1 # The following packages are considered to be unsafe in a requirements file: # setuptools From 32db3a51e9316ea99fb562fb64beef5bdac61bd0 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Thu, 24 Mar 2022 21:54:49 -0400 Subject: [PATCH 02/47] initialization of secrets manager --- src/graderservice/graderservice/graderservice.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/graderservice/graderservice/graderservice.py b/src/graderservice/graderservice/graderservice.py index 7ef2904b..a780feff 100644 --- a/src/graderservice/graderservice/graderservice.py +++ b/src/graderservice/graderservice/graderservice.py @@ -60,6 +60,9 @@ nbgrader_db_port = os.environ.get("POSTGRES_NBGRADER_PORT") nbgrader_db_name = os.environ.get("POSTGRES_NBGRADER_DB_NAME") +aws_secret_arn = os.environ.get('AWS_SECRET_ARN') +secretmanager = SecretsManager(aws_secret_arn, region_name='us-west-2', host=nbgrader_db_host) + class GraderServiceLauncher: def __init__(self, org_name: str, course_id: str): @@ -180,11 +183,16 @@ def _create_nbgrader_files(self): logger.info( f"Writing the nbgrader_config.py file at jupyter directory (within the grader home): {grader_nbconfig_path}" ) + db_url = '' + if aws_secret_arn != '': + db_url = secretmanager.rds_connection(f'{self.org_name}_{self.course_id}') + else: + db_url = f"postgresql://{nbgrader_db_user}:{nbgrader_db_password}@{nbgrader_db_host}:5432/{self.org_name}_{self.course_id}" # write the file grader_home_nbconfig_content = NBGRADER_HOME_CONFIG_TEMPLATE.format( grader_name=self.grader_name, course_id=self.course_id, - db_url=f"postgresql://{nbgrader_db_user}:{nbgrader_db_password}@{nbgrader_db_host}:5432/{self.org_name}_{self.course_id}", + db_url=db_url, ) grader_nbconfig_path.write_text(grader_home_nbconfig_content) # Write the nbgrader_config.py file at grader home directory From 070ca4f4adf3ad8c6db57ebe89b5e854d9cb73b1 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Thu, 24 Mar 2022 21:56:54 -0400 Subject: [PATCH 03/47] updated graderservice to add restart grader functionality --- .../graderservice/graderservice.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/graderservice/graderservice/graderservice.py b/src/graderservice/graderservice/graderservice.py index a780feff..aa275e7f 100644 --- a/src/graderservice/graderservice/graderservice.py +++ b/src/graderservice/graderservice/graderservice.py @@ -366,3 +366,23 @@ def update_jhub_deployment(self): name="hub", namespace=NAMESPACE, body=deployment ) logger.info(f"Jhub patch response:{api_response}") + + # Restarts deployment in namespace + def restart_deployment(v1_apps, deployment, namespace): + now = datetime.datetime.utcnow() + now = str(now.isoformat("T") + "Z") + body = { + 'spec': { + 'template':{ + 'metadata': { + 'annotations': { + 'kubectl.kubernetes.io/restartedAt': now + } + } + } + } + } + try: + v1_apps.patch_namespaced_deployment(deployment, namespace, body, pretty='true') + except ApiException as e: + print("Exception when calling AppsV1Api->read_namespaced_deployment_status: %s\n" % e) \ No newline at end of file From 4554626212b296076c99ea1aa7d72f39ea85ebfa Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Fri, 25 Mar 2022 17:34:11 -0400 Subject: [PATCH 04/47] updated route to restart grader --- .../graderservice/graderservice.py | 30 +++++++++++-------- src/graderservice/graderservice/routes.py | 18 +++++++++++ src/graderservice/requirements.txt | 2 +- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/graderservice/graderservice/graderservice.py b/src/graderservice/graderservice/graderservice.py index aa275e7f..3ec1c032 100644 --- a/src/graderservice/graderservice/graderservice.py +++ b/src/graderservice/graderservice/graderservice.py @@ -6,10 +6,11 @@ from os import path from pathlib import Path from secrets import token_hex -from secretsmanager.secretsmanager import SecretsManager from kubernetes import client from kubernetes import config from kubernetes.config import ConfigException +from kubernetes.client.rest import ApiException +import time from .templates import NBGRADER_COURSE_CONFIG_TEMPLATE from .templates import NBGRADER_HOME_CONFIG_TEMPLATE @@ -60,8 +61,6 @@ nbgrader_db_port = os.environ.get("POSTGRES_NBGRADER_PORT") nbgrader_db_name = os.environ.get("POSTGRES_NBGRADER_DB_NAME") -aws_secret_arn = os.environ.get('AWS_SECRET_ARN') -secretmanager = SecretsManager(aws_secret_arn, region_name='us-west-2', host=nbgrader_db_host) class GraderServiceLauncher: @@ -183,16 +182,11 @@ def _create_nbgrader_files(self): logger.info( f"Writing the nbgrader_config.py file at jupyter directory (within the grader home): {grader_nbconfig_path}" ) - db_url = '' - if aws_secret_arn != '': - db_url = secretmanager.rds_connection(f'{self.org_name}_{self.course_id}') - else: - db_url = f"postgresql://{nbgrader_db_user}:{nbgrader_db_password}@{nbgrader_db_host}:5432/{self.org_name}_{self.course_id}" # write the file grader_home_nbconfig_content = NBGRADER_HOME_CONFIG_TEMPLATE.format( grader_name=self.grader_name, course_id=self.course_id, - db_url=db_url, + db_url=f"postgresql://{nbgrader_db_user}:{nbgrader_db_password}@{nbgrader_db_host}:5432/{self.org_name}_{self.course_id}", ) grader_nbconfig_path.write_text(grader_home_nbconfig_content) # Write the nbgrader_config.py file at grader home directory @@ -368,8 +362,8 @@ def update_jhub_deployment(self): logger.info(f"Jhub patch response:{api_response}") # Restarts deployment in namespace - def restart_deployment(v1_apps, deployment, namespace): - now = datetime.datetime.utcnow() + def restart_deployment(self, deployment, namespace): + now = datetime.utcnow() now = str(now.isoformat("T") + "Z") body = { 'spec': { @@ -382,7 +376,17 @@ def restart_deployment(v1_apps, deployment, namespace): } } } + deployment_status = f'{deployment} failed to deploy to organization: {namespace}' try: - v1_apps.patch_namespaced_deployment(deployment, namespace, body, pretty='true') + restart_deployment = self.apps_v1.patch_namespaced_deployment(deployment, namespace, body, pretty='true') except ApiException as e: - print("Exception when calling AppsV1Api->read_namespaced_deployment_status: %s\n" % e) \ No newline at end of file + logger.error("Exception when calling AppsV1Api->read_namespaced_deployment_status: %s\n" % e) + else: + while restart_deployment.status.updated_replicas != restart_deployment.spec.replicas: + logger.info(f'Waiting for status to update for grader{deployment} to organization {namespace}') + time.sleep(5) + deployment_status = f'{deployment} successfully deployed to organization {namespace}' + return deployment_status + + return deployment_status + diff --git a/src/graderservice/graderservice/routes.py b/src/graderservice/graderservice/routes.py index 93416c4d..4bbc86a9 100644 --- a/src/graderservice/graderservice/routes.py +++ b/src/graderservice/graderservice/routes.py @@ -203,6 +203,24 @@ def assignment_dir_creation(org_name: str, course_id: str, assignment_name: str) success=True, message=f"Created new assignment directory: {assignment_dir}", ) +@grader_setup_bp.route( + "/services///restart", methods=["POST"] +) +def restart_grader(org_name: str, course_id: str): + launcher = GraderServiceLauncher(org_name=org_name, course_id=course_id) + try: + restart_deployment_status = launcher.restart_deployment(f'grader-{course_id}',org_name) + + except Exception as e: + logger.error(f"Error restarting grader: {e}") + return jsonify(success=False, error=str(e)), 404 + logger.info(restart_deployment_status) + return jsonify( + success=True, + message=f"{restart_deployment_status}" + ) + + @grader_setup_bp.route("/healthcheck") diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 323ddf6b..728b41a4 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -73,6 +73,6 @@ websocket-client==0.59.0 werkzeug==2.0.0 # via flask -secretsmanager-illumidesk==0.0.1 +secretsmanager-illumidesk==0.0.2 # The following packages are considered to be unsafe in a requirements file: # setuptools From 2ad280f791d4a13e208770cc19910c9307dfe127 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Fri, 25 Mar 2022 17:46:54 -0400 Subject: [PATCH 05/47] added response code for route --- src/graderservice/graderservice/graderservice.py | 3 ++- src/graderservice/graderservice/routes.py | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/graderservice/graderservice/graderservice.py b/src/graderservice/graderservice/graderservice.py index 3ec1c032..d7223e16 100644 --- a/src/graderservice/graderservice/graderservice.py +++ b/src/graderservice/graderservice/graderservice.py @@ -381,6 +381,7 @@ def restart_deployment(self, deployment, namespace): restart_deployment = self.apps_v1.patch_namespaced_deployment(deployment, namespace, body, pretty='true') except ApiException as e: logger.error("Exception when calling AppsV1Api->read_namespaced_deployment_status: %s\n" % e) + return deployment_status else: while restart_deployment.status.updated_replicas != restart_deployment.spec.replicas: logger.info(f'Waiting for status to update for grader{deployment} to organization {namespace}') @@ -388,5 +389,5 @@ def restart_deployment(self, deployment, namespace): deployment_status = f'{deployment} successfully deployed to organization {namespace}' return deployment_status - return deployment_status + diff --git a/src/graderservice/graderservice/routes.py b/src/graderservice/graderservice/routes.py index 4bbc86a9..500dd8c5 100644 --- a/src/graderservice/graderservice/routes.py +++ b/src/graderservice/graderservice/routes.py @@ -214,12 +214,13 @@ def restart_grader(org_name: str, course_id: str): except Exception as e: logger.error(f"Error restarting grader: {e}") return jsonify(success=False, error=str(e)), 404 - logger.info(restart_deployment_status) - return jsonify( - success=True, - message=f"{restart_deployment_status}" - ) - + else: + logger.info(restart_deployment_status) + return jsonify( + success=True, + message=f"{restart_deployment_status}" + ), 200 + From 938df6a4ff2a94f0619578722b6462bd1c11b522 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Fri, 25 Mar 2022 18:07:32 -0400 Subject: [PATCH 06/47] updated formgrader secretsmanager version to a valid one --- src/formgradernext/requirements.txt | 2 +- src/graderservice/graderservice/graderservice.py | 9 +++++---- src/graderservice/graderservice/routes.py | 15 +++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 9c032da6..96568a49 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -212,7 +212,7 @@ webencodings==0.5.1 # via bleach widgetsnbextension==3.5.2 # via ipywidgets -secretsmanager-illumidesk==0.0.1 +secretsmanager-illumidesk==0.0.2 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/src/graderservice/graderservice/graderservice.py b/src/graderservice/graderservice/graderservice.py index d7223e16..620d90d1 100644 --- a/src/graderservice/graderservice/graderservice.py +++ b/src/graderservice/graderservice/graderservice.py @@ -376,18 +376,19 @@ def restart_deployment(self, deployment, namespace): } } } - deployment_status = f'{deployment} failed to deploy to organization: {namespace}' + deployment_status = f'{deployment} failed to deploy to organization: {namespace}', 404 try: restart_deployment = self.apps_v1.patch_namespaced_deployment(deployment, namespace, body, pretty='true') except ApiException as e: logger.error("Exception when calling AppsV1Api->read_namespaced_deployment_status: %s\n" % e) - return deployment_status + except Exception as e: + logger.error(deployment_status, e) else: while restart_deployment.status.updated_replicas != restart_deployment.spec.replicas: logger.info(f'Waiting for status to update for grader{deployment} to organization {namespace}') time.sleep(5) - deployment_status = f'{deployment} successfully deployed to organization {namespace}' - return deployment_status + deployment_status = f'{deployment} successfully deployed to organization {namespace}', 200 + return deployment_status diff --git a/src/graderservice/graderservice/routes.py b/src/graderservice/graderservice/routes.py index 500dd8c5..9721b019 100644 --- a/src/graderservice/graderservice/routes.py +++ b/src/graderservice/graderservice/routes.py @@ -210,16 +210,15 @@ def restart_grader(org_name: str, course_id: str): launcher = GraderServiceLauncher(org_name=org_name, course_id=course_id) try: restart_deployment_status = launcher.restart_deployment(f'grader-{course_id}',org_name) - except Exception as e: logger.error(f"Error restarting grader: {e}") - return jsonify(success=False, error=str(e)), 404 - else: - logger.info(restart_deployment_status) - return jsonify( - success=True, - message=f"{restart_deployment_status}" - ), 200 + + logger.info(restart_deployment_status) + success = True if restart_deployment_status[1]==200 else False + return jsonify( + success=success, + message=f"{restart_deployment_status[0]}" + ), restart_deployment_status[1] From b8944e582d6e33c4d5e5da91cd7ab52459662df1 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Fri, 25 Mar 2022 20:27:34 -0400 Subject: [PATCH 07/47] graderservice restart grader timeout 10 seconds --- src/graderservice/graderservice/graderservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/graderservice/graderservice/graderservice.py b/src/graderservice/graderservice/graderservice.py index 620d90d1..8a51c83d 100644 --- a/src/graderservice/graderservice/graderservice.py +++ b/src/graderservice/graderservice/graderservice.py @@ -386,7 +386,7 @@ def restart_deployment(self, deployment, namespace): else: while restart_deployment.status.updated_replicas != restart_deployment.spec.replicas: logger.info(f'Waiting for status to update for grader{deployment} to organization {namespace}') - time.sleep(5) + time.sleep(10) deployment_status = f'{deployment} successfully deployed to organization {namespace}', 200 return deployment_status From 48a64674a9edf9ab3be59bd327bb15c4b410df43 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 08:40:50 -0400 Subject: [PATCH 08/47] grader service sleep changed --- src/graderservice/graderservice/graderservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/graderservice/graderservice/graderservice.py b/src/graderservice/graderservice/graderservice.py index 8a51c83d..620d90d1 100644 --- a/src/graderservice/graderservice/graderservice.py +++ b/src/graderservice/graderservice/graderservice.py @@ -386,7 +386,7 @@ def restart_deployment(self, deployment, namespace): else: while restart_deployment.status.updated_replicas != restart_deployment.spec.replicas: logger.info(f'Waiting for status to update for grader{deployment} to organization {namespace}') - time.sleep(10) + time.sleep(5) deployment_status = f'{deployment} successfully deployed to organization {namespace}', 200 return deployment_status From 7ac98ace6eb2c56f7c77a276e6e450e4236c9569 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 08:47:08 -0400 Subject: [PATCH 09/47] updated to jupyterhub ltiauthenticator --- src/illumidesk/requirements.txt | 2 +- src/illumidesk/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 3d222b0b..54f3e45c 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -37,7 +37,7 @@ jupyter-core==4.7.1 # via jupyter-client, nbconvert, nbformat, nbgrader, n jupyter-telemetry==0.1.0 # via jupyterhub jupyter==1.0.0 # via nbgrader jupyterhub-kubespawner==0.14.1 # via illumidesk (setup.py) -git+git://github.com/jupyterhub/ltiauthenticator.git@71d86a9da2562df4bdcc9f374af834a172ac52d5 # via illumidesk (setup.py) +jupyterhub-ltiauthenticator==1.3.0 # via illumidesk (setup.py) jupyterhub==1.4.1 # via jupyterhub-kubespawner, jupyterhub-ltiauthenticator, oauthenticator jupyterlab-widgets==1.0.0 # via ipywidgets jwcrypto==0.8 # via illumidesk (setup.py) diff --git a/src/illumidesk/setup.py b/src/illumidesk/setup.py index b0cd6319..9c4abf61 100644 --- a/src/illumidesk/setup.py +++ b/src/illumidesk/setup.py @@ -38,7 +38,7 @@ install_requires=[ "josepy==1.4.0", "jupyterhub-kubespawner==0.14.1", - "jupyterhub-ltiauthenticator@git+git://github.com/jupyterhub/ltiauthenticator.git@71d86a9da2562df4bdcc9f374af834a172ac52d5", + "jupyterhub-ltiauthenticator==1.3.0", "jwcrypto==0.8", "nbgrader==0.6.2", "oauthlib==3.1", From abe0606ad9deddec0fa7afaa39bd628b52add015 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 08:55:54 -0400 Subject: [PATCH 10/47] updated jinja2 and markupsafe version --- src/formgradernext/requirements.txt | 4 ++-- src/graderservice/requirements.txt | 4 ++-- src/illumidesk/requirements.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 96568a49..86788c65 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.2 +jinja2==3.1.1 # via # nbconvert # notebook @@ -89,7 +89,7 @@ jupyterlab-widgets==1.0.2 # via ipywidgets mako==1.1.5 # via alembic -markupsafe==2.0.1 +markupsafe==2.1.1 # via # jinja2 # mako diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 728b41a4..e95898d4 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,11 +30,11 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.0.0 +jinja2==3.1.1 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) -markupsafe==2.0.0 +markupsafe==2.1.1 # via jinja2 oauthlib==3.1.0 # via requests-oauthlib diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 54f3e45c..cf5a14dc 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2==3.1.1 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole @@ -43,7 +43,7 @@ jupyterlab-widgets==1.0.0 # via ipywidgets jwcrypto==0.8 # via illumidesk (setup.py) kubernetes==17.17.0 # via jupyterhub-kubespawner mako==1.1.4 # via alembic -markupsafe==2.0.0 # via jinja2, mako +markupsafe==2.1.1 # via jinja2, mako matplotlib-inline==0.1.2 # via ipython mistune==0.8.4 # via nbconvert nbconvert==5.6.1 # via jupyter, nbgrader, notebook From 47bf3826128abe85915ea3e232b18ec4031f0313 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 09:08:01 -0400 Subject: [PATCH 11/47] remove markup package --- src/formgradernext/requirements.txt | 2 +- src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 86788c65..0d2b9943 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -89,7 +89,7 @@ jupyterlab-widgets==1.0.2 # via ipywidgets mako==1.1.5 # via alembic -markupsafe==2.1.1 + # via # jinja2 # mako diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index e95898d4..7926e186 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -34,7 +34,7 @@ jinja2==3.1.1 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) -markupsafe==2.1.1 + # via jinja2 oauthlib==3.1.0 # via requests-oauthlib diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index cf5a14dc..b0cb9920 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -43,7 +43,6 @@ jupyterlab-widgets==1.0.0 # via ipywidgets jwcrypto==0.8 # via illumidesk (setup.py) kubernetes==17.17.0 # via jupyterhub-kubespawner mako==1.1.4 # via alembic -markupsafe==2.1.1 # via jinja2, mako matplotlib-inline==0.1.2 # via ipython mistune==0.8.4 # via nbconvert nbconvert==5.6.1 # via jupyter, nbgrader, notebook From 089e1c39dd2223c53f2e17f9bba6fcdbb7d8f955 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 09:14:07 -0400 Subject: [PATCH 12/47] set jinja version to 3.0.3 --- src/formgradernext/requirements.txt | 4 ++-- src/graderservice/requirements.txt | 4 ++-- src/illumidesk/requirements.txt | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 0d2b9943..e4478e2f 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.1.1 +jinja2==3.0.3 # via # nbconvert # notebook @@ -89,7 +89,7 @@ jupyterlab-widgets==1.0.2 # via ipywidgets mako==1.1.5 # via alembic - +markupsafe==2.1.1 # via # jinja2 # mako diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 7926e186..132d91a3 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,11 +30,11 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.1.1 +jinja2==3.0.3 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) - +markupsafe==2.1.1 # via jinja2 oauthlib==3.1.0 # via requests-oauthlib diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index b0cb9920..1b62d7be 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.1.1 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2==3.0.3 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole @@ -43,6 +43,7 @@ jupyterlab-widgets==1.0.0 # via ipywidgets jwcrypto==0.8 # via illumidesk (setup.py) kubernetes==17.17.0 # via jupyterhub-kubespawner mako==1.1.4 # via alembic +markupsafe==2.1.1 # via jinja2, mako matplotlib-inline==0.1.2 # via ipython mistune==0.8.4 # via nbconvert nbconvert==5.6.1 # via jupyter, nbgrader, notebook From 508d95d746003464eeeab49cc860e56c97692b36 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 09:18:21 -0400 Subject: [PATCH 13/47] removed markup safe --- src/formgradernext/requirements.txt | 1 - src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index e4478e2f..0809916d 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -89,7 +89,6 @@ jupyterlab-widgets==1.0.2 # via ipywidgets mako==1.1.5 # via alembic -markupsafe==2.1.1 # via # jinja2 # mako diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 132d91a3..4d5165d6 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -34,7 +34,7 @@ jinja2==3.0.3 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) -markupsafe==2.1.1 + # via jinja2 oauthlib==3.1.0 # via requests-oauthlib diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 1b62d7be..f0783fcf 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -43,7 +43,6 @@ jupyterlab-widgets==1.0.0 # via ipywidgets jwcrypto==0.8 # via illumidesk (setup.py) kubernetes==17.17.0 # via jupyterhub-kubespawner mako==1.1.4 # via alembic -markupsafe==2.1.1 # via jinja2, mako matplotlib-inline==0.1.2 # via ipython mistune==0.8.4 # via nbconvert nbconvert==5.6.1 # via jupyter, nbgrader, notebook From 28d73e912210e0e32610c7d6ab349be95d054e99 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 10:33:54 -0400 Subject: [PATCH 14/47] updated jinja2 and packages dependent on jinja2 --- src/formgradernext/requirements.txt | 4 ++-- src/graderservice/requirements.txt | 4 ++-- src/illumidesk/requirements.txt | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 0809916d..6d9be33f 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.3 +jinja2==3.1.1 # via # nbconvert # notebook @@ -87,7 +87,7 @@ jupyter-core==4.7.1 # qtconsole jupyterlab-widgets==1.0.2 # via ipywidgets -mako==1.1.5 +mako==1.2.0 # via alembic # via # jinja2 diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 4d5165d6..9ae4169a 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,13 +30,13 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.0.3 +jinja2==3.1.1 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) # via jinja2 -oauthlib==3.1.0 +oauthlib==3.2.0 # via requests-oauthlib pyasn1-modules==0.2.8 # via google-auth diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index f0783fcf..eedb3152 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,8 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.3 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2==1.2.0 +oauthlib==3.2.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole From 96390e16b14dc325089438a3921082e692d3f042 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 10:39:57 -0400 Subject: [PATCH 15/47] fixed jinja version --- src/illumidesk/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index eedb3152..08814e70 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2==1.2.0 +jinja2==3.2.0 oauthlib==3.2.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader From 6a7c7a18fc5c11fc8d81dd4be9d1ac92bdfac8b6 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 10:45:44 -0400 Subject: [PATCH 16/47] update jedi version --- src/formgradernext/requirements.txt | 4 ++-- src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 6d9be33f..12a42e19 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -56,9 +56,9 @@ ipython-genutils==0.2.0 # traitlets ipywidgets==7.6.5 # via jupyter -jedi==0.18.0 +jedi==0.18.1 # via ipython -jinja2==3.1.1 +jinja2==3.2.0 # via # nbconvert # notebook diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 9ae4169a..53ead4db 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.1.1 +jinja2==3.2.0 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 08814e70..7aa9faea 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -27,7 +27,7 @@ ipykernel==5.5.5 # via ipywidgets, jupyter, jupyter-console, notebook, ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter -jedi==0.18.0 # via ipython +jedi==0.18.1 # via ipython jinja2==3.2.0 oauthlib==3.2.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) From 5bfdada84e4eeaa6a15c09c9f90843040f8f0785 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 10:50:51 -0400 Subject: [PATCH 17/47] jinja 3.1.1 --- src/formgradernext/requirements.txt | 2 +- src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 12a42e19..8477117a 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.1 # via ipython -jinja2==3.2.0 +jinja2==3.1.1 # via # nbconvert # notebook diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 53ead4db..9ae4169a 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.2.0 +jinja2==3.1.1 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 7aa9faea..9c94ce56 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.1 # via ipython -jinja2==3.2.0 +jinja2==3.1.1 oauthlib==3.2.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader From 0216198216528da7abad613b85f229fbdc874749 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 10:58:38 -0400 Subject: [PATCH 18/47] oauthlib 3.1.1 --- src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 9ae4169a..8f9fd485 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -36,7 +36,7 @@ kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) # via jinja2 -oauthlib==3.2.0 +jinja2==3.1.1 # via requests-oauthlib pyasn1-modules==0.2.8 # via google-auth diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 9c94ce56..ebe3e7f2 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -29,7 +29,7 @@ ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.1 # via ipython jinja2==3.1.1 -oauthlib==3.2.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +oauthlib==3.1.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole From 40f79cafbe776e0407d50bfdd59c4cd956c3933d Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 11:11:47 -0400 Subject: [PATCH 19/47] revert jinja2 to 3.0.3 --- src/formgradernext/requirements.txt | 6 +++--- src/graderservice/requirements.txt | 6 +++--- src/illumidesk/requirements.txt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 8477117a..0809916d 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -56,9 +56,9 @@ ipython-genutils==0.2.0 # traitlets ipywidgets==7.6.5 # via jupyter -jedi==0.18.1 +jedi==0.18.0 # via ipython -jinja2==3.1.1 +jinja2==3.0.3 # via # nbconvert # notebook @@ -87,7 +87,7 @@ jupyter-core==4.7.1 # qtconsole jupyterlab-widgets==1.0.2 # via ipywidgets -mako==1.2.0 +mako==1.1.5 # via alembic # via # jinja2 diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 8f9fd485..132d91a3 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,13 +30,13 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.1.1 +jinja2==3.0.3 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) - +markupsafe==2.1.1 # via jinja2 -jinja2==3.1.1 +oauthlib==3.1.0 # via requests-oauthlib pyasn1-modules==0.2.8 # via google-auth diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index ebe3e7f2..1b62d7be 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -27,9 +27,8 @@ ipykernel==5.5.5 # via ipywidgets, jupyter, jupyter-console, notebook, ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter -jedi==0.18.1 # via ipython -jinja2==3.1.1 -oauthlib==3.1.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jedi==0.18.0 # via ipython +jinja2==3.0.3 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole @@ -44,6 +43,7 @@ jupyterlab-widgets==1.0.0 # via ipywidgets jwcrypto==0.8 # via illumidesk (setup.py) kubernetes==17.17.0 # via jupyterhub-kubespawner mako==1.1.4 # via alembic +markupsafe==2.1.1 # via jinja2, mako matplotlib-inline==0.1.2 # via ipython mistune==0.8.4 # via nbconvert nbconvert==5.6.1 # via jupyter, nbgrader, notebook From 980b972e1b01866a00a1cba91480eda2c4996d15 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 12:19:40 -0400 Subject: [PATCH 20/47] updated flask to version 2.1.0 --- src/graderservice/requirements.txt | 2 +- src/graderservice/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 132d91a3..a24c62a2 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -16,7 +16,7 @@ click==8.0.0 # via flask flask-sqlalchemy==2.5.1 # via graderservice (src/graderservice/setup.py) -flask==1.1.2 +flask==2.1.0 # via # flask-sqlalchemy # graderservice (src/graderservice/setup.py) diff --git a/src/graderservice/setup.py b/src/graderservice/setup.py index 61c30550..90a6d184 100644 --- a/src/graderservice/setup.py +++ b/src/graderservice/setup.py @@ -34,7 +34,7 @@ license="Apache 2.0", packages=find_packages(exclude="./tests"), install_requires=[ - "flask==1.1.2", + "flask==2.1.0", "flask-sqlalchemy==2.5.1", "gunicorn==20.0.4", "kubernetes==12.0.1", From cee446415487f1413e7a294060f390fe1b4945ca Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 12:25:24 -0400 Subject: [PATCH 21/47] revert flask version --- src/graderservice/requirements.txt | 2 +- src/graderservice/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index a24c62a2..132d91a3 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -16,7 +16,7 @@ click==8.0.0 # via flask flask-sqlalchemy==2.5.1 # via graderservice (src/graderservice/setup.py) -flask==2.1.0 +flask==1.1.2 # via # flask-sqlalchemy # graderservice (src/graderservice/setup.py) diff --git a/src/graderservice/setup.py b/src/graderservice/setup.py index 90a6d184..61c30550 100644 --- a/src/graderservice/setup.py +++ b/src/graderservice/setup.py @@ -34,7 +34,7 @@ license="Apache 2.0", packages=find_packages(exclude="./tests"), install_requires=[ - "flask==2.1.0", + "flask==1.1.2", "flask-sqlalchemy==2.5.1", "gunicorn==20.0.4", "kubernetes==12.0.1", From e2aceec65611f5c55bf769905786de262a1029dc Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 12:31:34 -0400 Subject: [PATCH 22/47] flask version 1.1.1 --- src/graderservice/requirements.txt | 2 +- src/graderservice/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 132d91a3..362f5b44 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -16,7 +16,7 @@ click==8.0.0 # via flask flask-sqlalchemy==2.5.1 # via graderservice (src/graderservice/setup.py) -flask==1.1.2 +flask==1.1.1 # via # flask-sqlalchemy # graderservice (src/graderservice/setup.py) diff --git a/src/graderservice/setup.py b/src/graderservice/setup.py index 61c30550..8d9fafe4 100644 --- a/src/graderservice/setup.py +++ b/src/graderservice/setup.py @@ -34,7 +34,7 @@ license="Apache 2.0", packages=find_packages(exclude="./tests"), install_requires=[ - "flask==1.1.2", + "flask==1.1.1", "flask-sqlalchemy==2.5.1", "gunicorn==20.0.4", "kubernetes==12.0.1", From db33df40c276ad9f1b8cc0b1fb3a64a8ed60859e Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 12:40:52 -0400 Subject: [PATCH 23/47] update requirements --- src/graderservice/requirements.txt | 2 +- src/graderservice/setup.py | 2 +- src/illumidesk/requirements.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 362f5b44..132d91a3 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -16,7 +16,7 @@ click==8.0.0 # via flask flask-sqlalchemy==2.5.1 # via graderservice (src/graderservice/setup.py) -flask==1.1.1 +flask==1.1.2 # via # flask-sqlalchemy # graderservice (src/graderservice/setup.py) diff --git a/src/graderservice/setup.py b/src/graderservice/setup.py index 8d9fafe4..61c30550 100644 --- a/src/graderservice/setup.py +++ b/src/graderservice/setup.py @@ -34,7 +34,7 @@ license="Apache 2.0", packages=find_packages(exclude="./tests"), install_requires=[ - "flask==1.1.1", + "flask==1.1.2", "flask-sqlalchemy==2.5.1", "gunicorn==20.0.4", "kubernetes==12.0.1", diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 1b62d7be..54f3e45c 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.3 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2==3.0.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole @@ -43,7 +43,7 @@ jupyterlab-widgets==1.0.0 # via ipywidgets jwcrypto==0.8 # via illumidesk (setup.py) kubernetes==17.17.0 # via jupyterhub-kubespawner mako==1.1.4 # via alembic -markupsafe==2.1.1 # via jinja2, mako +markupsafe==2.0.0 # via jinja2, mako matplotlib-inline==0.1.2 # via ipython mistune==0.8.4 # via nbconvert nbconvert==5.6.1 # via jupyter, nbgrader, notebook From 784dd48859eb9de864055ec724b9d13bd03856d3 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 13:12:12 -0400 Subject: [PATCH 24/47] update requirements --- src/formgradernext/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 0809916d..886ee8f1 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.3 +jinja2==3.0.2 # via # nbconvert # notebook From 5d3a3f4d829734f4f795dd87511e5008506365e3 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 29 Mar 2022 13:35:27 -0400 Subject: [PATCH 25/47] update test location in makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ded1ef62..fa62980b 100644 --- a/Makefile +++ b/Makefile @@ -60,11 +60,11 @@ push-all: ## push jupyterhub images to docker hub @docker push ${OWNER}/k8s-hub:${JUPYTERHUB_DOCKER_K8_TAG} test: dev ## run tests for all packages - ${VENV_BIN}/pytest -v src/async_nbgrader + ${VENV_BIN}/pytest -v src/async_nbgrader/async_nbgrader/tests ${VENV_BIN}/pytest -v src/formgradernext/tests - ${VENV_BIN}/pytest -v src/graderservice - ${VENV_BIN}/pytest -v src/illumidesk - ${VENV_BIN}/pytest -v src/illumideskdummyauthenticator + ${VENV_BIN}/pytest -v src/graderservice/tests + ${VENV_BIN}/pytest -v src/illumidesk/tests + ${VENV_BIN}/pytest -v src/illumideskdummyauthenticator/tests test-create-cov: ## create coverage report ${VENV_BIN}/pytest --cov=async_nbgrader src/async_nbgrader/async_nbgrader/tests From 8a4c151e37262be89e347bd800b72e7feae0dcb1 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Fri, 1 Apr 2022 19:59:53 -0400 Subject: [PATCH 26/47] removed asyncnbgrader test --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fa62980b..eeee63fa 100644 --- a/Makefile +++ b/Makefile @@ -60,11 +60,11 @@ push-all: ## push jupyterhub images to docker hub @docker push ${OWNER}/k8s-hub:${JUPYTERHUB_DOCKER_K8_TAG} test: dev ## run tests for all packages - ${VENV_BIN}/pytest -v src/async_nbgrader/async_nbgrader/tests + ${VENV_BIN}/pytest -v src/formgradernext/tests - ${VENV_BIN}/pytest -v src/graderservice/tests - ${VENV_BIN}/pytest -v src/illumidesk/tests - ${VENV_BIN}/pytest -v src/illumideskdummyauthenticator/tests + ${VENV_BIN}/pytest -v src/graderservice + ${VENV_BIN}/pytest -v src/illumidesk + ${VENV_BIN}/pytest -v src/illumideskdummyauthenticator test-create-cov: ## create coverage report ${VENV_BIN}/pytest --cov=async_nbgrader src/async_nbgrader/async_nbgrader/tests From 972352e4baba4d2eb63cd7eddaa58ced444b0736 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Sun, 3 Apr 2022 01:01:33 -0400 Subject: [PATCH 27/47] add async_test back --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index eeee63fa..ded1ef62 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ push-all: ## push jupyterhub images to docker hub @docker push ${OWNER}/k8s-hub:${JUPYTERHUB_DOCKER_K8_TAG} test: dev ## run tests for all packages - + ${VENV_BIN}/pytest -v src/async_nbgrader ${VENV_BIN}/pytest -v src/formgradernext/tests ${VENV_BIN}/pytest -v src/graderservice ${VENV_BIN}/pytest -v src/illumidesk From 98d951e28b9904b82d6805b7b9ca49b8ea8032d1 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 15:04:59 -0400 Subject: [PATCH 28/47] update markup safe --- src/formgradernext/requirements.txt | 2 +- src/graderservice/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 886ee8f1..2aa6cc2c 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.2 +jinja2==3.0.0 # via # nbconvert # notebook diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 132d91a3..728b41a4 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,11 +30,11 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.0.3 +jinja2==3.0.0 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) -markupsafe==2.1.1 +markupsafe==2.0.0 # via jinja2 oauthlib==3.1.0 # via requests-oauthlib From 29cb56243b3e69925bc4412094533cc3e0c6392b Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 15:07:43 -0400 Subject: [PATCH 29/47] update jinja2 version --- src/formgradernext/requirements.txt | 2 +- src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 2aa6cc2c..48dfd9ba 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.0 +jinja2<3.1.0 # via # nbconvert # notebook diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 728b41a4..b1d15cd7 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.0.0 +jinja2<3.1.0 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 54f3e45c..30d1c13c 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2<3.1.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole From fb09de66a4e24c88d832c7bdc00edc899f0b45ab Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 15:13:55 -0400 Subject: [PATCH 30/47] updated flask to version 2.1.0 --- src/graderservice/requirements.txt | 2 +- src/graderservice/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index b1d15cd7..63e30678 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -16,7 +16,7 @@ click==8.0.0 # via flask flask-sqlalchemy==2.5.1 # via graderservice (src/graderservice/setup.py) -flask==1.1.2 +flask==2.1.0 # via # flask-sqlalchemy # graderservice (src/graderservice/setup.py) diff --git a/src/graderservice/setup.py b/src/graderservice/setup.py index 61c30550..90a6d184 100644 --- a/src/graderservice/setup.py +++ b/src/graderservice/setup.py @@ -34,7 +34,7 @@ license="Apache 2.0", packages=find_packages(exclude="./tests"), install_requires=[ - "flask==1.1.2", + "flask==2.1.0", "flask-sqlalchemy==2.5.1", "gunicorn==20.0.4", "kubernetes==12.0.1", From 0405223565b730a7ee43c5a6cb18e7657783ba94 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 15:29:58 -0400 Subject: [PATCH 31/47] updated jinja2 --- src/formgradernext/requirements.txt | 2 +- src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 48dfd9ba..8a679175 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2<3.1.0 +jinja2==3.1.1 # via # nbconvert # notebook diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 63e30678..77c48285 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2<3.1.0 +jinja2==3.1.1 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 30d1c13c..22d1f2c7 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2<3.1.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2==3.1.1 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole From e2fb9a7485573213f1abe0d5c71298c4ac2351b8 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 15:46:13 -0400 Subject: [PATCH 32/47] update jinja2 for async_nbgrader --- src/async_nbgrader/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/async_nbgrader/requirements.txt b/src/async_nbgrader/requirements.txt index ecf975e2..a5b0332c 100644 --- a/src/async_nbgrader/requirements.txt +++ b/src/async_nbgrader/requirements.txt @@ -1 +1 @@ --e . \ No newline at end of file +jinja2>=2.10,<3.1.0 \ No newline at end of file From 92db213387a930a123979c2bef562ce1067049ab Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 15:53:29 -0400 Subject: [PATCH 33/47] updated jinja2 to semver 2.10>=jinja2<3.1.0 --- src/formgradernext/requirements.txt | 2 +- src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 8a679175..e9123ee6 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.1.1 +jinja2>=2.10,<3.1.0 # via # nbconvert # notebook diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 77c48285..dff6abe8 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.1.1 +jinja2>=2.10,<3.1.0 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 22d1f2c7..5255ab37 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.1.1 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2>=2.10,<3.1.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole From 56d5cbbe7b19b37908f41db3a5fc49d124740d90 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 16:00:42 -0400 Subject: [PATCH 34/47] updated nbconvert version --- src/async_nbgrader/requirements.txt | 2 +- src/formgradernext/requirements.txt | 2 +- src/graderservice/requirements.txt | 4 ++-- src/graderservice/setup.py | 2 +- src/illumidesk/requirements.txt | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/async_nbgrader/requirements.txt b/src/async_nbgrader/requirements.txt index a5b0332c..ecf975e2 100644 --- a/src/async_nbgrader/requirements.txt +++ b/src/async_nbgrader/requirements.txt @@ -1 +1 @@ -jinja2>=2.10,<3.1.0 \ No newline at end of file +-e . \ No newline at end of file diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index e9123ee6..92f8423c 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -98,7 +98,7 @@ matplotlib-inline==0.1.3 # ipython mistune==0.8.4 # via nbconvert -nbconvert==5.6.1 +nbconvert==6.5.0 # via # jupyter # nbgrader diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index dff6abe8..728b41a4 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -16,7 +16,7 @@ click==8.0.0 # via flask flask-sqlalchemy==2.5.1 # via graderservice (src/graderservice/setup.py) -flask==2.1.0 +flask==1.1.2 # via # flask-sqlalchemy # graderservice (src/graderservice/setup.py) @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2>=2.10,<3.1.0 +jinja2==3.0.0 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) diff --git a/src/graderservice/setup.py b/src/graderservice/setup.py index 90a6d184..61c30550 100644 --- a/src/graderservice/setup.py +++ b/src/graderservice/setup.py @@ -34,7 +34,7 @@ license="Apache 2.0", packages=find_packages(exclude="./tests"), install_requires=[ - "flask==2.1.0", + "flask==1.1.2", "flask-sqlalchemy==2.5.1", "gunicorn==20.0.4", "kubernetes==12.0.1", diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 5255ab37..b1513efc 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2>=2.10,<3.1.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2==3.0.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole @@ -46,7 +46,7 @@ mako==1.1.4 # via alembic markupsafe==2.0.0 # via jinja2, mako matplotlib-inline==0.1.2 # via ipython mistune==0.8.4 # via nbconvert -nbconvert==5.6.1 # via jupyter, nbgrader, notebook +nbconvert==6.5.0 # via jupyter, nbgrader, notebook nbformat==5.1.3 # via ipywidgets, nbconvert, nbgrader, notebook nbgrader==0.6.2 # via illumidesk (setup.py) notebook==6.4.1 # via jupyter, nbgrader, widgetsnbextension From 9e6533ab92290279ebe21660fd031673b5dc1ef1 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 16:05:30 -0400 Subject: [PATCH 35/47] jinja2 version downgrade to 3.1.0 --- src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 728b41a4..b1d15cd7 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.0.0 +jinja2<3.1.0 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index b1513efc..6e8fd0d4 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2<3.1.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole From 7ba436aea3433251d8fe4f4364b5d5b4f527be74 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 16:09:29 -0400 Subject: [PATCH 36/47] updated flask to 2.1.0 --- src/graderservice/requirements.txt | 2 +- src/graderservice/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index b1d15cd7..e9208166 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -16,7 +16,7 @@ click==8.0.0 # via flask flask-sqlalchemy==2.5.1 # via graderservice (src/graderservice/setup.py) -flask==1.1.2 +Flask==2.1.0 # via # flask-sqlalchemy # graderservice (src/graderservice/setup.py) diff --git a/src/graderservice/setup.py b/src/graderservice/setup.py index 61c30550..142396be 100644 --- a/src/graderservice/setup.py +++ b/src/graderservice/setup.py @@ -34,7 +34,7 @@ license="Apache 2.0", packages=find_packages(exclude="./tests"), install_requires=[ - "flask==1.1.2", + "Flask==2.1.0", "flask-sqlalchemy==2.5.1", "gunicorn==20.0.4", "kubernetes==12.0.1", From 13d4ad20e6ac1c9a189c278bc23c89ce09ef8cd5 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 16:14:34 -0400 Subject: [PATCH 37/47] revert nbconvert --- src/formgradernext/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 92f8423c..525b7597 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -98,7 +98,7 @@ matplotlib-inline==0.1.3 # ipython mistune==0.8.4 # via nbconvert -nbconvert==6.5.0 +nbconvert==5.6.0 # via # jupyter # nbgrader diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 6e8fd0d4..301a338c 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -46,7 +46,7 @@ mako==1.1.4 # via alembic markupsafe==2.0.0 # via jinja2, mako matplotlib-inline==0.1.2 # via ipython mistune==0.8.4 # via nbconvert -nbconvert==6.5.0 # via jupyter, nbgrader, notebook +nbconvert==5.6.0 # via jupyter, nbgrader, notebook nbformat==5.1.3 # via ipywidgets, nbconvert, nbgrader, notebook nbgrader==0.6.2 # via illumidesk (setup.py) notebook==6.4.1 # via jupyter, nbgrader, widgetsnbextension From c365961e9146a8893c63ff17468a84f04e83381c Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 16:20:30 -0400 Subject: [PATCH 38/47] update werkzeug --- src/graderservice/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index e9208166..9cdcdd5a 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -70,7 +70,7 @@ urllib3==1.26.5 # requests websocket-client==0.59.0 # via kubernetes -werkzeug==2.0.0 +werkzeug==2.1.1 # via flask secretsmanager-illumidesk==0.0.2 From a4691eac50d1ef5d5b792c02d469680b817d5804 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 16:25:15 -0400 Subject: [PATCH 39/47] update jinja2 to the latest version --- src/formgradernext/requirements.txt | 2 +- src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 525b7597..bb0aadde 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2>=2.10,<3.1.0 +jinja2==3.1.1 # via # nbconvert # notebook diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 9cdcdd5a..12b9f6ac 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2<3.1.0 +jinja2==3.1.1 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 301a338c..24dc3f45 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2<3.1.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2==3.1.1 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole From a533e5622648c426f289412938bb5ce3cb7e4118 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 16:30:33 -0400 Subject: [PATCH 40/47] jinja 3.1 --- src/formgradernext/requirements.txt | 2 +- src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index bb0aadde..a104c0ba 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.1.1 +jinja2<3.1 # via # nbconvert # notebook diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 12b9f6ac..4c060dc1 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.1.1 +jinja2<3.1 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 24dc3f45..ffb8ca71 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.1.1 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2<3.1 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole From 08463b349d9d22f2a86247c64da9c51b2df19b05 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 16:36:42 -0400 Subject: [PATCH 41/47] nbconvert version 6.4.3 --- src/formgradernext/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index a104c0ba..9ba94178 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -98,7 +98,7 @@ matplotlib-inline==0.1.3 # ipython mistune==0.8.4 # via nbconvert -nbconvert==5.6.0 +nbconvert==6.4.3 # via # jupyter # nbgrader diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index ffb8ca71..62010265 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -46,7 +46,7 @@ mako==1.1.4 # via alembic markupsafe==2.0.0 # via jinja2, mako matplotlib-inline==0.1.2 # via ipython mistune==0.8.4 # via nbconvert -nbconvert==5.6.0 # via jupyter, nbgrader, notebook +nbconvert==6.4.3 # via jupyter, nbgrader, notebook nbformat==5.1.3 # via ipywidgets, nbconvert, nbgrader, notebook nbgrader==0.6.2 # via illumidesk (setup.py) notebook==6.4.1 # via jupyter, nbgrader, widgetsnbextension From 9da1fb636782d42eb0593d48288ecce6c85d0ca4 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 16:44:19 -0400 Subject: [PATCH 42/47] reverted requirements txt --- src/formgradernext/requirements.txt | 8 ++++---- src/graderservice/requirements.txt | 9 ++++----- src/graderservice/setup.py | 2 +- src/illumidesk/requirements.txt | 8 ++++---- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 9ba94178..9f976d8d 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2<3.1 +jinja2==3.0.2 # via # nbconvert # notebook @@ -89,6 +89,7 @@ jupyterlab-widgets==1.0.2 # via ipywidgets mako==1.1.5 # via alembic +markupsafe==2.0.1 # via # jinja2 # mako @@ -98,7 +99,7 @@ matplotlib-inline==0.1.3 # ipython mistune==0.8.4 # via nbconvert -nbconvert==6.4.3 +nbconvert==5.6.1 # via # jupyter # nbgrader @@ -211,7 +212,6 @@ webencodings==0.5.1 # via bleach widgetsnbextension==3.5.2 # via ipywidgets -secretsmanager-illumidesk==0.0.2 # The following packages are considered to be unsafe in a requirements file: -# setuptools +# setuptools \ No newline at end of file diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 4c060dc1..b7ded396 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -16,7 +16,7 @@ click==8.0.0 # via flask flask-sqlalchemy==2.5.1 # via graderservice (src/graderservice/setup.py) -Flask==2.1.0 +flask==1.1.2 # via # flask-sqlalchemy # graderservice (src/graderservice/setup.py) @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2<3.1 +jinja2==3.0.0 # via flask kubernetes==12.0.1 # via graderservice (src/graderservice/setup.py) @@ -70,9 +70,8 @@ urllib3==1.26.5 # requests websocket-client==0.59.0 # via kubernetes -werkzeug==2.1.1 +werkzeug==2.0.0 # via flask -secretsmanager-illumidesk==0.0.2 # The following packages are considered to be unsafe in a requirements file: -# setuptools +# setuptools \ No newline at end of file diff --git a/src/graderservice/setup.py b/src/graderservice/setup.py index 142396be..61c30550 100644 --- a/src/graderservice/setup.py +++ b/src/graderservice/setup.py @@ -34,7 +34,7 @@ license="Apache 2.0", packages=find_packages(exclude="./tests"), install_requires=[ - "Flask==2.1.0", + "flask==1.1.2", "flask-sqlalchemy==2.5.1", "gunicorn==20.0.4", "kubernetes==12.0.1", diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 62010265..a062d837 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2<3.1 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2==3.0.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole @@ -37,7 +37,7 @@ jupyter-core==4.7.1 # via jupyter-client, nbconvert, nbformat, nbgrader, n jupyter-telemetry==0.1.0 # via jupyterhub jupyter==1.0.0 # via nbgrader jupyterhub-kubespawner==0.14.1 # via illumidesk (setup.py) -jupyterhub-ltiauthenticator==1.3.0 # via illumidesk (setup.py) +git+git://github.com/jupyterhub/ltiauthenticator.git@71d86a9da2562df4bdcc9f374af834a172ac52d5 # via illumidesk (setup.py) jupyterhub==1.4.1 # via jupyterhub-kubespawner, jupyterhub-ltiauthenticator, oauthenticator jupyterlab-widgets==1.0.0 # via ipywidgets jwcrypto==0.8 # via illumidesk (setup.py) @@ -46,7 +46,7 @@ mako==1.1.4 # via alembic markupsafe==2.0.0 # via jinja2, mako matplotlib-inline==0.1.2 # via ipython mistune==0.8.4 # via nbconvert -nbconvert==6.4.3 # via jupyter, nbgrader, notebook +nbconvert==5.6.1 # via jupyter, nbgrader, notebook nbformat==5.1.3 # via ipywidgets, nbconvert, nbgrader, notebook nbgrader==0.6.2 # via illumidesk (setup.py) notebook==6.4.1 # via jupyter, nbgrader, widgetsnbextension @@ -104,4 +104,4 @@ websocket-client==0.59.0 # via kubernetes widgetsnbextension==3.5.1 # via ipywidgets # The following packages are considered to be unsafe in a requirements file: -# setuptools +# setuptools \ No newline at end of file From 7c53d069cdcceb3ca466f31dc1b5f17994aa4c21 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 16:57:29 -0400 Subject: [PATCH 43/47] updates ltiauthenticator to use pypi version --- src/illumidesk/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index a062d837..d51a232c 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -37,7 +37,7 @@ jupyter-core==4.7.1 # via jupyter-client, nbconvert, nbformat, nbgrader, n jupyter-telemetry==0.1.0 # via jupyterhub jupyter==1.0.0 # via nbgrader jupyterhub-kubespawner==0.14.1 # via illumidesk (setup.py) -git+git://github.com/jupyterhub/ltiauthenticator.git@71d86a9da2562df4bdcc9f374af834a172ac52d5 # via illumidesk (setup.py) +jupyterhub-ltiauthenticator==1.3.0 # via illumidesk (setup.py) jupyterhub==1.4.1 # via jupyterhub-kubespawner, jupyterhub-ltiauthenticator, oauthenticator jupyterlab-widgets==1.0.0 # via ipywidgets jwcrypto==0.8 # via illumidesk (setup.py) From 83856ec8cafdda7ea9c5f07e9d778e31e0bbc59e Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 17:00:59 -0400 Subject: [PATCH 44/47] matched kubernetes version --- src/graderservice/requirements.txt | 2 +- src/graderservice/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index b7ded396..497e720a 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -32,7 +32,7 @@ itsdangerous==2.0.0 # via flask jinja2==3.0.0 # via flask -kubernetes==12.0.1 +kubernetes==17.17.0 # via graderservice (src/graderservice/setup.py) markupsafe==2.0.0 # via jinja2 diff --git a/src/graderservice/setup.py b/src/graderservice/setup.py index 61c30550..174156cf 100644 --- a/src/graderservice/setup.py +++ b/src/graderservice/setup.py @@ -37,7 +37,7 @@ "flask==1.1.2", "flask-sqlalchemy==2.5.1", "gunicorn==20.0.4", - "kubernetes==12.0.1", + "kubernetes==17.17.0", ], # noqa: E231 package_data={ "": ["*.html"], From b336d3f91084b805ed9bbd3070f6ac0e59859c25 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Tue, 12 Apr 2022 19:28:35 -0400 Subject: [PATCH 45/47] update requirements.txt --- src/async_nbgrader/dev-requirements.txt | 1 + src/formgradernext/requirements.txt | 2 +- src/graderservice/requirements.txt | 4 ++-- src/illumidesk/requirements.txt | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/async_nbgrader/dev-requirements.txt b/src/async_nbgrader/dev-requirements.txt index 220e1565..b7d8c8f1 100644 --- a/src/async_nbgrader/dev-requirements.txt +++ b/src/async_nbgrader/dev-requirements.txt @@ -16,3 +16,4 @@ sphinx-autodoc-typehints nbval requests-mock wheel + diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index 9f976d8d..c4800b53 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.2 +jinja2==3.0.3 # via # nbconvert # notebook diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 497e720a..8991050e 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.0.0 +jinja2==3.0.3 # via flask kubernetes==17.17.0 # via graderservice (src/graderservice/setup.py) @@ -70,7 +70,7 @@ urllib3==1.26.5 # requests websocket-client==0.59.0 # via kubernetes -werkzeug==2.0.0 +werkzeug==2.0.2 # via flask # The following packages are considered to be unsafe in a requirements file: diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index d51a232c..130ef88f 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2==3.0.3 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole From 819dbb763e1eca1cf515b5ecab94bc17e710d350 Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Thu, 14 Apr 2022 16:50:45 -0400 Subject: [PATCH 46/47] updated graderservice.py --- src/graderservice/graderservice/graderservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/graderservice/graderservice/graderservice.py b/src/graderservice/graderservice/graderservice.py index 620d90d1..9b9624aa 100644 --- a/src/graderservice/graderservice/graderservice.py +++ b/src/graderservice/graderservice/graderservice.py @@ -367,7 +367,7 @@ def restart_deployment(self, deployment, namespace): now = str(now.isoformat("T") + "Z") body = { 'spec': { - 'template':{ + 'template': { 'metadata': { 'annotations': { 'kubectl.kubernetes.io/restartedAt': now From 6390775df70f780732f675f2ffd9d089917dda7d Mon Sep 17 00:00:00 2001 From: Abhilash Nair Date: Fri, 15 Apr 2022 17:46:01 -0400 Subject: [PATCH 47/47] update jinja2 version to 3.1.0 --- src/formgradernext/requirements.txt | 2 +- src/graderservice/requirements.txt | 2 +- src/illumidesk/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/formgradernext/requirements.txt b/src/formgradernext/requirements.txt index c4800b53..55a256d4 100644 --- a/src/formgradernext/requirements.txt +++ b/src/formgradernext/requirements.txt @@ -58,7 +58,7 @@ ipywidgets==7.6.5 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.3 +jinja2==3.1.0 # via # nbconvert # notebook diff --git a/src/graderservice/requirements.txt b/src/graderservice/requirements.txt index 8991050e..05bf396b 100644 --- a/src/graderservice/requirements.txt +++ b/src/graderservice/requirements.txt @@ -30,7 +30,7 @@ idna==2.10 # via requests itsdangerous==2.0.0 # via flask -jinja2==3.0.3 +jinja2==3.1.0 # via flask kubernetes==17.17.0 # via graderservice (src/graderservice/setup.py) diff --git a/src/illumidesk/requirements.txt b/src/illumidesk/requirements.txt index 130ef88f..7896147c 100644 --- a/src/illumidesk/requirements.txt +++ b/src/illumidesk/requirements.txt @@ -28,7 +28,7 @@ ipython-genutils==0.2.0 # via nbformat, notebook, qtconsole, traitlets ipython==7.23.1 # via ipykernel, ipywidgets, jupyter-console ipywidgets==7.6.3 # via jupyter jedi==0.18.0 # via ipython -jinja2==3.0.3 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook +jinja2==3.1.0 # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook josepy==1.4.0 # via illumidesk (setup.py) jsonschema==3.2.0 # via jupyter-telemetry, nbformat, nbgrader jupyter-client==6.1.12 # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole