Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23143 from edx/bom-1277

Browse Source 
BOM-1277 Removed constraint on oauthlib and requests-oauthlib
This commit is contained in:
Usama Sadiq
2020-03-11 17:21:55 +05:00
committed by GitHub
parent 23c58e5766 84744fdf88
commit 9dadc07453
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openedx/core/djangoapps/oauth_dispatch/dot_overrides/validators.py
View File

@@ -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)

2
openedx/core/djangoapps/oauth_dispatch/tests/test_views.py
View File

@@ -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):
"""

7
requirements/constraints.txt
View File

@@ -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

4
requirements/edx/base.txt
View File

@@ -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

4
requirements/edx/development.txt
View File

@@ -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

4
requirements/edx/testing.txt
View File

@@ -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