From 2d46f12277b61143af31efd04f2a6af9132dee5b Mon Sep 17 00:00:00 2001 From: Kyle McCormick <kmccormick@edx.org> Date: Fri, 6 Nov 2020 08:00:57 -0500 Subject: [PATCH] Upgrade codejail from 3.1.0 to 3.1.1 for improved logging (#25532) We are curious whether async jail_code calls on Celery workers have different resource limit configurations than synchronous calls on LMS/Studio. We suspect it may be different because codejail is configured via a Django Middleware, which may not be initialized for Celery workers. TNL-7649 --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/github.in | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index b53469428be..27bd372761e 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -6,7 +6,7 @@ # -e git+https://github.com/edx/acid-block.git@758855a67d2f12bd74db4d5e7a0862d6e65f079c#egg=acid-xblock # via -r requirements/edx/github.in -e common/lib/capa # via -r requirements/edx/local.in --e git+https://github.com/edx/codejail.git@3.1.0#egg=codejail==3.1.0 # via -r requirements/edx/github.in +-e git+https://github.com/edx/codejail.git@3.1.1#egg=codejail==3.1.1 # via -r requirements/edx/github.in -e git+https://github.com/edx/django-wiki.git@0.1.1#egg=django-wiki # via -r requirements/edx/github.in -e git+https://github.com/edx/DoneXBlock.git@2.0.3#egg=done-xblock # via -r requirements/edx/github.in -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme # via -r requirements/edx/github.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index f972cd415a5..4b40188ba3e 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -6,7 +6,7 @@ # -e git+https://github.com/edx/acid-block.git@758855a67d2f12bd74db4d5e7a0862d6e65f079c#egg=acid-xblock # via -r requirements/edx/testing.txt -e common/lib/capa # via -r requirements/edx/testing.txt --e git+https://github.com/edx/codejail.git@3.1.0#egg=codejail==3.1.0 # via -r requirements/edx/testing.txt +-e git+https://github.com/edx/codejail.git@3.1.1#egg=codejail==3.1.1 # via -r requirements/edx/testing.txt -e git+https://github.com/edx/django-wiki.git@0.1.1#egg=django-wiki # via -r requirements/edx/testing.txt -e git+https://github.com/edx/DoneXBlock.git@2.0.3#egg=done-xblock # via -r requirements/edx/testing.txt -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme # via -r requirements/edx/testing.txt diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 4c89f5710dd..edb715f830e 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -63,7 +63,7 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752 git+https://github.com/edx/django-ratelimit-backend.git@v2.0.1a5#egg=django-ratelimit-backend==2.0.1a5 # Our libraries: --e git+https://github.com/edx/codejail.git@3.1.0#egg=codejail==3.1.0 +-e git+https://github.com/edx/codejail.git@3.1.1#egg=codejail==3.1.1 -e git+https://github.com/edx/acid-block.git@758855a67d2f12bd74db4d5e7a0862d6e65f079c#egg=acid-xblock -e git+https://github.com/edx/RateXBlock.git@2.0.1#egg=rate-xblock -e git+https://github.com/edx/DoneXBlock.git@2.0.3#egg=done-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 10f1f87b8b4..5cc2d531091 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -6,7 +6,7 @@ # -e git+https://github.com/edx/acid-block.git@758855a67d2f12bd74db4d5e7a0862d6e65f079c#egg=acid-xblock # via -r requirements/edx/base.txt -e common/lib/capa # via -r requirements/edx/base.txt --e git+https://github.com/edx/codejail.git@3.1.0#egg=codejail==3.1.0 # via -r requirements/edx/base.txt +-e git+https://github.com/edx/codejail.git@3.1.1#egg=codejail==3.1.1 # via -r requirements/edx/base.txt -e git+https://github.com/edx/django-wiki.git@0.1.1#egg=django-wiki # via -r requirements/edx/base.txt -e git+https://github.com/edx/DoneXBlock.git@2.0.3#egg=done-xblock # via -r requirements/edx/base.txt -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme # via -r requirements/edx/base.txt -- GitLab