Skip to content

Commit

Permalink
Test against Django 1.7 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Bouke committed Jan 29, 2015
1 parent bfb4b3f commit 555144f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ matrix:
env: DJANGO=1.6

- python: "2.7"
env: DJANGO=1.7.b4
env: DJANGO=1.7
- python: "3.4"
env: DJANGO=1.7.b4 COVERAGE=YES
env: DJANGO=1.7 COVERAGE=YES

- python: "3.4"
env: FLAKE8=YES
Expand All @@ -27,7 +27,7 @@ install:
- if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install unittest2; fi
- if [[ $DJANGO ]]; then
pip install -e .;
if [[ $DJANGO != 1.7* ]]; then
if [[ $DJANGO != 1.8* ]]; then
pip install "django>=$DJANGO,<=$DJANGO.99";
else
pip install https://www.djangoproject.com/download/$DJANGO/tarball/;
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -98,25 +98,25 @@ deps =
[testenv:py27-django17]
basepython = python2.7
deps =
https://www.djangoproject.com/download/1.7b1/tarball/
Django>=1.7,<1.8
{[testenv]deps}

[testenv:py32-django17]
basepython = python3.2
deps =
https://www.djangoproject.com/download/1.7b1/tarball/
Django>=1.7,<1.8
{[testenv]deps}

[testenv:py33-django17]
basepython = python3.3
deps =
https://www.djangoproject.com/download/1.7b1/tarball/
Django>=1.7,<1.8
{[testenv]deps}

[testenv:py34-django17]
basepython = python3.4
deps =
https://www.djangoproject.com/download/1.7b1/tarball/
Django>=1.7,<1.8
{[testenv]deps}

[testenv:flake8]
Expand Down

0 comments on commit 555144f

Please sign in to comment.