Skip to content
This repository has been archived by the owner on Feb 1, 2024. It is now read-only.

Upgrade Django to 2.2 and upgrade Django-related libraries to latest versions #676

Merged
merged 1 commit into from
Jul 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/django/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/django/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/django/oar/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
),
'DEFAULT_PAGINATION_CLASS': 'api.pagination.PageAndSizePagination',
'PAGE_SIZE': 20,
'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.coreapi.AutoSchema',
}

SWAGGER_SETTINGS = {
Expand Down
14 changes: 7 additions & 7 deletions src/django/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down