Merge pull request #21274 from edx/BOM-67

BOM-67 Updated the dependencies for Django-Oauth-plus
This commit is contained in:
Aarif
2019-08-05 19:34:24 +05:00
committed by GitHub
5 changed files with 13 additions and 12 deletions

View File

@@ -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@01ec2a161dfc3465f9d35b9211ae790177418316#egg=django-oauth-plus==2.2.9.edx-1
git+https://github.com/edx/django-oauth-plus.git@66155b545b23ebc01ec438849d303077e8198dfd#egg=django-oauth-plus==2.2.9.edx-3
django-oauth-toolkit==1.1.3
django-object-actions==1.1.0 # via edx-enterprise
git+https://github.com/edx/django-openid-auth.git@0.15.1#egg=django-openid-auth==0.15.1
@@ -109,7 +109,7 @@ edx-drf-extensions==2.3.8
edx-enterprise==1.8.8
edx-i18n-tools==0.4.8
edx-milestones==0.2.3
edx-oauth2-provider==1.2.3
edx-oauth2-provider==1.3.0
edx-opaque-keys[django]==1.0.1
edx-organizations==2.1.0
edx-proctoring-proctortrack==1.0.5
@@ -135,7 +135,7 @@ glob2==0.7
gunicorn==19.9.0
help-tokens==1.0.4
html5lib==1.0.1
httplib2==0.13.1 # via oauth2, zendesk
httplib2==0.13.1 # via zendesk
idna==2.8
inflection==0.3.1 # via drf-yasg
ipaddress==1.0.22
@@ -169,7 +169,7 @@ newrelic==4.20.1.121
nltk==3.4.4
nodeenv==1.1.1
numpy==1.16.4
oauth2==1.9.0.post1
git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2
oauthlib==2.1.0
git+https://github.com/edx/edx-ora2.git@2.2.6#egg=ora2==2.2.6
path.py==8.2.1

View File

@@ -93,7 +93,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@01ec2a161dfc3465f9d35b9211ae790177418316#egg=django-oauth-plus==2.2.9.edx-1
git+https://github.com/edx/django-oauth-plus.git@66155b545b23ebc01ec438849d303077e8198dfd#egg=django-oauth-plus==2.2.9.edx-3
django-oauth-toolkit==1.1.3
django-object-actions==1.1.0
git+https://github.com/edx/django-openid-auth.git@0.15.1#egg=django-openid-auth==0.15.1
@@ -135,7 +135,7 @@ edx-enterprise==1.8.8
edx-i18n-tools==0.4.8
edx-lint==1.3.0
edx-milestones==0.2.3
edx-oauth2-provider==1.2.3
edx-oauth2-provider==1.3.0
edx-opaque-keys[django]==1.0.1
edx-organizations==2.1.0
edx-proctoring-proctortrack==1.0.5
@@ -220,7 +220,7 @@ newrelic==4.20.1.121
nltk==3.4.4
nodeenv==1.1.1
numpy==1.16.4
oauth2==1.9.0.post1
git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2
oauthlib==2.1.0
git+https://github.com/edx/edx-ora2.git@2.2.6#egg=ora2==2.2.6
packaging==19.1

View File

@@ -64,7 +64,7 @@ git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7
# 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@01ec2a161dfc3465f9d35b9211ae790177418316#egg=django-oauth-plus==2.2.9.edx-1
git+https://github.com/edx/django-oauth-plus.git@66155b545b23ebc01ec438849d303077e8198dfd#egg=django-oauth-plus==2.2.9.edx-3
# 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
@@ -93,6 +93,7 @@ git+https://github.com/edx/xblock-lti-consumer.git@v1.1.8#egg=lti_consumer-xbloc
# Third Party XBlocks
git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2
git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f81#egg=edx-sga==0.8.3
git+https://github.com/open-craft/xblock-poll@add89e14558c30f3c8dc7431e5cd6536fff6d941#egg=xblock-poll==1.5.1
git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.4#egg=xblock-drag-and-drop-v2==2.2.4

View File

@@ -20,7 +20,7 @@ pbr==5.4.1 # via stevedore
psutil==1.2.1
pymongo==2.9.1
python-memcached==1.59
pyyaml==5.1.1 # via watchdog
pyyaml==5.1.2 # via watchdog
requests==2.22.0
six==1.11.0
stevedore==1.30.1

View File

@@ -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@01ec2a161dfc3465f9d35b9211ae790177418316#egg=django-oauth-plus==2.2.9.edx-1
git+https://github.com/edx/django-oauth-plus.git@66155b545b23ebc01ec438849d303077e8198dfd#egg=django-oauth-plus==2.2.9.edx-3
django-oauth-toolkit==1.1.3
django-object-actions==1.1.0
git+https://github.com/edx/django-openid-auth.git@0.15.1#egg=django-openid-auth==0.15.1
@@ -131,7 +131,7 @@ edx-enterprise==1.8.8
edx-i18n-tools==0.4.8
edx-lint==1.3.0
edx-milestones==0.2.3
edx-oauth2-provider==1.2.3
edx-oauth2-provider==1.3.0
edx-opaque-keys[django]==1.0.1
edx-organizations==2.1.0
edx-proctoring-proctortrack==1.0.5
@@ -213,7 +213,7 @@ newrelic==4.20.1.121
nltk==3.4.4
nodeenv==1.1.1
numpy==1.16.4
oauth2==1.9.0.post1
git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2
oauthlib==2.1.0
git+https://github.com/edx/edx-ora2.git@2.2.6#egg=ora2==2.2.6
packaging==19.1 # via caniusepython3, tox