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

Running make upgrade to bump edx-enterprise version (#21344)

Browse Source 
Fix for test that broke related to DRF;
This commit is contained in:
Chris Pappas
2019-08-15 14:56:08 -04:00
committed by GitHub
parent a6526a8874
commit 4461d978db
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/core/djangoapps/user_authn/tests/test_cookies.py
View File

@@ -66,7 +66,7 @@ class CookieTests(TestCase):
If can_recreate is False, verifies that a JWT cannot be recreated.
"""
self._copy_cookies_to_request(response, self.request)
JwtAuthCookieMiddleware().process_request(self.request)
JwtAuthCookieMiddleware().process_view(self.request, None, None, None)
self.assertEqual(
cookies_api.jwt_cookies.jwt_cookie_name() in self.request.COOKIES,
can_recreate,

2
requirements/edx-sandbox/base.txt
View File

@@ -33,4 +33,4 @@ subprocess32==3.5.4 # via matplotlib
sympy==0.7.1
# The following packages are considered to be unsafe in a requirements file:
# setuptools==41.0.1 # via kiwisolver
# setuptools==41.1.0 # via kiwisolver

16
requirements/edx/base.txt
View File

@@ -97,7 +97,7 @@ docutils==0.15.2 # via botocore
drf-yasg==1.16
edx-ace==0.1.10
edx-analytics-data-api-client==0.15.3
edx-bulk-grades==0.4.3
edx-bulk-grades==0.5
edx-ccx-keys==0.2.2
edx-celeryutils==0.3.0
edx-completion==2.0.0
@@ -105,8 +105,8 @@ edx-django-oauth2-provider==1.3.5
edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-django-utils==2.0.0
edx-drf-extensions==2.3.8
edx-enterprise==1.8.8
edx-drf-extensions==2.4.0
edx-enterprise==1.9.0
edx-i18n-tools==0.4.8
edx-milestones==0.2.3
edx-oauth2-provider==1.3.0
@@ -215,7 +215,7 @@ rest-condition==1.0.3
rfc6266-parser==0.0.5.post2
ruamel.ordereddict==0.4.14 ; python_version == "2.7" # via ruamel.yaml
ruamel.yaml.clib==0.1.2 # via ruamel.yaml
ruamel.yaml==0.16.1 # via drf-yasg
ruamel.yaml==0.16.2 # via drf-yasg
rules==2.1
s3transfer==0.1.13 # via boto3
sailthru-client==2.2.3
@@ -226,7 +226,7 @@ shortuuid==0.5.0 # via edx-django-oauth2-provider
simplejson==3.16.0 # via mailsnake, sailthru-client, zendesk
singledispatch==3.4.0.3
six==1.11.0
slumber==0.7.1 # via edx-enterprise, edx-rest-api-client
slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client
social-auth-app-django==2.1.0
social-auth-core==1.7.0
sorl-thumbnail==12.3
@@ -235,7 +235,7 @@ soupsieve==1.9.2 # via beautifulsoup4
sqlparse==0.3.0
staff-graded-xblock==0.5
stevedore==1.30.1
super-csv==0.9
super-csv==0.9.1
sympy==1.4
testfixtures==6.10.0 # via edx-enterprise
tincan==0.0.5 # via edx-enterprise
@@ -243,7 +243,7 @@ unicodecsv==0.14.1
uritemplate==3.0.0 # via coreapi, drf-yasg
urllib3==1.23
user-util==0.1.5
voluptuous==0.11.5
voluptuous==0.11.7
watchdog==0.9.0
web-fragments==0.3.0
webencodings==0.5.1 # via html5lib
@@ -258,4 +258,4 @@ xss-utils==0.1.1
zendesk==1.1.1
# The following packages are considered to be unsafe in a requirements file:
# setuptools==41.0.1 # via fs, lazy, python-levenshtein
# setuptools==41.1.0 # via fs, lazy, python-levenshtein

14
requirements/edx/development.txt
View File

@@ -121,7 +121,7 @@ docutils==0.15.2
drf-yasg==1.16
edx-ace==0.1.10
edx-analytics-data-api-client==0.15.3
edx-bulk-grades==0.4.3
edx-bulk-grades==0.5
edx-ccx-keys==0.2.2
edx-celeryutils==0.3.0
edx-completion==2.0.0
@@ -129,8 +129,8 @@ edx-django-oauth2-provider==1.3.5
edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-django-utils==2.0.0
edx-drf-extensions==2.3.8
edx-enterprise==1.8.8
edx-drf-extensions==2.4.0
edx-enterprise==1.9.0
edx-i18n-tools==0.4.8
edx-lint==1.3.0
edx-milestones==0.2.3
@@ -289,7 +289,7 @@ rest-condition==1.0.3
rfc6266-parser==0.0.5.post2
ruamel.ordereddict==0.4.14 ; python_version == "2.7"
ruamel.yaml.clib==0.1.2
ruamel.yaml==0.16.1
ruamel.yaml==0.16.2
rules==2.1
s3transfer==0.1.13
sailthru-client==2.2.3
@@ -315,7 +315,7 @@ sphinxcontrib-websupport==1.1.2 # via sphinx
sqlparse==0.3.0
staff-graded-xblock==0.5
stevedore==1.30.1
super-csv==0.9
super-csv==0.9.1
sympy==1.4
testfixtures==6.10.0
text-unidecode==1.2
@@ -332,7 +332,7 @@ uritemplate==3.0.0
urllib3==1.23
user-util==0.1.5
virtualenv==16.7.2
voluptuous==0.11.5
voluptuous==0.11.7
vulture==1.0
watchdog==0.9.0
wcwidth==0.1.7
@@ -353,4 +353,4 @@ zendesk==1.1.1
zipp==0.5.2
# The following packages are considered to be unsafe in a requirements file:
# setuptools==41.0.1 # via caniusepython3, fs, lazy, pytest, python-levenshtein, sphinx
# setuptools==41.1.0 # via caniusepython3, fs, lazy, pytest, python-levenshtein, sphinx

2
requirements/edx/paver.txt
View File

@@ -29,4 +29,4 @@ watchdog==0.9.0
wrapt==1.10.5
# The following packages are considered to be unsafe in a requirements file:
# setuptools==41.0.1 # via lazy
# setuptools==41.1.0 # via lazy

14
requirements/edx/testing.txt
View File

@@ -117,7 +117,7 @@ docutils==0.15.2
drf-yasg==1.16
edx-ace==0.1.10
edx-analytics-data-api-client==0.15.3
edx-bulk-grades==0.4.3
edx-bulk-grades==0.5
edx-ccx-keys==0.2.2
edx-celeryutils==0.3.0
edx-completion==2.0.0
@@ -125,8 +125,8 @@ edx-django-oauth2-provider==1.3.5
edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-django-utils==2.0.0
edx-drf-extensions==2.3.8
edx-enterprise==1.8.8
edx-drf-extensions==2.4.0
edx-enterprise==1.9.0
edx-i18n-tools==0.4.8
edx-lint==1.3.0
edx-milestones==0.2.3
@@ -280,7 +280,7 @@ rest-condition==1.0.3
rfc6266-parser==0.0.5.post2
ruamel.ordereddict==0.4.14 ; python_version == "2.7"
ruamel.yaml.clib==0.1.2
ruamel.yaml==0.16.1
ruamel.yaml==0.16.2
rules==2.1
s3transfer==0.1.13
sailthru-client==2.2.3
@@ -302,7 +302,7 @@ soupsieve==1.9.2
sqlparse==0.3.0
staff-graded-xblock==0.5
stevedore==1.30.1
super-csv==0.9
super-csv==0.9.1
sympy==1.4
testfixtures==6.10.0
text-unidecode==1.2 # via faker
@@ -319,7 +319,7 @@ uritemplate==3.0.0
urllib3==1.23
user-util==0.1.5
virtualenv==16.7.2 # via tox
voluptuous==0.11.5
voluptuous==0.11.7
watchdog==0.9.0
wcwidth==0.1.7 # via pytest
web-fragments==0.3.0
@@ -339,4 +339,4 @@ zendesk==1.1.1
zipp==0.5.2 # via importlib-metadata
# The following packages are considered to be unsafe in a requirements file:
# setuptools==41.0.1 # via caniusepython3, fs, lazy, pytest, python-levenshtein
# setuptools==41.1.0 # via caniusepython3, fs, lazy, pytest, python-levenshtein