Skip to content
This repository has been archived by the owner on Oct 25, 2022. It is now read-only.

Commit

Permalink
Actually run tests using tox.
Browse files Browse the repository at this point in the history
On Travis, run 1.4 directly, to avoid strange translation issue.
  • Loading branch information
dracos committed Jun 23, 2015
1 parent 951fb15 commit 0e4e559
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ matrix:
install:
- pip install tox
- 'if [ $TOXENV != "flake8" ]; then .travis/install; fi'
- 'if [ $TOXENV == "py27-1.4" ]; then pip install "Django>=1.4,<1.5"; fi'
- 'if [ $TOXENV == "py27-1.4" ]; then pip install -e .; fi'
before_script:
- 'if [ $TOXENV != "flake8" ]; then .travis/before_script; fi'
script:
- tox
- 'if [ $TOXENV == "py27-1.4" ]; then python -Wall manage.py test mapit mapit_gb; fi'
- 'if [ $TOXENV != "py27-1.4" ]; then tox; fi'
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ envlist = flake8, py27-1.4, py{27,32}-{1.7,1.8,1.9}
[testenv]
commands =
flake8: flake8 mapit mapit_gb mapit_global mapit_it mapit_no mapit_za project
py: python -Wall manage.py test mapit mapit_gb
py{27,32}: python -Wall manage.py test mapit mapit_gb
deps =
flake8: flake8
1.4: Django>=1.4,<1.5
Expand Down

0 comments on commit 0e4e559

Please sign in to comment.