Optimize and reorganize GitHub-hosted dependencies

requirements/edx-sandbox/py38.txt

@@ -18,7 +18,7 @@ cryptography==38.0.1
     # via -r requirements/edx-sandbox/py38.in
 cycler==0.11.0
     # via matplotlib
-joblib==1.1.0
+joblib==1.2.0
     # via nltk
 kiwisolver==1.4.4
     # via matplotlib

requirements/edx/base.txt

@@ -6,18 +6,8 @@
 #
 -e git+https://github.com/openedx/[email protected]#egg=blockstore==1.2.1
     # via -r requirements/edx/github.in
--e git+https://github.com/openedx/[email protected]#egg=codejail==3.1.3
-    # via -r requirements/edx/github.in
--e git+https://github.com/openedx/[email protected]#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 .
     # via -r requirements/edx/local.in
--e git+https://github.com/openedx/[email protected]#egg=rate-xblock
-    # 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.1
@@ -96,7 +86,7 @@ celery==5.2.7
     #   edx-celeryutils
     #   edx-enterprise
     #   event-tracking
-certifi==2022.6.15.1
+certifi==2022.9.14
     # via
     #   -r requirements/edx/paver.txt
     #   elasticsearch
@@ -140,6 +130,8 @@ code-annotations==1.3.0
     # via
     #   edx-enterprise
     #   edx-toggles
+codejail @ git+https://github.com/openedx/[email protected]
+    # via -r requirements/edx/github.in
 codejail-includes==1.0.0
     # via -r requirements/edx/base.in
 contextlib2==21.6.0
@@ -342,7 +334,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
@@ -385,6 +377,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/[email protected]
+    # via -r requirements/edx/github.in
 djangorestframework==3.12.4
     # via
     #   -r requirements/edx/base.in
@@ -609,7 +603,7 @@ html5lib==1.1
     #   ora2
 icalendar==4.1.0
     # via -r requirements/edx/base.in
-idna==3.3
+idna==3.4
     # via
     #   -r requirements/edx/paver.txt
     #   optimizely-sdk
@@ -638,7 +632,7 @@ jmespath==0.10.0
     # via
     #   boto3
     #   botocore
-joblib==1.1.0
+joblib==1.2.0
     # via nltk
 jsondiff==2.0.0
     # via edx-enterprise
@@ -655,13 +649,13 @@ jsonfield==3.1.0
     #   outcome-surveys
 jsonschema==4.16.0
     # via optimizely-sdk
-jwcrypto==1.3.1
+jwcrypto==1.4.2
     # via pylti1p3
 kombu==5.2.4
     # via celery
 laboratory==1.0.2
     # via -r requirements/edx/base.in
-lazy==1.4
+lazy==1.5
     # via
     #   -r requirements/edx/paver.txt
     #   acid-xblock
@@ -761,6 +755,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.12.0
@@ -846,7 +842,7 @@ pyjwkest==1.4.2
     #   -r requirements/edx/base.in
     #   edx-drf-extensions
     #   lti-consumer-xblock
-pyjwt[crypto]==2.4.0
+pyjwt[crypto]==2.5.0
     # via
     #   -r requirements/edx/base.in
     #   drf-jwt
@@ -859,7 +855,7 @@ pyjwt[crypto]==2.4.0
     #   social-auth-core
 pylatexenc==2.10
     # via olxcleaner
-pylti1p3==1.12.0
+pylti1p3==1.12.1
     # via -r requirements/edx/base.in
 pymongo==3.12.3
     # via
@@ -954,6 +950,8 @@ pyyaml==6.0
     #   xblock
 random2==1.0.1
     # via -r requirements/edx/base.in
+rate-xblock @ git+https://github.com/openedx/[email protected]
+    # via -r requirements/edx/github.in
 recommender-xblock==2.0.1
     # via -r requirements/edx/base.in
 redis==4.3.4
@@ -1103,6 +1101,8 @@ tinycss2==1.1.1
     # via bleach
 tqdm==4.64.1
     # via nltk
+types-cryptography==3.3.23
+    # via pyjwt
 typing-extensions==4.3.0
     # via
     #   django-countries
@@ -1177,6 +1177,8 @@ xblock==1.6.1
     #   xblock-utils
 xblock-drag-and-drop-v2 @ git+https://github.com/openedx/[email protected]
     # 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/[email protected]
     # via -r requirements/edx/github.in
 xblock-utils==3.0.0

requirements/edx/development.txt

@@ -6,18 +6,8 @@
 #
 -e git+https://github.com/openedx/[email protected]#egg=blockstore==1.2.1
     # via -r requirements/edx/testing.txt
--e git+https://github.com/openedx/[email protected]#egg=codejail==3.1.3
-    # via -r requirements/edx/testing.txt
--e git+https://github.com/openedx/[email protected]#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 .
     # via -r requirements/edx/testing.txt
--e git+https://github.com/openedx/[email protected]#egg=rate-xblock
-    # 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.1
@@ -135,7 +125,7 @@ celery==5.2.7
     #   edx-celeryutils
     #   edx-enterprise
     #   event-tracking
-certifi==2022.6.15.1
+certifi==2022.9.14
     # via
     #   -r requirements/edx/testing.txt
     #   elasticsearch
