diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index d5e1789fd0..fb5296fe20 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -8,7 +8,7 @@ -e common/lib/capa -e git+https://github.com/edx/codejail.git@33758da2609bd72c2c18efc2d4bdb93596523d5e#egg=codejail -e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki --e git+https://github.com/edx/DoneXBlock.git@2.0#egg=done-xblock +-e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme -e . -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev @@ -69,7 +69,7 @@ django-model-utils==3.0.0 django-mptt==0.8.7 django-multi-email-field==0.5.1 # via edx-enterprise django-mysql==2.4.1 -git+https://github.com/edx/django-oauth-plus.git@66155b545b23ebc01ec438849d303077e8198dfd#egg=django-oauth-plus==2.2.9.edx-3 +git+https://github.com/edx/django-oauth-plus.git@b9b64a3ac24fd11f471763c88462bbf3c53e46e6#egg=django-oauth-plus==2.2.9.edx-4 django-oauth-toolkit==1.1.3 django-object-actions==1.1.0 # via edx-enterprise django-pipeline==1.6.14 @@ -171,7 +171,7 @@ nodeenv==1.3.3 numpy==1.16.5 git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2 oauthlib==2.1.0 -git+https://github.com/edx/edx-ora2.git@2.3.5#egg=ora2==2.3.5 +git+https://github.com/edx/edx-ora2.git@2.3.6#egg=ora2==2.3.6 path.py==8.2.1 pathtools==0.1.2 paver==1.3.4 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 7a1cc82114..a6831bbe4f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -8,7 +8,7 @@ -e common/lib/capa -e git+https://github.com/edx/codejail.git@33758da2609bd72c2c18efc2d4bdb93596523d5e#egg=codejail -e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki --e git+https://github.com/edx/DoneXBlock.git@2.0#egg=done-xblock +-e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme -e . -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev @@ -90,7 +90,7 @@ django-model-utils==3.0.0 django-mptt==0.8.7 django-multi-email-field==0.5.1 django-mysql==2.4.1 -git+https://github.com/edx/django-oauth-plus.git@66155b545b23ebc01ec438849d303077e8198dfd#egg=django-oauth-plus==2.2.9.edx-3 +git+https://github.com/edx/django-oauth-plus.git@b9b64a3ac24fd11f471763c88462bbf3c53e46e6#egg=django-oauth-plus==2.2.9.edx-4 django-oauth-toolkit==1.1.3 django-object-actions==1.1.0 django-pipeline==1.6.14 @@ -221,7 +221,7 @@ nodeenv==1.3.3 numpy==1.16.5 git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2 oauthlib==2.1.0 -git+https://github.com/edx/edx-ora2.git@2.3.5#egg=ora2==2.3.5 +git+https://github.com/edx/edx-ora2.git@2.3.6#egg=ora2==2.3.6 packaging==19.2 path.py==8.2.1 pathlib2==2.3.5 diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 0de6acdb40..93d8143fcb 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -63,7 +63,7 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752 # Forked to get Django 1.10+ compat that is in origin BitBucket repo, without an official build. # This can go away when we update auth to not use django-rest-framework-oauth -git+https://github.com/edx/django-oauth-plus.git@66155b545b23ebc01ec438849d303077e8198dfd#egg=django-oauth-plus==2.2.9.edx-3 +git+https://github.com/edx/django-oauth-plus.git@b9b64a3ac24fd11f471763c88462bbf3c53e46e6#egg=django-oauth-plus==2.2.9.edx-4 # Why a drf-oauth fork? To add Django 1.11 compatibility to the abandoned repo. # This dependency will be removed by this work: https://openedx.atlassian.net/browse/PLAT-1660 @@ -81,10 +81,10 @@ git+https://github.com/edx/bridgekeeper.git@4e34894e4ac5d0467ed1901811a81fd87ee0 # Our libraries: -e git+https://github.com/edx/codejail.git@33758da2609bd72c2c18efc2d4bdb93596523d5e#egg=codejail -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock -git+https://github.com/edx/edx-ora2.git@2.3.5#egg=ora2==2.3.5 +git+https://github.com/edx/edx-ora2.git@2.3.6#egg=ora2==2.3.6 git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb8eb28e467#egg=crowdsourcehinter-xblock==0.2 -e git+https://github.com/edx/RateXBlock.git@2.0#egg=rate-xblock --e git+https://github.com/edx/DoneXBlock.git@2.0#egg=done-xblock +-e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive git+https://github.com/edx/xblock-lti-consumer.git@v1.2.1#egg=lti_consumer-xblock==1.2.1 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 0798bfc7c1..38c5510dc6 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -8,7 +8,7 @@ -e common/lib/capa -e git+https://github.com/edx/codejail.git@33758da2609bd72c2c18efc2d4bdb93596523d5e#egg=codejail -e git+https://github.com/edx/django-wiki.git@v0.0.23#egg=django-wiki --e git+https://github.com/edx/DoneXBlock.git@2.0#egg=done-xblock +-e git+https://github.com/edx/DoneXBlock.git@2.0.1#egg=done-xblock -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme -e . -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev @@ -88,7 +88,7 @@ django-model-utils==3.0.0 django-mptt==0.8.7 django-multi-email-field==0.5.1 django-mysql==2.4.1 -git+https://github.com/edx/django-oauth-plus.git@66155b545b23ebc01ec438849d303077e8198dfd#egg=django-oauth-plus==2.2.9.edx-3 +git+https://github.com/edx/django-oauth-plus.git@b9b64a3ac24fd11f471763c88462bbf3c53e46e6#egg=django-oauth-plus==2.2.9.edx-4 django-oauth-toolkit==1.1.3 django-object-actions==1.1.0 django-pipeline==1.6.14 @@ -212,7 +212,7 @@ nodeenv==1.3.3 numpy==1.16.5 git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2 oauthlib==2.1.0 -git+https://github.com/edx/edx-ora2.git@2.3.5#egg=ora2==2.3.5 +git+https://github.com/edx/edx-ora2.git@2.3.6#egg=ora2==2.3.6 packaging==19.2 # via caniusepython3, tox path.py==8.2.1 pathlib2==2.3.5