From 26342946670dc052869f821877a32555b6353b9e Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 23 May 2018 16:33:15 +0600 Subject: [PATCH] updated tox and travis for django 2.1 alpha1 --- .travis.yml | 5 +++++ tox.ini | 3 +++ 2 files changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index f503eb5e1..35b256be9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: - DJANGO=1.10 - DJANGO=1.11 - DJANGO=2.0 + - DJANGO=2.1 - DJANGO=master matrix: @@ -20,6 +21,7 @@ matrix: - { python: "3.6", env: DJANGO=master } - { python: "3.6", env: DJANGO=1.11 } - { python: "3.6", env: DJANGO=2.0 } + - { python: "3.6", env: DJANGO=2.1 } - { python: "2.7", env: TOXENV=lint } - { python: "2.7", env: TOXENV=docs } @@ -38,10 +40,13 @@ matrix: exclude: - { python: "2.7", env: DJANGO=master } - { python: "2.7", env: DJANGO=2.0 } + - { python: "2.7", env: DJANGO=2.1 } - { python: "3.4", env: DJANGO=master } + - { python: "3.4", env: DJANGO=2.1 } allow_failures: - env: DJANGO=master + - env: DJANGO=2.1 install: - pip install tox tox-travis diff --git a/tox.ini b/tox.ini index 4ea8ff7be..f426ac802 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,7 @@ envlist = {py27,py34,py35}-django110, {py27,py34,py35,py36}-django111, {py34,py35,py36}-django20, + {py35,py36}-django21 {py35,py36}-djangomaster, dist,lint,docs,readme, @@ -11,6 +12,7 @@ DJANGO = 1.10: django110 1.11: django111 2.0: django20 + 2.1: django21 master: djangomaster [testenv] @@ -23,6 +25,7 @@ deps = django110: Django>=1.10,<1.11 django111: Django>=1.11,<2.0 django20: Django>=2.0,<2.1 + django21: Django>=2.1a1,<2.2 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt