From c3201037ef44d9e3074a8adbcedd30ea5436f85f Mon Sep 17 00:00:00 2001 From: Claudio Omar Melendrez Baeza Date: Sun, 12 Mar 2017 15:17:28 -0300 Subject: [PATCH 1/4] Add Python 3.6+Django 1.10 to build --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 61310b5..06f6ad2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,11 @@ [tox] -envlist = py{27,34,35}-dj{18,19} +envlist = py{27,34,35,36}-dj{18,19,110} [testenv] deps = dj18: django==1.8 dj19: django==1.9 + dj110: django==1.10 py27: mock factory_boy coverage From a5ad898e5c6b2d0247081a1975bdc49d2e3c5f6e Mon Sep 17 00:00:00 2001 From: Claudio Omar Melendrez Baeza Date: Sun, 12 Mar 2017 15:22:34 -0300 Subject: [PATCH 2/4] Change main python version to 3.6 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d4036ad..067babd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,12 @@ branches: # Build definition; language, deps, scripts language: python python: - - "3.5" + - "3.6" install: - pip install -r requirements/dev.txt - - pip install coveralls script: - tox after_success: + - pip install coveralls - coveralls - coverage erase From b0e3569d01b6ac0d1388373ab611d2538acdaa62 Mon Sep 17 00:00:00 2001 From: Claudio Omar Melendrez Baeza Date: Sun, 12 Mar 2017 15:25:25 -0300 Subject: [PATCH 3/4] Add 3.5 as well (test) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 067babd..09a4d86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ branches: # Build definition; language, deps, scripts language: python python: + - "3.5" - "3.6" install: - pip install -r requirements/dev.txt From e33e6d60fd6352a873edd7572359427a084bbb30 Mon Sep 17 00:00:00 2001 From: Claudio Omar Melendrez Baeza Date: Sun, 12 Mar 2017 15:45:48 -0300 Subject: [PATCH 4/4] Attempt using travis env var --- .travis.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09a4d86..140fd4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,17 @@ branches: # Build definition; language, deps, scripts language: python python: - - "3.5" - - "3.6" + - 2.7 + - 3.4 + - 3.5 + - 3.6 install: - pip install -r requirements/dev.txt script: - - tox + - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then tox -e py27-dj18,py27-dj19,py27-dj110; fi + - if [[ $TRAVIS_PYTHON_VERSION == 3.4 ]]; then tox -e py34-dj18,py34-dj19,py34-dj110; fi + - if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then tox -e py35-dj18,py35-dj19,py35-dj110; fi + - if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then tox -e py36-dj18,py36-dj19,py36-dj110; fi after_success: - pip install coveralls - coveralls - - coverage erase