diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 5ce0de2aaf7..62a42ad9482 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -6,6 +6,22 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/github.in +-e git+https://github.com/kdmccormick/XBlock.git@kdmccormick/types2#egg=XBlock[django] + # via + # -r requirements/edx/kernel.in + # acid-xblock + # crowdsourcehinter-xblock + # done-xblock + # edx-completion + # edx-sga + # edx-when + # lti-consumer-xblock + # ora2 + # staff-graded-xblock + # xblock + # xblock-drag-and-drop-v2 + # xblock-google-drive + # xblock-utils acid-xblock==0.3.1 # via -r requirements/edx/kernel.in aiohttp==3.9.5 @@ -1173,21 +1189,6 @@ webob==1.8.7 # xblock wrapt==1.16.0 # via -r requirements/edx/paver.txt -xblock[django]==4.0.1 - # via - # -r requirements/edx/kernel.in - # acid-xblock - # crowdsourcehinter-xblock - # done-xblock - # edx-completion - # edx-sga - # edx-when - # lti-consumer-xblock - # ora2 - # staff-graded-xblock - # xblock-drag-and-drop-v2 - # xblock-google-drive - # xblock-utils xblock-drag-and-drop-v2==4.0.3 # via -r requirements/edx/bundled.in xblock-google-drive==0.7.0 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index cfadac2df69..c4040e5cab8 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -8,6 +8,23 @@ # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt +-e git+https://github.com/kdmccormick/XBlock.git@kdmccormick/types2#egg=XBlock[django] + # via + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt + # acid-xblock + # crowdsourcehinter-xblock + # done-xblock + # edx-completion + # edx-sga + # edx-when + # lti-consumer-xblock + # ora2 + # staff-graded-xblock + # xblock + # xblock-drag-and-drop-v2 + # xblock-google-drive + # xblock-utils accessible-pygments==0.0.5 # via # -r requirements/edx/doc.txt @@ -2171,22 +2188,6 @@ wrapt==1.16.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # astroid -xblock[django]==4.0.1 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # acid-xblock - # crowdsourcehinter-xblock - # done-xblock - # edx-completion - # edx-sga - # edx-when - # lti-consumer-xblock - # ora2 - # staff-graded-xblock - # xblock-drag-and-drop-v2 - # xblock-google-drive - # xblock-utils xblock-drag-and-drop-v2==4.0.3 # via # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 120986d6f38..72f50ba788f 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -6,6 +6,22 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt +-e git+https://github.com/kdmccormick/XBlock.git@kdmccormick/types2#egg=XBlock[django] + # via + # -r requirements/edx/base.txt + # acid-xblock + # crowdsourcehinter-xblock + # done-xblock + # edx-completion + # edx-sga + # edx-when + # lti-consumer-xblock + # ora2 + # staff-graded-xblock + # xblock + # xblock-drag-and-drop-v2 + # xblock-google-drive + # xblock-utils accessible-pygments==0.0.5 # via pydata-sphinx-theme acid-xblock==0.3.1 @@ -1428,21 +1444,6 @@ webob==1.8.7 # xblock wrapt==1.16.0 # via -r requirements/edx/base.txt -xblock[django]==4.0.1 - # via - # -r requirements/edx/base.txt - # acid-xblock - # crowdsourcehinter-xblock - # done-xblock - # edx-completion - # edx-sga - # edx-when - # lti-consumer-xblock - # ora2 - # staff-graded-xblock - # xblock-drag-and-drop-v2 - # xblock-google-drive - # xblock-utils xblock-drag-and-drop-v2==4.0.3 # via -r requirements/edx/base.txt xblock-google-drive==0.7.0 diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in index a5b510742ac..a4fe1e5dd8a 100644 --- a/requirements/edx/kernel.in +++ b/requirements/edx/kernel.in @@ -158,5 +158,5 @@ unicodecsv # Easier support for CSV files with unicode user-util # Functionality for retiring users (GDPR compliance) webob web-fragments # Provides the ability to render fragments of web pages -XBlock[django] # Courseware component architecture +-e git+https://github.com/kdmccormick/XBlock.git@kdmccormick/types2#egg=XBlock[django] xss-utils # https://github.com/openedx/edx-platform/pull/20633 Fix XSS via Translations diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 3f948fa7351..ad3e980a75d 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -6,6 +6,22 @@ # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt +-e git+https://github.com/kdmccormick/XBlock.git@kdmccormick/types2#egg=XBlock[django] + # via + # -r requirements/edx/base.txt + # acid-xblock + # crowdsourcehinter-xblock + # done-xblock + # edx-completion + # edx-sga + # edx-when + # lti-consumer-xblock + # ora2 + # staff-graded-xblock + # xblock + # xblock-drag-and-drop-v2 + # xblock-google-drive + # xblock-utils acid-xblock==0.3.1 # via -r requirements/edx/base.txt aiohttp==3.9.5 @@ -1580,21 +1596,6 @@ wrapt==1.16.0 # via # -r requirements/edx/base.txt # astroid -xblock[django]==4.0.1 - # via - # -r requirements/edx/base.txt - # acid-xblock - # crowdsourcehinter-xblock - # done-xblock - # edx-completion - # edx-sga - # edx-when - # lti-consumer-xblock - # ora2 - # staff-graded-xblock - # xblock-drag-and-drop-v2 - # xblock-google-drive - # xblock-utils xblock-drag-and-drop-v2==4.0.3 # via -r requirements/edx/base.txt xblock-google-drive==0.7.0