From 2741beda51bf35d258b54cf942511a1501b61bf8 Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan <60315450+aht007@users.noreply.github.com> Date: Thu, 2 Feb 2023 12:26:57 +0500 Subject: [PATCH] fix: install codejail from pypi (#31683) --- requirements/edx/base.in | 1 + requirements/edx/base.txt | 6 +++--- requirements/edx/development.txt | 6 +++--- requirements/edx/github.in | 1 - requirements/edx/pip.txt | 1 - requirements/edx/testing.txt | 6 +++--- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index d621712585..ebfee474f1 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -80,6 +80,7 @@ edx-celeryutils edx-completion edx-django-release-util # Release utils for the edx release pipeline edx-django-sites-extensions +edx-codejail # Need IP address code that was moved to edx-django-utils 5.1.0 edx-django-utils>=5.1.0 # Utilities for cache, monitoring, and plugins edx-drf-extensions diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 8696880dcb..1b6b6aad6a 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -6,8 +6,6 @@ # -e git+https://github.com/openedx/blockstore.git@1.2.4#egg=blockstore==1.2.4 # via -r requirements/edx/github.in --e git+https://github.com/openedx/codejail.git@3.1.3#egg=codejail==3.1.3 - # via -r requirements/edx/github.in -e git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner # via -r requirements/edx/github.in acid-xblock==0.2.1 @@ -439,6 +437,8 @@ edx-celeryutils==1.2.2 # -r requirements/edx/base.in # edx-name-affirmation # super-csv +edx-codejail==3.3.2 + # via -r requirements/edx/base.in edx-completion==4.2.0 # via -r requirements/edx/base.in edx-django-release-util==1.2.0 @@ -1024,12 +1024,12 @@ six==1.16.0 # bleach # chem # click-repl - # codejail # codejail-includes # crowdsourcehinter-xblock # edx-ace # edx-auth-backends # edx-ccx-keys + # edx-codejail # edx-django-release-util # edx-drf-extensions # edx-milestones diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5218e0b273..3d452ef460 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -6,8 +6,6 @@ # -e git+https://github.com/openedx/blockstore.git@1.2.4#egg=blockstore==1.2.4 # via -r requirements/edx/testing.txt --e git+https://github.com/openedx/codejail.git@3.1.3#egg=codejail==3.1.3 - # via -r requirements/edx/testing.txt -e git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner # via -r requirements/edx/testing.txt acid-xblock==0.2.1 @@ -562,6 +560,8 @@ edx-celeryutils==1.2.2 # -r requirements/edx/testing.txt # edx-name-affirmation # super-csv +edx-codejail==3.3.2 + # via -r requirements/edx/testing.txt edx-completion==4.2.0 # via -r requirements/edx/testing.txt edx-django-release-util==1.2.0 @@ -1423,12 +1423,12 @@ six==1.16.0 # bok-choy # chem # click-repl - # codejail # codejail-includes # crowdsourcehinter-xblock # edx-ace # edx-auth-backends # edx-ccx-keys + # edx-codejail # edx-django-release-util # edx-drf-extensions # edx-lint diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 382fbc2cee..2efe96a01d 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -63,7 +63,6 @@ git+https://github.com/openedx/django-require.git@0c54adb167142383b26ea6b3edecc3 # Our libraries: -e git+https://github.com/openedx/blockstore.git@1.2.4#egg=blockstore==1.2.4 # Note: Blockstore 1.2.2 & 1.2.3 are failing. --e git+https://github.com/openedx/codejail.git@3.1.3#egg=codejail==3.1.3 # Third Party XBlocks diff --git a/requirements/edx/pip.txt b/requirements/edx/pip.txt index d3d8f5af35..e70e76f1ba 100644 --- a/requirements/edx/pip.txt +++ b/requirements/edx/pip.txt @@ -6,7 +6,6 @@ # wheel==0.38.4 # via -r requirements/edx/pip.in - # The following packages are considered to be unsafe in a requirements file: pip==23.0 # via -r requirements/edx/pip.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 2646c73803..e56d12a089 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -6,8 +6,6 @@ # -e git+https://github.com/openedx/blockstore.git@1.2.4#egg=blockstore==1.2.4 # via -r requirements/edx/base.txt --e git+https://github.com/openedx/codejail.git@3.1.3#egg=codejail==3.1.3 - # via -r requirements/edx/base.txt -e git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner # via -r requirements/edx/base.txt acid-xblock==0.2.1 @@ -540,6 +538,8 @@ edx-celeryutils==1.2.2 # -r requirements/edx/base.txt # edx-name-affirmation # super-csv +edx-codejail==3.3.2 + # via -r requirements/edx/base.txt edx-completion==4.2.0 # via -r requirements/edx/base.txt edx-django-release-util==1.2.0 @@ -1347,12 +1347,12 @@ six==1.16.0 # bok-choy # chem # click-repl - # codejail # codejail-includes # crowdsourcehinter-xblock # edx-ace # edx-auth-backends # edx-ccx-keys + # edx-codejail # edx-django-release-util # edx-drf-extensions # edx-lint