Skip to content

Commit

Permalink
Merge pull request #737 from bmihelac/upgrade-tox-config
Browse files Browse the repository at this point in the history
Upgrade tox configuration
  • Loading branch information
bmihelac committed Feb 13, 2018
2 parents 5794ab8 + 5022713 commit ddc1527
Showing 1 changed file with 11 additions and 64 deletions.
75 changes: 11 additions & 64 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,69 +1,16 @@
[tox]
envlist =
py{27,33,34}-1.8,
py{27,34,35}-1.9,
py{27,34,35}-dev
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},

[testenv]
commands=python {toxinidir}/tests/manage.py test core
deps = openpyxl

[testenv:py27-1.8]
basepython = python2.7
deps =
django==1.8
{[testenv]deps}

[testenv:py33-1.8]
basepython = python3.3
deps =
django==1.8
-egit+https://github.com/kennethreitz/tablib.git#egg=tablib
{[testenv]deps}

[testenv:py34-1.8]
basepython = python3.4
deps =
django==1.8
-egit+https://github.com/kennethreitz/tablib.git#egg=tablib
{[testenv]deps}

[testenv:py27-1.9]
basepython = python2.7
deps =
django==1.9
{[testenv]deps}

[testenv:py34-1.9]
basepython = python3.4
deps =
django==1.9
-egit+https://github.com/kennethreitz/tablib.git#egg=tablib
{[testenv]deps}

[testenv:py35-1.9]
basepython = python3.5
deps =
django==1.9
-egit+https://github.com/kennethreitz/tablib.git#egg=tablib
{[testenv]deps}

[testenv:py27-dev]
basepython = python2.7
deps =
https://github.com/django/django/archive/master.tar.gz
{[testenv]deps}

[testenv:py34-dev]
basepython = python3.4
deps =
https://github.com/django/django/archive/master.tar.gz
-egit+https://github.com/kennethreitz/tablib.git#egg=tablib
{[testenv]deps}

[testenv:py35-dev]
basepython = python3.5
deps =
https://github.com/django/django/archive/master.tar.gz
-egit+https://github.com/kennethreitz/tablib.git#egg=tablib
{[testenv]deps}
deps=
openpyxl==2.4.11
tablibdev: -egit+https://github.com/kennethreitz/tablib.git#egg=tablib
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
django20: Django>=2.0,<2.1

0 comments on commit ddc1527

Please sign in to comment.