From 84744fdf88cb517de9e0aa6847efba1e5e524fc5 Mon Sep 17 00:00:00 2001 From: usamasadiq Date: Fri, 21 Feb 2020 20:14:02 +0500 Subject: [PATCH] BOM-1277 Removed constraint on requests-oauthlib and updated oauthlib --- .../djangoapps/oauth_dispatch/dot_overrides/validators.py | 1 + .../core/djangoapps/oauth_dispatch/tests/test_views.py | 2 +- requirements/constraints.txt | 7 ++----- requirements/edx/base.txt | 8 ++++---- requirements/edx/development.txt | 8 ++++---- requirements/edx/testing.txt | 8 ++++---- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/openedx/core/djangoapps/oauth_dispatch/dot_overrides/validators.py b/openedx/core/djangoapps/oauth_dispatch/dot_overrides/validators.py index 17cc912640..746c7db1c6 100644 --- a/openedx/core/djangoapps/oauth_dispatch/dot_overrides/validators.py +++ b/openedx/core/djangoapps/oauth_dispatch/dot_overrides/validators.py @@ -14,6 +14,7 @@ from oauth2_provider.scopes import get_scopes_backend from pytz import utc from ..models import RestrictedApplication +# pylint: disable=W0223 @receiver(pre_save, sender=AccessToken) diff --git a/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py b/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py index acc463ddbe..f5409b0ff2 100644 --- a/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py +++ b/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py @@ -630,7 +630,7 @@ class TestRevokeTokenView(AccessTokenLoginMixin, _DispatchingViewTestCase): # p self.revoke_token(self.refresh_token) - self.assert_refresh_token_status_code(self.refresh_token, expected_status_code=401) + self.assert_refresh_token_status_code(self.refresh_token, expected_status_code=400) def test_revoke_access_token_dot(self): """ diff --git a/requirements/constraints.txt b/requirements/constraints.txt index d2b75510fd..2f2b93093b 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -70,11 +70,8 @@ python3-saml==1.5.0 # CR-1912: Check if super-csv 0.9.7 is breaking grade export super-csv==0.9.6 -# Bumping requests-oauthlib to 1.2 updates oauthlib to 3.0.0, which changes a response code in certain cases -# This causes a test to fail. Before fixing, we would need to make sure mobile apps are functional with this change -# See https://github.com/oauthlib/oauthlib/issues/264 for more context -requests-oauthlib==1.1.0 -oauthlib==2.1.0 +# oauthlib>3.0.1 causes test failures +oauthlib==3.0.1 # transifex-client 0.13.5 and 0.13.6 needlessly pin six and urllib3, 0.13.7 does so for python-slugify # https://github.com/transifex/transifex-client/issues/252 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 8ea5296826..1bfe23616c 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -93,7 +93,7 @@ docutils==0.16 # via botocore drf-jwt==1.14.0 # via -c requirements/edx/../constraints.txt, edx-drf-extensions drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, edx-api-doc-tools edx-ace==0.1.13 # via -r requirements/edx/base.in -edx-analytics-data-api-client==0.15.3 # via -r requirements/edx/base.in +edx-analytics-data-api-client==0.15.5 # via -r requirements/edx/base.in edx-api-doc-tools==1.0.2 # via -r requirements/edx/base.in edx-bulk-grades==0.6.6 # via -r requirements/edx/base.in, staff-graded-xblock edx-ccx-keys==1.0.0 # via -r requirements/edx/base.in @@ -120,7 +120,7 @@ edx-user-state-client==1.1.2 # via -r requirements/edx/base.in edx-when==1.0.5 # via -r requirements/edx/base.in, edx-proctoring edxval==1.2.4 # via -r requirements/edx/base.in elasticsearch==1.9.0 # via edx-search -enum34==1.1.9 # via edxval +enum34==1.1.10 # via edxval event-tracking==0.3.0 # via -r requirements/edx/base.in, edx-proctoring, edx-search fs-s3fs==0.1.8 # via -r requirements/edx/base.in, django-pyfs fs==2.0.18 # via -r requirements/edx/base.in, django-pyfs, fs-s3fs, xblock @@ -166,7 +166,7 @@ nltk==3.4.5 # via -r requirements/edx/../edx-sandbox/shared.txt, c nodeenv==1.3.5 # via -r requirements/edx/base.in numpy==1.18.1 # via calc, chem, scipy git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2 # via -r requirements/edx/github.in -oauthlib==2.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core +oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core git+https://github.com/edx/edx-ora2.git@2.6.17#egg=ora2==2.6.17 # via -r requirements/edx/github.in packaging==20.3 # via drf-yasg path.py==12.4.0 # via edx-enterprise, edx-i18n-tools, ora2, xmodule @@ -206,7 +206,7 @@ pyyaml==5.3 # via -r requirements/edx/base.in, code-annotations, e random2==1.0.1 # via -r requirements/edx/base.in recommender-xblock==1.4.5 # via -r requirements/edx/base.in redis==2.10.6 # via -r requirements/edx/base.in -requests-oauthlib==1.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, social-auth-core +requests-oauthlib==1.3.0 # via -r requirements/edx/base.in, social-auth-core requests==2.23.0 # via -r requirements/edx/paver.txt, analytics-python, coreapi, django-oauth-toolkit, edx-analytics-data-api-client, edx-bulk-grades, edx-drf-extensions, edx-enterprise, edx-rest-api-client, geoip2, mailsnake, pyjwkest, python-swiftclient, requests-oauthlib, sailthru-client, slumber, social-auth-core rest-condition==1.0.3 # via -r requirements/edx/base.in, edx-drf-extensions rfc6266-parser==0.0.6 # via -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 80afae28de..cacd212891 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -105,7 +105,7 @@ docutils==0.16 # via -r requirements/edx/testing.txt, botocore, m2r, drf-jwt==1.14.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-drf-extensions drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-api-doc-tools edx-ace==0.1.13 # via -r requirements/edx/testing.txt -edx-analytics-data-api-client==0.15.3 # via -r requirements/edx/testing.txt +edx-analytics-data-api-client==0.15.5 # via -r requirements/edx/testing.txt edx-api-doc-tools==1.0.2 # via -r requirements/edx/testing.txt edx-bulk-grades==0.6.6 # via -r requirements/edx/testing.txt, staff-graded-xblock edx-ccx-keys==1.0.0 # via -r requirements/edx/testing.txt @@ -135,7 +135,7 @@ edx-when==1.0.5 # via -r requirements/edx/testing.txt, edx-proctoring edxval==1.2.4 # via -r requirements/edx/testing.txt elasticsearch==1.9.0 # via -r requirements/edx/testing.txt, edx-search entrypoints==0.3 # via -r requirements/edx/testing.txt, flake8 -enum34==1.1.9 # via -r requirements/edx/testing.txt, edxval +enum34==1.1.10 # via -r requirements/edx/testing.txt, edxval event-tracking==0.3.0 # via -r requirements/edx/testing.txt, edx-proctoring, edx-search execnet==1.7.1 # via -r requirements/edx/testing.txt, pytest-xdist factory-boy==2.8.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt @@ -200,7 +200,7 @@ nltk==3.4.5 # via -r requirements/edx/testing.txt, chem nodeenv==1.3.5 # via -r requirements/edx/testing.txt numpy==1.18.1 # via -r requirements/edx/testing.txt, calc, chem, pandas, scipy git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2 # via -r requirements/edx/testing.txt -oauthlib==2.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core +oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core git+https://github.com/edx/edx-ora2.git@2.6.17#egg=ora2==2.6.17 # via -r requirements/edx/testing.txt packaging==20.3 # via -r requirements/edx/testing.txt, drf-yasg, pytest, sphinx, tox pandas==0.22.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt @@ -264,7 +264,7 @@ radon==4.1.0 # via -r requirements/edx/testing.txt random2==1.0.1 # via -r requirements/edx/testing.txt recommender-xblock==1.4.5 # via -r requirements/edx/testing.txt redis==2.10.6 # via -r requirements/edx/testing.txt -requests-oauthlib==1.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, social-auth-core +requests-oauthlib==1.3.0 # via -r requirements/edx/testing.txt, social-auth-core requests==2.23.0 # via -r requirements/edx/testing.txt, analytics-python, coreapi, django-oauth-toolkit, edx-analytics-data-api-client, edx-bulk-grades, edx-drf-extensions, edx-enterprise, edx-rest-api-client, geoip2, mailsnake, pyjwkest, python-swiftclient, requests-oauthlib, sailthru-client, slumber, social-auth-core, sphinx, transifex-client rest-condition==1.0.3 # via -r requirements/edx/testing.txt, edx-drf-extensions rfc6266-parser==0.0.6 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 1c894bc605..b1b9f400a5 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -101,7 +101,7 @@ docutils==0.16 # via -r requirements/edx/base.txt, botocore drf-jwt==1.14.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-drf-extensions drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-api-doc-tools edx-ace==0.1.13 # via -r requirements/edx/base.txt -edx-analytics-data-api-client==0.15.3 # via -r requirements/edx/base.txt +edx-analytics-data-api-client==0.15.5 # via -r requirements/edx/base.txt edx-api-doc-tools==1.0.2 # via -r requirements/edx/base.txt edx-bulk-grades==0.6.6 # via -r requirements/edx/base.txt, staff-graded-xblock edx-ccx-keys==1.0.0 # via -r requirements/edx/base.txt @@ -130,7 +130,7 @@ edx-when==1.0.5 # via -r requirements/edx/base.txt, edx-proctoring edxval==1.2.4 # via -r requirements/edx/base.txt elasticsearch==1.9.0 # via -r requirements/edx/base.txt, edx-search entrypoints==0.3 # via flake8 -enum34==1.1.9 # via -r requirements/edx/base.txt, edxval +enum34==1.1.10 # via -r requirements/edx/base.txt, edxval event-tracking==0.3.0 # via -r requirements/edx/base.txt, edx-proctoring, edx-search execnet==1.7.1 # via pytest-xdist factory-boy==2.8.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in @@ -191,7 +191,7 @@ nltk==3.4.5 # via -r requirements/edx/base.txt, chem nodeenv==1.3.5 # via -r requirements/edx/base.txt numpy==1.18.1 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, calc, chem, pandas, scipy git+https://github.com/joestump/python-oauth2.git@b94f69b1ad195513547924e380d9265133e995fa#egg=oauth2 # via -r requirements/edx/base.txt -oauthlib==2.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core +oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core git+https://github.com/edx/edx-ora2.git@2.6.17#egg=ora2==2.6.17 # via -r requirements/edx/base.txt packaging==20.3 # via -r requirements/edx/base.txt, drf-yasg, pytest, tox pandas==0.22.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt @@ -252,7 +252,7 @@ radon==4.1.0 # via -r requirements/edx/testing.in random2==1.0.1 # via -r requirements/edx/base.txt recommender-xblock==1.4.5 # via -r requirements/edx/base.txt redis==2.10.6 # via -r requirements/edx/base.txt -requests-oauthlib==1.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, social-auth-core +requests-oauthlib==1.3.0 # via -r requirements/edx/base.txt, social-auth-core requests==2.23.0 # via -r requirements/edx/base.txt, analytics-python, coreapi, django-oauth-toolkit, edx-analytics-data-api-client, edx-bulk-grades, edx-drf-extensions, edx-enterprise, edx-rest-api-client, geoip2, mailsnake, pyjwkest, python-swiftclient, requests-oauthlib, sailthru-client, slumber, social-auth-core, transifex-client rest-condition==1.0.3 # via -r requirements/edx/base.txt, edx-drf-extensions rfc6266-parser==0.0.6 # via -r requirements/edx/base.txt