diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 97e0e4e203..be7180e37c 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -3,6 +3,11 @@ # See BOM-2721 for more details. # Below is the copied and edited version of common_constraints +# This is a temporary solution to override the real common_constraints.txt +# In edx-lint, until the pyjwt constraint in edx-lint has been removed. +# See BOM-2721 for more details. +# Below is the copied and edited version of common_constraints + # A central location for most common version constraints # (across edx repos) for pip-installation. # diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1c5a6d80b5..f2fe64eb6a 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -4,16 +4,6 @@ # # make upgrade # --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/django-wiki.git@1.1.1#egg=django-wiki - # via -r requirements/edx/github.in --e git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner - # via -r requirements/edx/github.in --e git+https://github.com/openedx/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive - # via -r requirements/edx/github.in acid-xblock==0.2.1 # via -r requirements/edx/base.in aiohttp==3.8.3 @@ -67,6 +57,8 @@ bleach[css]==5.0.1 # ora2 # xblock-drag-and-drop-v2 # xblock-poll +blockstore @ git+https://github.com/openedx/blockstore.git@1.2.5 + # via -r requirements/edx/github.in boto==2.39.0 # via # -r requirements/edx/base.in @@ -137,6 +129,8 @@ code-annotations==1.3.0 # via # edx-enterprise # edx-toggles +codejail @ git+https://github.com/openedx/codejail.git@3.1.3 + # via -r requirements/edx/github.in codejail-includes==1.0.0 # via -r requirements/edx/base.in contextlib2==21.6.0 @@ -339,7 +333,7 @@ django-pyfs==3.2.0 # via -r requirements/edx/base.in django-ratelimit==3.0.1 # via -r requirements/edx/base.in -django-require @ git+https://github.com/openedx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776 +django-require @ git+https://github.com/openedx/django-require.git@f4f01e4e959adc6210873ae99e7f2c3741afbf35 # via -r requirements/edx/github.in django-sekizai==4.0.0 # via @@ -382,6 +376,8 @@ django-webpack-loader==0.7.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # edx-proctoring +django-wiki @ git+https://github.com/openedx/django-wiki.git@1.1.1 + # via -r requirements/edx/github.in djangorestframework==3.12.4 # via # -r requirements/edx/base.in @@ -444,6 +440,8 @@ edx-celeryutils==1.2.1 # -r requirements/edx/base.in # edx-name-affirmation # super-csv +edx-codejail @ git+https://github.com/openedx/codejail.git@3.3.0 + # via -r requirements/edx/github.in edx-completion==4.2.0 # via -r requirements/edx/base.in edx-django-release-util==1.2.0 @@ -758,6 +756,8 @@ oauthlib==3.0.1 # lti-consumer-xblock # requests-oauthlib # social-auth-core +olxcleaner @ git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297 + # via -r requirements/edx/github.in openedx-calc==3.0.1 # via -r requirements/edx/base.in openedx-events==0.13.0 @@ -1032,6 +1032,7 @@ six==1.16.0 # edx-ace # edx-auth-backends # edx-ccx-keys + # edx-codejail # edx-django-release-util # edx-drf-extensions # edx-milestones @@ -1182,6 +1183,8 @@ xblock==1.6.1 # xblock-utils xblock-drag-and-drop-v2 @ git+https://github.com/openedx/xblock-drag-and-drop-v2@v2.3.5 # via -r requirements/edx/github.in +xblock-google-drive @ git+https://github.com/openedx/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6 + # via -r requirements/edx/github.in xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0 # via -r requirements/edx/github.in xblock-utils==3.0.0 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 7686b362c3..10932ad458 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -4,16 +4,6 @@ # # make upgrade # --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/django-wiki.git@1.1.1#egg=django-wiki - # via -r requirements/edx/testing.txt --e git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner - # via -r requirements/edx/testing.txt --e git+https://github.com/openedx/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive - # via -r requirements/edx/testing.txt acid-xblock==0.2.1 # via -r requirements/edx/testing.txt aiohttp==3.8.3 @@ -100,6 +90,8 @@ bleach[css]==5.0.1 # ora2 # xblock-drag-and-drop-v2 # xblock-poll +blockstore @ git+https://github.com/openedx/blockstore.git@1.2.5 + # via -r requirements/edx/testing.txt bok-choy==1.1.1 # via -r requirements/edx/testing.txt boto==2.39.0 @@ -200,6 +192,8 @@ code-annotations==1.3.0 # edx-enterprise # edx-lint # edx-toggles +codejail @ git+https://github.com/openedx/codejail.git@3.1.3 + # via -r requirements/edx/testing.txt codejail-includes==1.0.0 # via -r requirements/edx/testing.txt contextlib2==21.6.0 @@ -442,7 +436,7 @@ django-pyfs==3.2.0 # via -r requirements/edx/testing.txt django-ratelimit==3.0.1 # via -r requirements/edx/testing.txt -django-require @ git+https://github.com/openedx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776 +django-require @ git+https://github.com/openedx/django-require.git@f4f01e4e959adc6210873ae99e7f2c3741afbf35 # via -r requirements/edx/testing.txt django-sekizai==4.0.0 # via @@ -485,6 +479,8 @@ django-webpack-loader==0.7.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # edx-proctoring +django-wiki @ git+https://github.com/openedx/django-wiki.git@1.1.1 + # via -r requirements/edx/testing.txt djangorestframework==3.12.4 # via # -r requirements/edx/testing.txt @@ -560,6 +556,8 @@ edx-celeryutils==1.2.1 # -r requirements/edx/testing.txt # edx-name-affirmation # super-csv +edx-codejail @ git+https://github.com/openedx/codejail.git@3.3.0 + # via -r requirements/edx/testing.txt edx-completion==4.2.0 # via -r requirements/edx/testing.txt edx-django-release-util==1.2.0 @@ -989,6 +987,8 @@ oauthlib==3.0.1 # lti-consumer-xblock # requests-oauthlib # social-auth-core +olxcleaner @ git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297 + # via -r requirements/edx/testing.txt openedx-calc==3.0.1 # via -r requirements/edx/testing.txt openedx-events==0.13.0 @@ -1417,6 +1417,7 @@ six==1.16.0 # edx-ace # edx-auth-backends # edx-ccx-keys + # edx-codejail # edx-django-release-util # edx-drf-extensions # edx-lint @@ -1674,6 +1675,8 @@ xblock==1.6.1 # xblock-utils xblock-drag-and-drop-v2 @ git+https://github.com/openedx/xblock-drag-and-drop-v2@v2.3.5 # via -r requirements/edx/testing.txt +xblock-google-drive @ git+https://github.com/openedx/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6 + # via -r requirements/edx/testing.txt xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0 # via -r requirements/edx/testing.txt xblock-utils==3.0.0 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 7021d14c85..9721a6363c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -4,16 +4,6 @@ # # make upgrade # --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/django-wiki.git@1.1.1#egg=django-wiki - # via -r requirements/edx/base.txt --e git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner - # via -r requirements/edx/base.txt --e git+https://github.com/openedx/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive - # via -r requirements/edx/base.txt acid-xblock==0.2.1 # via -r requirements/edx/base.txt aiohttp==3.8.3 @@ -95,6 +85,8 @@ bleach[css]==5.0.1 # ora2 # xblock-drag-and-drop-v2 # xblock-poll +blockstore @ git+https://github.com/openedx/blockstore.git@1.2.5 + # via -r requirements/edx/base.txt bok-choy==1.1.1 # via -r requirements/edx/testing.in boto==2.39.0 @@ -188,6 +180,8 @@ code-annotations==1.3.0 # edx-enterprise # edx-lint # edx-toggles +codejail @ git+https://github.com/openedx/codejail.git@3.1.3 + # via -r requirements/edx/base.txt codejail-includes==1.0.0 # via -r requirements/edx/base.txt contextlib2==21.6.0 @@ -423,7 +417,7 @@ django-pyfs==3.2.0 # via -r requirements/edx/base.txt django-ratelimit==3.0.1 # via -r requirements/edx/base.txt -django-require @ git+https://github.com/openedx/django-require.git@0c54adb167142383b26ea6b3edecc3211822a776 +django-require @ git+https://github.com/openedx/django-require.git@f4f01e4e959adc6210873ae99e7f2c3741afbf35 # via -r requirements/edx/base.txt django-sekizai==4.0.0 # via @@ -466,6 +460,8 @@ django-webpack-loader==0.7.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-proctoring +django-wiki @ git+https://github.com/openedx/django-wiki.git@1.1.1 + # via -r requirements/edx/base.txt djangorestframework==3.12.4 # via # -r requirements/edx/base.txt @@ -539,6 +535,8 @@ edx-celeryutils==1.2.1 # -r requirements/edx/base.txt # edx-name-affirmation # super-csv +edx-codejail @ git+https://github.com/openedx/codejail.git@3.3.0 + # via -r requirements/edx/base.txt edx-completion==4.2.0 # via -r requirements/edx/base.txt edx-django-release-util==1.2.0 @@ -940,6 +938,8 @@ oauthlib==3.0.1 # lti-consumer-xblock # requests-oauthlib # social-auth-core +olxcleaner @ git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297 + # via -r requirements/edx/base.txt openedx-calc==3.0.1 # via -r requirements/edx/base.txt openedx-events==0.13.0 @@ -1343,6 +1343,7 @@ six==1.16.0 # edx-ace # edx-auth-backends # edx-ccx-keys + # edx-codejail # edx-django-release-util # edx-drf-extensions # edx-lint @@ -1553,6 +1554,8 @@ xblock==1.6.1 # xblock-utils xblock-drag-and-drop-v2 @ git+https://github.com/openedx/xblock-drag-and-drop-v2@v2.3.5 # via -r requirements/edx/base.txt +xblock-google-drive @ git+https://github.com/openedx/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6 + # via -r requirements/edx/base.txt xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0 # via -r requirements/edx/base.txt xblock-utils==3.0.0