Skip to content

Commit

Permalink
Switch tests to Django 1.10 by default
Browse files Browse the repository at this point in the history
Signed-off-by: Michal Čihař <michal@cihar.com>
  • Loading branch information
nijel committed Aug 5, 2016
1 parent 3fa0ca2 commit cbbcb2c
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Expand Up @@ -12,12 +12,12 @@ python:
# build matrix configuration
env:
matrix:
- CI_PIP_DEPS="Django>=1.9,<1.10" CI_MODE=setup
- CI_PIP_DEPS="Django>=1.9,<1.10" CI_DATABASE=mysql
- CI_PIP_DEPS="Django>=1.9,<1.10" CI_DATABASE=postgresql
- CI_PIP_DEPS="Django>=1.10,<1.11"
- CI_PIP_DEPS="Django>=1.10,<1.11" CI_MODE=setup
- CI_PIP_DEPS="Django>=1.10,<1.11" CI_DATABASE=mysql
- CI_PIP_DEPS="Django>=1.10,<1.11" CI_DATABASE=postgresql
- CI_PIP_DEPS="Django>=1.9,<1.10"
- CI_PIP_DEPS="--pre Django>=1.10rc1,<1.11"
- CI_PIP_DEPS="Django>=1.9,<1.10" CI_DATABASE=postgresql CI_MODE=selenium
- CI_PIP_DEPS="Django>=1.10,<1.11" CI_DATABASE=postgresql CI_MODE=selenium
global:
- DJANGO_SETTINGS_MODULE=weblate.settings_test
- CI_REQUIREMENTS=travis
Expand All @@ -43,7 +43,7 @@ notifications:
matrix:
include:
- python: "3.5"
env: CI_PIP_DEPS="Django>=1.9,<1.10"
env: CI_PIP_DEPS="Django>=1.10,<1.11"
addons:
apt:
packages:
Expand Down

0 comments on commit cbbcb2c

Please sign in to comment.