Merge 5ff79fe into d10a1d1

makinacorpus · Jul 30, 2018 · 89c569e · 89c569e
2 parents d10a1d1 + 5ff79fe
commit 89c569e
Showing 1 changed file with 10 additions and 62 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: python
 
 python:
   - 2.7
-  - 3.5
   - 3.6
 
 addons:
@@ -14,77 +13,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
@@ -94,8 +42,8 @@ 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 == 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