From 5df432b182d6bba5dfbd5f20c4009c8ed7a8e0b2 Mon Sep 17 00:00:00 2001 From: w7pea Date: Mon, 30 Jul 2018 11:21:35 -0700 Subject: [PATCH 1/4] Update the versions for travis * Removed no longer supported version of Django (1.6, 1.7, 1.9, 1.10) 1.11 is LTS * Added Django 2.0.7 explicitly * Removed Python 3.5, kept 3.6 and added 3.7 * To support those changes, updated the matrix.exclude section to match. * Removed all allow_failures which seems to be a holdover from a previous age where py3 was not well supported. --- .travis.yml | 71 ++++++++--------------------------------------------- 1 file changed, 10 insertions(+), 61 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56b0f3ec..46befbc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ language: python python: - 2.7 - - 3.5 - 3.6 + - 3.7 addons: postgresql: 9.6 @@ -14,77 +14,26 @@ addons: env: matrix: - - DJANGO_VERSION=1.6.11 DATABASE=postgres - - DJANGO_VERSION=1.6.11 DATABASE=sqlite - - DJANGO_VERSION=1.7.11 DATABASE=postgres - - DJANGO_VERSION=1.7.11 DATABASE=sqlite - - DJANGO_VERSION=1.8.18 DATABASE=postgres - - DJANGO_VERSION=1.8.18 DATABASE=sqlite - - DJANGO_VERSION=1.9.13 DATABASE=postgres - - DJANGO_VERSION=1.9.13 DATABASE=sqlite - - DJANGO_VERSION=1.10.8 DATABASE=postgres - - DJANGO_VERSION=1.10.8 DATABASE=sqlite - - DJANGO_VERSION=1.11.7 DATABASE=postgres - - DJANGO_VERSION=1.11.7 DATABASE=sqlite + - DJANGO_VERSION=1.11.14 DATABASE=postgres + - DJANGO_VERSION=1.11.14 DATABASE=sqlite + - DJANGO_VERSION=2.0.7 DATABASE=postgres + - DJANGO_VERSION=2.0.7 DATABASE=sqlite - DJANGO_VERSION=dev DATABASE=postgres - DJANGO_VERSION=dev DATABASE=sqlite matrix: exclude: - - python: 3.5 - env: DJANGO_VERSION=1.6.11 DATABASE=sqlite - - python: 3.5 - env: DJANGO_VERSION=1.6.11 DATABASE=postgres - - python: 3.5 - env: DJANGO_VERSION=1.7.11 DATABASE=sqlite - - python: 3.5 - env: DJANGO_VERSION=1.7.11 DATABASE=postgres - - python: 3.5 - env: DJANGO_VERSION=1.8.18 DATABASE=sqlite - - python: 3.5 - env: DJANGO_VERSION=1.9.13 DATABASE=sqlite - - python: 3.5 - env: DJANGO_VERSION=1.10.8 DATABASE=sqlite - - python: 3.5 - env: DJANGO_VERSION=1.11.7 DATABASE=sqlite - - python: 3.5 - env: DJANGO_VERSION=dev DATABASE=sqlite - - python: 3.6 - env: DJANGO_VERSION=1.6.11 DATABASE=sqlite - - python: 3.6 - env: DJANGO_VERSION=1.6.11 DATABASE=postgres - - python: 3.6 - env: DJANGO_VERSION=1.7.11 DATABASE=sqlite - - python: 3.6 - env: DJANGO_VERSION=1.7.11 DATABASE=postgres - - python: 3.6 - env: DJANGO_VERSION=1.8.18 DATABASE=sqlite - - python: 3.6 - env: DJANGO_VERSION=1.8.18 DATABASE=postgres - - python: 3.6 - env: DJANGO_VERSION=1.9.13 DATABASE=sqlite - - python: 3.6 - env: DJANGO_VERSION=1.9.13 DATABASE=postgres - - python: 3.6 - env: DJANGO_VERSION=1.10.8 DATABASE=sqlite - - python: 3.6 - env: DJANGO_VERSION=1.10.8 DATABASE=postgres - - python: 3.6 - env: DJANGO_VERSION=1.11.7 DATABASE=sqlite + - python: 2.7 + env: DJANGO_VERSION=2.0.7 DATABASE=sqlite + - python: 2.7 + env: DJANGO_VERSION=2.0.7 DATABASE=postgres - python: 2.7 env: DJANGO_VERSION=dev DATABASE=sqlite - python: 2.7 env: DJANGO_VERSION=dev DATABASE=postgres allow_failures: - - python: 3.5 - env: DJANGO_VERSION=dev DATABASE=sqlite - - python: 3.5 - env: DJANGO_VERSION=dev DATABASE=postgres - - python: 3.6 - env: DJANGO_VERSION=dev DATABASE=sqlite - - python: 3.6 - env: DJANGO_VERSION=dev DATABASE=postgres + before_install: - sudo apt-get update From 76c759022dce74b4add5a58ba72839ad6ca20afa Mon Sep 17 00:00:00 2001 From: w7pea Date: Mon, 30 Jul 2018 11:47:05 -0700 Subject: [PATCH 2/4] Remove pip install sqlite3 SQLITE3 was added to the standard library in Python 2.5 now that all tested version are >2.5 it should no longer be neded. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 46befbc1..de7a9c97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,6 @@ install: - sudo apt-get install -y libproj-dev libgeos-dev - if [[ $DATABASE == sqlite ]]; then sudo apt-get install -y libspatialite-dev; fi - - if [[ $DATABASE == sqlite ]]; then pip install pysqlite==2.8.2; fi - if [[ $DATABASE == postgres ]]; then pip install psycopg2; fi # This is a dependency of our Django test script From 283c692d66d8c5399d648f32baf3371a55c1f39f Mon Sep 17 00:00:00 2001 From: w7pea Date: Mon, 30 Jul 2018 12:07:45 -0700 Subject: [PATCH 3/4] PySQlite required for Py2.7 It is needed for the spatial extension support, so I made it required only for Py2.7 as it shoud not be required for Py3. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index de7a9c97..262bf993 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,7 @@ install: - sudo apt-get update -qq - sudo apt-get install -y libproj-dev libgeos-dev + - if [[ $PYTHON == 2.7 ]]; then pip install pysqlite==2.8.2; fi - if [[ $DATABASE == sqlite ]]; then sudo apt-get install -y libspatialite-dev; fi - if [[ $DATABASE == postgres ]]; then pip install psycopg2; fi From 5ff79fec32076ed1d10bd9d2ff225056c4d61e7f Mon Sep 17 00:00:00 2001 From: w7pea Date: Mon, 30 Jul 2018 12:21:23 -0700 Subject: [PATCH 4/4] Remove Py3.7 Travis does not support 3.7 yet. Tracking this in its own issue. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 262bf993..0bbccaa9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ language: python python: - 2.7 - 3.6 - - 3.7 addons: postgresql: 9.6