diff --git a/openedx/core/djangoapps/user_authn/tests/test_cookies.py b/openedx/core/djangoapps/user_authn/tests/test_cookies.py index 05d01704b4a24e1d3483d305b2f6f2f3922a61ed..c362b9e1b17f776dc0541b1d02a2ae23d4e92dff 100644 --- a/openedx/core/djangoapps/user_authn/tests/test_cookies.py +++ b/openedx/core/djangoapps/user_authn/tests/test_cookies.py @@ -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, diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 83dcb8850c819dfb119386633b9d307f929356cd..4e106442e49f56f348d691c60eef01ab209f43d6 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -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 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 6a96f96f62b6645a19cf3338b14f57c78a2345fc..1eeda5df395ae9f849497f3e8f75404c972c995c 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -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 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 9a6d2f98260deffebac9f80052332104c596fa83..0031d732464e79984d72b20c5f882b39e5792e31 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -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 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 5524a577a784eff4d4e579f98a2211f5406d1c49..389288137dab76033591c95cd0f926819c768f77 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -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 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index c60fc4ac37febdc51b2aadb754239e2d412da8b2..7c9d9717d94da3d69561592997e9c712f225df3c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -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