From 1d8319c779bcf99744cfe910c62701e2135f7801 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 2 Jul 2018 13:55:19 -0400 Subject: [PATCH] Upgrade to the latest Django 1.11 + `make upgrade` Django 1.11 Changelog - https://docs.djangoproject.com/en/2.0/releases/1.11.14/ --- requirements/edx/base.in | 2 +- requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 10 +++++----- requirements/edx/django.txt | 2 +- requirements/edx/testing.txt | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index cd98b89a44..0646aec741 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -33,7 +33,7 @@ botocore==1.8.17 # via boto3, s3transfer celery==3.1.25 # Asynchronous task execution library ddt==0.8.0 # via xblock-drag-and-drop-v2 (which probably shouldn't require it) defusedxml==0.4.1 # XML bomb protection for common XML parsers -Django==1.11.13 # Web application framework +Django==1.11.14 # Web application framework django-babel-underscore # underscore template extractor for django-babel (internationalization utilities) django-config-models==0.1.8 # Configuration models for Django allowing config management with auditing django-cors-headers==2.1.0 # Used to allow to configure CORS headers for cross-domain requests diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index aafcec569a..84ce77768b 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -100,7 +100,7 @@ django-storages==1.4.1 django-user-tasks==0.1.5 django-waffle==0.12.0 django-webpack-loader==0.6.0 -django==1.11.13 +django==1.11.14 djangorestframework-jwt==1.11.0 djangorestframework-xml==1.3.0 # via edx-enterprise dm.xmlsec.binding==1.3.3 # via python-saml @@ -218,7 +218,7 @@ scipy==0.14.0 semantic-version==2.6.0 # via edx-drf-extensions shapely==1.2.16 shortuuid==0.5.0 # via edx-django-oauth2-provider -simplejson==3.15.0 # via django-rest-swagger, dogapi, mailsnake, sailthru-client, zendesk +simplejson==3.16.0 # via django-rest-swagger, dogapi, mailsnake, sailthru-client, zendesk six==1.11.0 slumber==0.7.1 # via edx-rest-api-client social-auth-app-django==2.1.0 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 799e64bb8a..417d3d80ab 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -120,7 +120,7 @@ django-storages==1.4.1 django-user-tasks==0.1.5 django-waffle==0.12.0 django-webpack-loader==0.6.0 -django==1.11.13 +django==1.11.14 djangorestframework-jwt==1.11.0 djangorestframework-xml==1.3.0 dm.xmlsec.binding==1.3.3 @@ -239,8 +239,8 @@ pluggy==0.6.0 polib==1.1.0 psutil==1.2.1 py2neo==3.1.2 -py==1.5.3 -pyasn1-modules==0.2.1 +py==1.5.4 +pyasn1-modules==0.2.2 pyasn1==0.4.3 pycodestyle==2.3.1 pycontracts==1.7.1 @@ -256,7 +256,7 @@ pyjwkest==1.3.2 pyjwt==1.5.2 pylint-celery==0.3 pylint-django==0.7.2 -pylint-plugin-utils==0.2.6 +pylint-plugin-utils==0.3 pylint==1.7.1 pymongo==2.9.1 pynliner==0.5.2 @@ -302,7 +302,7 @@ semantic-version==2.6.0 service-identity==17.0.0 shapely==1.2.16 shortuuid==0.5.0 -simplejson==3.15.0 +simplejson==3.16.0 singledispatch==3.4.0.3 six==1.11.0 slumber==0.7.1 diff --git a/requirements/edx/django.txt b/requirements/edx/django.txt index a2a1906690..1e68c706d8 100644 --- a/requirements/edx/django.txt +++ b/requirements/edx/django.txt @@ -1 +1 @@ -django==1.11.13 +django==1.11.14 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 2c6f8402a6..15efe4d41a 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -49,7 +49,7 @@ appdirs==1.4.3 argh==0.26.2 argparse==1.4.0 asn1crypto==0.24.0 -astroid==1.5.2 # via edx-lint, pylint, pylint-celery, pylint-plugin-utils +astroid==1.5.2 # via edx-lint, pylint, pylint-celery atomicwrites==1.1.5 # via pytest attrs==17.4.0 babel==1.3 @@ -244,7 +244,7 @@ pyjwkest==1.3.2 pyjwt==1.5.2 pylint-celery==0.3 # via edx-lint pylint-django==0.7.2 # via edx-lint -pylint-plugin-utils==0.2.6 # via pylint-celery, pylint-django +pylint-plugin-utils==0.3 # via pylint-celery, pylint-django pylint==1.7.1 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils pymongo==2.9.1 pynliner==0.5.2 @@ -290,7 +290,7 @@ semantic-version==2.6.0 service-identity==17.0.0 # via scrapy shapely==1.2.16 shortuuid==0.5.0 -simplejson==3.15.0 +simplejson==3.16.0 singledispatch==3.4.0.3 six==1.11.0 slumber==0.7.1