diff --git a/.travis.yml b/.travis.yml index ff7c60d..b30ae91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,11 @@ env: - DJANGO="Django>=1.10,<1.11" - DJANGO="Django>=1.11,<1.12" - DJANGO="Django>=2.0,<2.1" + - DJANGO="Django>=2.1,<2.2" - DJANGO="https://github.com/django/django/archive/master.tar.gz" install: - pip install -q $DJANGO - - pip install -e git+https://github.com/kennethreitz/tablib.git#egg=tablib + - pip install tablib==0.12.1 - pip install -r requirements/base.txt - pip install coveralls script: @@ -32,14 +33,20 @@ matrix: env: DJANGO="https://github.com/django/django/archive/master.tar.gz" - python: "2.7" env: DJANGO="Django>=2.0,<2.1" + - python: "2.7" + env: DJANGO="Django>=2.1,<2.2" - python: "3.3" env: DJANGO="Django>=1.11,<1.12" - python: "3.3" env: DJANGO="https://github.com/django/django/archive/master.tar.gz" - python: "3.3" env: DJANGO="Django>=2.0,<2.1" + - python: "3.3" + env: DJANGO="Django>=2.1,<2.2" - python: "3.4" env: DJANGO="https://github.com/django/django/archive/master.tar.gz" + - python: "3.4" + env: DJANGO="Django>=2.1,<2.2" - python: "3.6" env: DJANGO="Django>=1.8,<1.9" - python: "3.6" diff --git a/tox.ini b/tox.ini index 4331f59..8a0034b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,17 @@ [tox] envlist = - py{27,33,34,35}-django{18}-tablib{dev}, - py{27,34,35}-django{19,110}-tablib{dev}, - py{27,34,35,36}-django{111}-tablib{dev}, - py{34,35,36}-django{20}-tablib{dev}, - py{35,36,37}-django{21}-tablib{dev}, + py{27,33,34,35}-django{18}-tablib{dev,stable}, + py{27,34,35}-django{19,110}-tablib{dev,stable}, + py{27,34,35,36}-django{111}-tablib{dev,stable}, + py{34,35,36}-django{20}-tablib{dev,stable}, + py{35,36,37}-django{21}-tablib{dev,stable}, [testenv] commands=python {toxinidir}/tests/manage.py test core deps= openpyxl==2.4.11 tablibdev: -egit+https://github.com/kennethreitz/tablib.git#egg=tablib + tablibstable: tablib==0.12.1 django18: Django>=1.8,<1.9 django19: Django>=1.9,<1.10 django110: Django>=1.10,<1.11