Skip to content

Commit

Permalink
Use Django 1.7 final release in tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
zlorf committed Sep 7, 2014
1 parent 8047a4d commit 7067577
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ env:
- DJANGO=1.6 DB=sqlite
- DJANGO=1.6 DB=postgres
- DJANGO=1.6 DB=mysql
- DJANGO=https://www.djangoproject.com/download/1.7c2/tarball DB=sqlite
- DJANGO=https://www.djangoproject.com/download/1.7c2/tarball DB=postgres
- DJANGO=https://www.djangoproject.com/download/1.7c2/tarball DB=mysql
- DJANGO=1.7 DB=sqlite
- DJANGO=1.7 DB=postgres
- DJANGO=1.7 DB=mysql
matrix:
exclude:
- python: "3.2"
Expand All @@ -40,11 +40,11 @@ matrix:
env: DJANGO=1.4 DB=mysql

- python: "2.6"
env: DJANGO=https://www.djangoproject.com/download/1.7c2/tarball DB=sqlite
env: DJANGO=1.7 DB=sqlite
- python: "2.6"
env: DJANGO=https://www.djangoproject.com/download/1.7c2/tarball DB=postgres
env: DJANGO=1.7 DB=postgres
- python: "2.6"
env: DJANGO=https://www.djangoproject.com/download/1.7c2/tarball DB=mysql
env: DJANGO=1.7 DB=mysql

- python: "3.2"
env: DJANGO=1.5 DB=mysql
Expand All @@ -59,11 +59,11 @@ matrix:
- python: "3.4"
env: DJANGO=1.6 DB=mysql
- python: "3.2"
env: DJANGO=https://www.djangoproject.com/download/1.7c2/tarball DB=mysql
env: DJANGO=1.7 DB=mysql
- python: "3.3"
env: DJANGO=https://www.djangoproject.com/download/1.7c2/tarball DB=mysql
env: DJANGO=1.7 DB=mysql
- python: "3.4"
env: DJANGO=https://www.djangoproject.com/download/1.7c2/tarball DB=mysql
env: DJANGO=1.7 DB=mysql
before_install:
- pip install -q flake8 --use-mirrors
- PYFLAKES_NODOCTEST=1 flake8 --max-line-length=100 modeltranslation
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ commands =
[testenv:py33-1.7.X]
basepython = python3.3
deps =
https://www.djangoproject.com/download/1.7.b4/tarball
Django>=1.7,<1.8
Pillow

[testenv:py32-1.7.X]
basepython = python3.2
deps =
https://www.djangoproject.com/download/1.7.b4/tarball
Django>=1.7,<1.8
Pillow

[testenv:py27-1.7.X]
basepython = python2.7
deps =
https://www.djangoproject.com/download/1.7.b4/tarball
Django>=1.7,<1.8
Pillow

[testenv:py33-1.6.X]
Expand Down

0 comments on commit 7067577

Please sign in to comment.