Skip to content

Add Django 2.2 support #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 24, 2019
Merged

Add Django 2.2 support #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10214cb
Add Django 2.2 support
sliverc May 24, 2019
77176f3
Merge branch 'master' into dj22
sliverc May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ matrix:
- env: TOXENV=py35-df20-django21-drfmaster
- env: TOXENV=py36-df20-django21-drfmaster
- env: TOXENV=py37-df20-django21-drfmaster
- env: TOXENV=py35-df20-django22-drfmaster
- env: TOXENV=py36-df20-django22-drfmaster
- env: TOXENV=py37-df20-django22-drfmaster

include:
- python: 3.6
Expand Down Expand Up @@ -58,6 +61,12 @@ matrix:
env: TOXENV=py35-df20-django21-drf39
- python: 3.5
env: TOXENV=py35-df20-django21-drfmaster
- python: 3.5
dist: xenial
env: TOXENV=py35-df20-django22-drf39
- python: 3.5
dist: xenial
env: TOXENV=py35-df20-django22-drfmaster

- python: 3.6
env: TOXENV=py36-df20-django111-drf36
Expand All @@ -77,6 +86,12 @@ matrix:
env: TOXENV=py36-df20-django21-drf39
- python: 3.6
env: TOXENV=py36-df20-django21-drfmaster
- python: 3.6
dist: xenial
env: TOXENV=py36-df20-django22-drf39
- python: 3.6
dist: xenial
env: TOXENV=py36-df20-django22-drfmaster

- python: 3.7
dist: xenial
Expand All @@ -94,6 +109,14 @@ matrix:
dist: xenial
sudo: required
env: TOXENV=py37-df20-django21-drfmaster
- python: 3.7
dist: xenial
sudo: required
env: TOXENV=py37-df20-django22-drf39
- python: 3.7
dist: xenial
sudo: required
env: TOXENV=py37-df20-django22-drfmaster
install:
- pip install tox
script:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ any parts of the framework not mentioned in the documentation should generally b

## [Unreleased]

### Added

* Add support for Django 2.2

### Fixed

* Avoid exception when trying to include skipped relationship
Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Requirements
------------

1. Python (2.7, 3.4, 3.5, 3.6, 3.7)
2. Django (1.11, 2.0, 2.1)
2. Django (1.11, 2.0, 2.1, 2.2)
3. Django REST Framework (3.6, 3.7, 3.8, 3.9)

------------
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ like the following:
## Requirements

1. Python (2.7, 3.4, 3.5, 3.6, 3.7)
2. Django (1.11, 2.0, 2.1)
2. Django (1.11, 2.0, 2.1, 2.2)
3. Django REST Framework (3.6, 3.7, 3.8, 3.9)

## Installation
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ def get_package_data(package):
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Software Development :: Libraries :: Application Frameworks',
'Topic :: Software Development :: Libraries :: Python Modules',
Expand Down
1 change: 1 addition & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ deps =
django111: Django>=1.11,<1.12
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
drf36: djangorestframework>=3.6.3,<3.7
drf37: djangorestframework>=3.7.0,<3.8
drf38: djangorestframework>=3.8.0,<3.9
Expand Down