From 6ebe6be698aaa384c18cfeb83bf5704c33b48919 Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Mon, 15 Jul 2019 15:29:47 -0400 Subject: [PATCH] Upgrade Django to 2.2 along with some related libs - Upgrade Django to 2.2 - Upgrade some django-related libraries to the latest versions - Adjust `DEFAULT_SCHEMA_SETTING` for Django-REST-Framework so that we continue to use CoreAPI rather than OpenAPI --- CHANGELOG.md | 1 + src/django/Dockerfile | 2 +- src/django/api/views.py | 2 +- src/django/oar/settings.py | 1 + src/django/requirements.txt | 14 +++++++------- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3cff8ab0..c6d05438e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added ### Changed +- Upgrade Django to 2.2, along with upgrading some related libraries [#676](https://github.com/open-apparel-registry/open-apparel-registry/pull/676) ### Deprecated diff --git a/src/django/Dockerfile b/src/django/Dockerfile index 0a8ec796d..429bca2c1 100644 --- a/src/django/Dockerfile +++ b/src/django/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/azavea/django:2.0-python3.7-slim +FROM quay.io/azavea/django:2.2-python3.7-slim RUN mkdir -p /usr/local/src WORKDIR /usr/local/src diff --git a/src/django/api/views.py b/src/django/api/views.py index 686e0369b..94b535485 100644 --- a/src/django/api/views.py +++ b/src/django/api/views.py @@ -32,7 +32,7 @@ from rest_framework.permissions import AllowAny, IsAdminUser from rest_framework.response import Response from rest_framework.filters import BaseFilterBackend -from rest_framework.schemas.inspectors import AutoSchema +from rest_framework.schemas.coreapi import AutoSchema from rest_framework_swagger.renderers import OpenAPIRenderer, SwaggerUIRenderer from rest_auth.views import LoginView, LogoutView from allauth.account.models import EmailAddress diff --git a/src/django/oar/settings.py b/src/django/oar/settings.py index 462d7d123..897f34606 100644 --- a/src/django/oar/settings.py +++ b/src/django/oar/settings.py @@ -137,6 +137,7 @@ ), 'DEFAULT_PAGINATION_CLASS': 'api.pagination.PageAndSizePagination', 'PAGE_SIZE': 20, + 'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.coreapi.AutoSchema', } SWAGGER_SETTINGS = { diff --git a/src/django/requirements.txt b/src/django/requirements.txt index 60b816017..8c02ae88c 100644 --- a/src/django/requirements.txt +++ b/src/django/requirements.txt @@ -3,18 +3,18 @@ boto3==1.9.92 coreapi==2.3.3 dedupe==1.9.4 defusedxml==0.6.0 -django-amazon-ses==2.0.0 -django-ecsmanage==1.0.1 -django-extensions==2.1.4 +django-amazon-ses==2.1.1 +django-ecsmanage==1.1.0 +django-extensions==2.1.9 django-jsonview==1.2.0 -django-rest-auth[with_social]==0.9.3 +django-rest-auth[with_social]==0.9.5 django-rest-swagger==2.1.2 django-simple-history==2.7.2 django-spa==0.2.0 -django-waffle==0.16.0 -django-watchman==0.15.0 +django-waffle==0.17.0 +django-watchman==0.17.0 djangorestframework-gis==0.14 -djangorestframework==3.9.4 +djangorestframework==3.10.1 flake8==3.6.0 mccabe==0.6.1 pycodestyle==2.4.0