Skip to content

Commit c6bad8f

Browse files
authored
Merge pull request jazzband#36 from felixxm/django-2.1
Added Django 2.1 to supported versions.
2 parents 75559f4 + 519206f commit c6bad8f

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ sudo: false
1313
env:
1414
- DJANGO=1.11
1515
- DJANGO=2.0
16+
- DJANGO=2.1
1617
- DJANGO=master
1718

1819
matrix:
@@ -23,10 +24,14 @@ matrix:
2324
exclude:
2425
- python: "2.7"
2526
env: DJANGO=2.0
27+
- python: "2.7"
28+
env: DJANGO=2.1
2629
- python: "2.7"
2730
env: DJANGO=master
2831
- python: "3.4"
2932
env: DJANGO=master
33+
- python: "3.4"
34+
env: DJANGO=2.1
3035
- python: "3.5"
3136
env: DJANGO=master
3237
allow_failures:

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Requirements
2222
------------
2323

2424
* Python (2.7, 3.4, 3.5, 3.6)
25-
* Django (1.11, 2.0)
25+
* Django (1.11, 2.0, 2.1)
2626
* Django REST Framework (3.5, 3.6, 3.7, 3.8)
2727

2828
These are the officially supported python and package versions. Other versions

tox.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ addopts=--tb=short
55
envlist =
66
py{27,34,35,36}-django111-drf{35,36,37,38},
77
py{34,35,36}-django20-drf{37,38},
8-
py36-djangomaster-drf38,
8+
py36-django{21,master}-drf38,
99
lint
1010

1111
[travis:env]
1212
DJANGO =
1313
1.11: django111
1414
2.0: django20
15+
2.1: django21
1516
master: djangomaster
1617

1718
[testenv]
@@ -21,6 +22,7 @@ setenv =
2122
deps =
2223
django111: Django>=1.11,<2.0
2324
django20: Django>=2.0,<2.1
25+
django21: Django>=2.1,<2.2
2426
djangomaster: https://github.com/django/django/archive/master.tar.gz
2527
drf35: djangorestframework>=3.5,<3.6
2628
drf36: djangorestframework>=3.6,<3.7

0 commit comments

Comments
 (0)