From 2d3d098a5ff23c6a2740db49a9a7a73f03b0352b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20R=2E=20Sede=C3=B1o?= Date: Mon, 14 Jan 2019 17:35:26 -0500 Subject: [PATCH] Update test versions Django < 1.11 is no longer supported by Django or Haystack Test against latest versions of Django 1.11, 2.0, 2.1. Test against python 2.7 (django 1.11 only), 3.5, 3.6, 3.7 (on xenial). Update xapian old-stable to 1.2.25, only for py27. Update xapian old-dev to 1.3.6, only for py27, py34. Update xapian stable to 1.4.9. xapian 1.3.6 included just to keep coverage numbers up. xapian 1.3.7 not included because it didn't build with install-xapian.sh. --- .travis.yml | 56 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7de3070..82daae2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,36 +3,44 @@ language: python matrix: include: + - python: 3.7 + env: DJANGO_VERSION=">=2.1,<2.2" XAPIAN_VERSION=1.4.9 + dist: xenial + sudo: true + - python: 3.7 + env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9 + dist: xenial + sudo: true + - python: 3.7 + env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9 + dist: xenial + sudo: true + - python: 3.6 + env: DJANGO_VERSION=">=2.1,<2.2" XAPIAN_VERSION=1.4.9 + - python: 3.6 + env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9 + - python: 3.6 + env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9 + - python: 3.5 + env: DJANGO_VERSION=">=2.1,<2.2" XAPIAN_VERSION=1.4.9 + - python: 3.5 + env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9 + - python: 3.5 + env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9 - python: 3.4 - env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.4.1 + env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9 - python: 3.4 - env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.4.1 + env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9 - python: 3.4 - env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.4.1 + env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.3.6 - python: 3.4 - env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.3.3 - - python: 3.4 - env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.3.3 - - python: 3.4 - env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.3.3 + env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.3.6 - python: 2.7 - env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.4.1 + env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9 - python: 2.7 - env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.4.1 + env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.3.6 - python: 2.7 - env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.4.1 - - python: 2.7 - env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.3.3 - - python: 2.7 - env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.3.3 - - python: 2.7 - env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.3.3 - - python: 2.7 - env: DJANGO_VERSION=1.10 XAPIAN_VERSION=1.2.24 - - python: 2.7 - env: DJANGO_VERSION=1.9 XAPIAN_VERSION=1.2.24 - - python: 2.7 - env: DJANGO_VERSION=1.8 XAPIAN_VERSION=1.2.24 + env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.2.25 addons: apt: @@ -48,7 +56,7 @@ install: # install Xapian - CXX=g++-4.8 ./install_xapian.sh $XAPIAN_VERSION - - pip install Django==$DJANGO_VERSION + - pip install "Django${DJANGO_VERSION}" - pip install coveralls # install Django haystack