From 1f32bc63efcb894f736a6f807dacd727985eed14 Mon Sep 17 00:00:00 2001 From: Manjinder Singh <49171515+jinder1s@users.noreply.github.com> Date: Tue, 18 Feb 2020 11:17:27 -0500 Subject: [PATCH] Removing deprecated rest_framework_oauth library (#23127) --- requirements/edx/base.txt | 6 ++---- requirements/edx/development.txt | 8 +++----- requirements/edx/github.in | 8 -------- requirements/edx/testing.txt | 8 +++----- 4 files changed, 8 insertions(+), 22 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 0c7d5e7c341..3195cdb1904 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -70,7 +70,6 @@ django-model-utils==3.0.0 django-mptt==0.11.0 django-multi-email-field==0.6.1 # via edx-enterprise django-mysql==3.3.0 -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==2.0.0 # via edx-enterprise django-pipeline==1.7.0 @@ -88,7 +87,6 @@ django-waffle==0.18.0 django-webpack-loader==0.6.0 django==1.11.28 djangorestframework-jwt==1.11.0 -git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 djangorestframework-xml==1.4.0 # via edx-enterprise djangorestframework==3.9.4 docopt==0.6.2 @@ -114,7 +112,7 @@ edx-opaque-keys[django]==2.0.1 edx-organizations==3.0.0 edx-proctoring-proctortrack==1.0.5 edx-proctoring==2.2.6 -edx-rbac==1.0.5 # via edx-enterprise +edx-rbac==1.1.0 # via edx-enterprise edx-rest-api-client==3.0.2 edx-search==1.3.3 edx-sga==0.10.0 @@ -235,7 +233,7 @@ staff-graded-xblock==0.7 stevedore==1.32.0 super-csv==0.9.6 sympy==1.5.1 -testfixtures==6.12.1 # via edx-enterprise +testfixtures==6.13.0 # via edx-enterprise text-unidecode==1.3 # via python-slugify unicodecsv==0.14.1 uritemplate==3.0.1 # via coreapi, drf-yasg diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 0eb3ab75cd3..393e8d2522f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -82,7 +82,6 @@ django-model-utils==3.0.0 django-mptt==0.11.0 django-multi-email-field==0.6.1 django-mysql==3.3.0 -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==2.0.0 django-pipeline==1.7.0 @@ -100,7 +99,6 @@ django-waffle==0.18.0 django-webpack-loader==0.6.0 django==1.11.28 djangorestframework-jwt==1.11.0 -git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 djangorestframework-xml==1.4.0 djangorestframework==3.9.4 docopt==0.6.2 @@ -127,7 +125,7 @@ edx-opaque-keys[django]==2.0.1 edx-organizations==3.0.0 edx-proctoring-proctortrack==1.0.5 edx-proctoring==2.2.6 -edx-rbac==1.0.5 +edx-rbac==1.1.0 edx-rest-api-client==3.0.2 edx-search==1.3.3 edx-sga==0.10.0 @@ -143,7 +141,7 @@ enum34==1.1.6 event-tracking==0.3.0 execnet==1.7.1 factory-boy==2.8.1 -faker==4.0.0 +faker==4.0.1 filelock==3.0.12 flake8-polyfill==1.0.2 flake8==3.7.9 @@ -305,7 +303,7 @@ staff-graded-xblock==0.7 stevedore==1.32.0 super-csv==0.9.6 sympy==1.5.1 -testfixtures==6.12.1 +testfixtures==6.13.0 text-unidecode==1.3 toml==0.10.0 tox-battery==0.5.2 diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 036641d0ce8..6ed8be190ce 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -66,14 +66,6 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752 # This can be removed once an official social-auth-app-django Pypi release with Django 2.2 support is available in the future. -e git+https://github.com/python-social-auth/social-app-django.git@c00d23c2b45c3317bd35b15ad1b959338689cef8#egg=social-auth-app-django -# 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@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 -git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 - # Why a django-celery fork? To add Django 1.11 compatibility to the abandoned repo. # This dependency will be removed by the Celery 4 upgrade: https://openedx.atlassian.net/browse/PLAT-1684 git+https://github.com/edx/django-celery.git@756cb57aad765cb2b0d37372c1855b8f5f37e6b0#egg=django-celery==3.2.1+edx.2 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 24fd10ec3cb..12567a823c7 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -80,7 +80,6 @@ django-model-utils==3.0.0 django-mptt==0.11.0 django-multi-email-field==0.6.1 django-mysql==3.3.0 -git+https://github.com/edx/django-oauth-plus.git@b9b64a3ac24fd11f471763c88462bbf3c53e46e6#egg=django-oauth-plus==2.2.9.edx-4 django-object-actions==2.0.0 django-pipeline==1.7.0 django-pyfs==2.1 @@ -96,7 +95,6 @@ django-user-tasks==0.3.0 django-waffle==0.18.0 django-webpack-loader==0.6.0 djangorestframework-jwt==1.11.0 -git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 djangorestframework-xml==1.4.0 djangorestframework==3.9.4 docopt==0.6.2 @@ -123,7 +121,7 @@ edx-opaque-keys[django]==2.0.1 edx-organizations==3.0.0 edx-proctoring-proctortrack==1.0.5 edx-proctoring==2.2.6 -edx-rbac==1.0.5 +edx-rbac==1.1.0 edx-rest-api-client==3.0.2 edx-search==1.3.3 edx-sga==0.10.0 @@ -138,7 +136,7 @@ enum34==1.1.6 event-tracking==0.3.0 execnet==1.7.1 # via pytest-xdist factory-boy==2.8.1 -faker==4.0.0 # via factory-boy +faker==4.0.1 # via factory-boy filelock==3.0.12 # via tox, virtualenv flake8-polyfill==1.0.2 # via radon flake8==3.7.9 # via flake8-polyfill @@ -283,7 +281,7 @@ staff-graded-xblock==0.7 stevedore==1.32.0 super-csv==0.9.6 sympy==1.5.1 -testfixtures==6.12.1 +testfixtures==6.13.0 text-unidecode==1.3 toml==0.10.0 # via tox tox-battery==0.5.2 -- GitLab