@@ -203,6 +193,8 @@ code-annotations==1.3.0
     #   edx-enterprise
     #   edx-lint
     #   edx-toggles
+codejail @ git+https://github.com/openedx/[email protected]
+    # via -r requirements/edx/testing.txt
 codejail-includes==1.0.0
     # via -r requirements/edx/testing.txt
 contextlib2==21.6.0
@@ -445,7 +437,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
@@ -488,6 +480,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/[email protected]
+    # via -r requirements/edx/testing.txt
 djangorestframework==3.12.4
     # via
     #   -r requirements/edx/testing.txt
@@ -609,7 +603,7 @@ edx-i18n-tools==0.9.1
     # via
     #   -r requirements/edx/testing.txt
     #   ora2
-edx-lint==5.2.5
+edx-lint==5.3.0
     # via -r requirements/edx/testing.txt
 edx-milestones==0.4.0
     # via -r requirements/edx/testing.txt
@@ -709,7 +703,7 @@ faker==14.2.0
     # via
     #   -r requirements/edx/testing.txt
     #   factory-boy
-fastapi==0.83.0
+fastapi==0.85.0
     # via
     #   -r requirements/edx/testing.txt
     #   pact-python
@@ -765,7 +759,7 @@ httpretty==1.1.4
     # via -r requirements/edx/testing.txt
 icalendar==4.1.0
     # via -r requirements/edx/testing.txt
-idna==3.3
+idna==3.4
     # via
     #   -r requirements/edx/testing.txt
     #   anyio
@@ -823,7 +817,7 @@ jmespath==0.10.0
     #   -r requirements/edx/testing.txt
     #   boto3
     #   botocore
-joblib==1.1.0
+joblib==1.2.0
     # via
     #   -r requirements/edx/testing.txt
     #   nltk
@@ -847,7 +841,7 @@ jsonschema==4.16.0
     #   -r requirements/edx/testing.txt
     #   optimizely-sdk
     #   sphinxcontrib-openapi
-jwcrypto==1.3.1
+jwcrypto==1.4.2
     # via
     #   -r requirements/edx/testing.txt
     #   pylti1p3
@@ -857,7 +851,7 @@ kombu==5.2.4
     #   celery
 laboratory==1.0.2
     # via -r requirements/edx/testing.txt
-lazy==1.4
+lazy==1.5
     # via
     #   -r requirements/edx/testing.txt
     #   acid-xblock
@@ -988,6 +982,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.12.0
@@ -1130,7 +1126,7 @@ pyjwkest==1.4.2
     #   -r requirements/edx/testing.txt
     #   edx-drf-extensions
     #   lti-consumer-xblock
-pyjwt[crypto]==2.4.0
+pyjwt[crypto]==2.5.0
     # via
     #   -r requirements/edx/testing.txt
     #   drf-jwt
@@ -1169,7 +1165,7 @@ pylint-plugin-utils==0.7
     #   pylint-django
 pylint-pytest==0.3.0
     # via -r requirements/edx/testing.txt
-pylti1p3==1.12.0
+pylti1p3==1.12.1
     # via -r requirements/edx/testing.txt
 pymongo==3.12.3
     # via
@@ -1312,6 +1308,8 @@ pyyaml==6.0
     #   xblock
 random2==1.0.1
     # via -r requirements/edx/testing.txt
+rate-xblock @ git+https://github.com/openedx/[email protected]
+    # via -r requirements/edx/testing.txt
 recommender-xblock==2.0.1
     # via -r requirements/edx/testing.txt
 redis==4.3.4
@@ -1496,7 +1494,7 @@ sqlparse==0.4.2
     #   django-debug-toolbar
 staff-graded-xblock==2.0.1
     # via -r requirements/edx/testing.txt
-starlette==0.19.1
+starlette==0.20.4
     # via
     #   -r requirements/edx/testing.txt
     #   fastapi
@@ -1555,6 +1553,10 @@ tqdm==4.64.1
     # via
     #   -r requirements/edx/testing.txt
     #   nltk
+types-cryptography==3.3.23
+    # via
+    #   -r requirements/edx/testing.txt
+    #   pyjwt
 typing-extensions==4.3.0
     # via
     #   -r requirements/edx/testing.txt
@@ -1606,7 +1608,7 @@ voluptuous==0.13.1
     # via
     #   -r requirements/edx/testing.txt
     #   ora2
-vulture==2.5
+vulture==2.6
     # via -r requirements/edx/development.in
 watchdog==2.1.9
     # via -r requirements/edx/testing.txt
@@ -1661,6 +1663,8 @@ xblock==1.6.1
     #   xblock-utils
 xblock-drag-and-drop-v2 @ git+https://github.com/openedx/[email protected]
     # 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/[email protected]
     # via -r requirements/edx/testing.txt
 xblock-utils==3.0.0

requirements/edx/doc.txt

@@ -8,7 +8,7 @@ alabaster==0.7.12
     # via sphinx
 babel==2.10.3
     # via sphinx
-certifi==2022.6.15.1
+certifi==2022.9.14
     # via requests
 charset-normalizer==2.0.12
     # via
@@ -30,7 +30,7 @@ gitdb==4.0.9
     # via gitpython
 gitpython==3.1.27
     # via -r requirements/edx/doc.in
-idna==3.3
+idna==3.4
     # via requests
 imagesize==1.4.1
     # via sphinx