Update build configurations.

This commit is contained in:
Jacek Tomaszewski 2014-06-08 23:58:53 +02:00
parent ad48582270
commit 5c014bfd0b
2 changed files with 38 additions and 2 deletions

View file

@ -14,6 +14,9 @@ env:
- DJANGO=1.6 DB=sqlite
- DJANGO=1.6 DB=postgres
- DJANGO=1.6 DB=mysql
- DJANGO=https://www.djangoproject.com/download/1.7.b4/tarball DB=sqlite
- DJANGO=https://www.djangoproject.com/download/1.7.b4/tarball DB=postgres
- DJANGO=https://www.djangoproject.com/download/1.7.b4/tarball DB=mysql
matrix:
exclude:
- python: "3.2"
@ -29,6 +32,13 @@ matrix:
- python: "3.3"
env: DJANGO=1.4 DB=mysql
- python: "2.6"
env: DJANGO=https://www.djangoproject.com/download/1.7.b4/tarball DB=sqlite
- python: "2.6"
env: DJANGO=https://www.djangoproject.com/download/1.7.b4/tarball DB=postgres
- python: "2.6"
env: DJANGO=https://www.djangoproject.com/download/1.7.b4/tarball DB=mysql
- python: "3.2"
env: DJANGO=1.5 DB=mysql
- python: "3.3"
@ -37,15 +47,20 @@ matrix:
env: DJANGO=1.6 DB=mysql
- python: "3.3"
env: DJANGO=1.6 DB=mysql
before_script:
- python: "3.2"
env: DJANGO=https://www.djangoproject.com/download/1.7.b4/tarball DB=mysql
- python: "3.3"
env: DJANGO=https://www.djangoproject.com/download/1.7.b4/tarball DB=mysql
before_install:
- pip install -q flake8 --use-mirrors
- PYFLAKES_NODOCTEST=1 flake8 --max-line-length=100 modeltranslation
before_script:
- mysql -e 'create database modeltranslation;'
- psql -c 'create database modeltranslation;' -U postgres
install:
- if [[ $DB == mysql ]]; then pip install -q mysql-python --use-mirrors; fi
- if [[ $DB == postgres ]]; then pip install -q psycopg2 --use-mirrors; fi
- pip install -q Pillow --use-mirrors
- pip install -q flake8 --use-mirrors
- IDJANGO=$(./travis.py $DJANGO)
- pip install -q $IDJANGO
- pip install -e . --use-mirrors

21
tox.ini
View file

@ -1,6 +1,9 @@
[tox]
distribute = False
envlist =
py33-1.7.X,
py32-1.7.X,
py27-1.7.X,
py33-1.6.X,
py32-1.6.X,
py27-1.6.X,
@ -19,6 +22,24 @@ commands =
{envpython} runtests.py
[testenv:py33-1.7.X]
basepython = python3.3
deps =
https://www.djangoproject.com/download/1.7.b4/tarball
Pillow
[testenv:py32-1.7.X]
basepython = python3.2
deps =
https://www.djangoproject.com/download/1.7.b4/tarball
Pillow
[testenv:py27-1.7.X]
basepython = python2.7
deps =
https://www.djangoproject.com/download/1.7.b4/tarball
Pillow
[testenv:py33-1.6.X]
basepython = python3.3
deps =