From 4c4d75127869346a1caa2406a3ae70dc830220e9 Mon Sep 17 00:00:00 2001 From: bee-keeper Date: Mon, 27 Mar 2017 09:45:26 +0100 Subject: [PATCH 1/6] adds testing for 1.10 and 1.11 --- .travis.yml | 47 +++++++++++++++++++++++++++++++++++++---------- tox.ini | 5 +++-- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0cfd59..7e531bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,30 +5,57 @@ env: - TOX_ENV=py27-django17-backendBasic - TOX_ENV=py27-django18-backendBasic - TOX_ENV=py27-django19-backendBasic + - TOX_ENV=py27-django110-backendBasic + - TOX_ENV=py27-django111-backendBasic + - TOX_ENV=py33-django17-backendBasic - TOX_ENV=py33-django18-backendBasic + - TOX_ENV=py34-django17-backendBasic - TOX_ENV=py34-django18-backendBasic - TOX_ENV=py34-django19-backendBasic + - TOX_ENV=py34-django110-backendBasic + - TOX_ENV=py34-django111-backendBasic + + - TOX_ENV=py35-django17-backendBasic + - TOX_ENV=py35-django18-backendBasic + - TOX_ENV=py35-django19-backendBasic + - TOX_ENV=py35-django110-backendBasic + - TOX_ENV=py35-django111-backendBasic + - TOX_ENV=py27-django17-backendAllauth - TOX_ENV=py27-django18-backendAllauth - TOX_ENV=py27-django19-backendAllauth + - TOX_ENV=py27-django110-backendAllauth + - TOX_ENV=py27-django111-backendAllauth + - TOX_ENV=py33-django17-backendAllauth - TOX_ENV=py33-django18-backendAllauth + - TOX_ENV=py34-django17-backendAllauth - TOX_ENV=py34-django18-backendAllauth - TOX_ENV=py34-django19-backendAllauth + - TOX_ENV=py34-django110-backendAllauth + - TOX_ENV=py34-django111-backendAllauth + + - TOX_ENV=py35-django17-backendAllauth + - TOX_ENV=py35-django18-backendAllauth + - TOX_ENV=py35-django19-backendAllauth + - TOX_ENV=py35-django110-backendAllauth + - TOX_ENV=py35-django111-backendAllauth + - TOX_ENV=flake8 -matrix: - include: - - python: "3.5" - env: TOX_ENV=py35-django18-backendBasic - - python: "3.5" - env: TOX_ENV=py35-django18-backendAllauth - - python: "3.5" - env: TOX_ENV=py35-django19-backendBasic - - python: "3.5" - env: TOX_ENV=py35-django19-backendAllauth + +# matrix: +# include: +# - python: "3.5" +# env: TOX_ENV=py35-django18-backendBasic +# - python: "3.5" +# env: TOX_ENV=py35-django18-backendAllauth +# - python: "3.5" +# env: TOX_ENV=py35-django19-backendBasic +# - python: "3.5" +# env: TOX_ENV=py35-django19-backendAllauth install: - pip install tox diff --git a/tox.ini b/tox.ini index c8cd05e..eb17df4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{27,33,34,35}-django{16,17,18,19}-backend{Basic,Allauth} +envlist = py{27,33,34,35}-django{16,17,18,19,1.10,1.11}-backend{Basic,Allauth} [testenv] deps = @@ -7,7 +7,8 @@ deps = django17: Django<1.8 django18: Django<1.9 django19: Django<1.10 - django10: Django<1.11 + django110: Django<1.11 + django111: Django<2 backendAllauth: django-allauth commands = python -V From 0baa0009a7de482fc34e1d38c28aff4b4350462e Mon Sep 17 00:00:00 2001 From: bee-keeper Date: Mon, 27 Mar 2017 10:30:30 +0100 Subject: [PATCH 2/6] fix up tox with py35 --- .travis.yml | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e531bb..79f0132 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,16 +46,24 @@ env: - TOX_ENV=flake8 -# matrix: -# include: -# - python: "3.5" -# env: TOX_ENV=py35-django18-backendBasic -# - python: "3.5" -# env: TOX_ENV=py35-django18-backendAllauth -# - python: "3.5" -# env: TOX_ENV=py35-django19-backendBasic -# - python: "3.5" -# env: TOX_ENV=py35-django19-backendAllauth +matrix: + include: + - python: "3.5" + env: TOX_ENV=py35-django18-backendBasic + - python: "3.5" + env: TOX_ENV=py35-django19-backendBasic + - python: "3.5" + env: TOX_ENV=py35-django110-backendBasic + - python: "3.5" + env: TOX_ENV=py35-django110-backendBasic + - python: "3.5" + env: TOX_ENV=py35-django18-backendAllauth + - python: "3.5" + env: TOX_ENV=py35-django19-backendAllauth + - python: "3.5" + env: TOX_ENV=py35-django110-backendAllauth + - python: "3.5" + env: TOX_ENV=py35-django111-backendAllauth install: - pip install tox From 2b4651b7ed8aac19a656148d5f9a0aa6389bb219 Mon Sep 17 00:00:00 2001 From: bee-keeper Date: Mon, 27 Mar 2017 11:15:31 +0100 Subject: [PATCH 3/6] travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 79f0132..e69811c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ matrix: env: TOX_ENV=py35-django18-backendAllauth - python: "3.5" env: TOX_ENV=py35-django19-backendAllauth - - python: "3.5" + - python: "3.5" env: TOX_ENV=py35-django110-backendAllauth - python: "3.5" env: TOX_ENV=py35-django111-backendAllauth From 98a58dfb216fb989d200f618eb406b37f40ade2f Mon Sep 17 00:00:00 2001 From: bee-keeper Date: Mon, 27 Mar 2017 11:45:35 +0100 Subject: [PATCH 4/6] travis --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index e69811c..4e00076 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ language: python +python: + - "2.7" + - "3.3" + - "3.4" + - "3.5" env: matrix: From 19188a82e93ab17f830bc5ef55a70c3996dd7471 Mon Sep 17 00:00:00 2001 From: bee-keeper Date: Mon, 27 Mar 2017 12:00:55 +0100 Subject: [PATCH 5/6] travis --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e00076..38c8d13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ language: python -python: - - "2.7" - - "3.3" - - "3.4" - - "3.5" +python: 3.5 env: matrix: From 807442ef0eb86bc5f8ee42d8caa0d903609cc710 Mon Sep 17 00:00:00 2001 From: bee-keeper Date: Mon, 27 Mar 2017 13:17:16 +0100 Subject: [PATCH 6/6] remove py3.5 for django 1.7 --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38c8d13..5b96459 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ env: - TOX_ENV=py34-django110-backendBasic - TOX_ENV=py34-django111-backendBasic - - TOX_ENV=py35-django17-backendBasic - TOX_ENV=py35-django18-backendBasic - TOX_ENV=py35-django19-backendBasic - TOX_ENV=py35-django110-backendBasic @@ -39,7 +38,6 @@ env: - TOX_ENV=py34-django110-backendAllauth - TOX_ENV=py34-django111-backendAllauth - - TOX_ENV=py35-django17-backendAllauth - TOX_ENV=py35-django18-backendAllauth - TOX_ENV=py35-django19-backendAllauth - TOX_ENV=py35-django110-backendAllauth