Skip to content

Commit

Permalink
Removed prerelease builds from build matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
macro1 committed Apr 3, 2015
1 parent 71a7627 commit 4d296c3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
15 changes: 7 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ python:
env:
- DJANGO="Django>=1.4,<1.5"
- DJANGO="Django>=1.6,<1.7"
- DJANGO="Django>=1.7,<1.8a"
- DJANGO="Django>=1.8a,<1.9"
- DJANGO="Django>=1.7,<1.8"
- DJANGO="Django>=1.8,<1.9"

install:
- pip install -U coverage coveralls
- pip install --pre -U $DJANGO
- pip install -U coverage coveralls $DJANGO
- python -c 'from __future__ import print_function; import django; print("Django " + django.get_version())'

script: coverage run -a setup.py test
Expand All @@ -24,18 +23,18 @@ matrix:
- python: 2.6
env: DJANGO="Django>=1.6,<1.7"
- python: 2.6
env: DJANGO="Django>=1.7,<1.8a"
env: DJANGO="Django>=1.7,<1.8"
- python: 2.6
env: DJANGO="Django>=1.8a,<1.9"
env: DJANGO="Django>=1.8,<1.9"
- python: 3.2
env: DJANGO="Django>=1.4,<1.5"
- python: 3.3
env: DJANGO="Django>=1.4,<1.5"

include:
- python: 3.4
env: DJANGO="Django>=1.7,<1.8a"
env: DJANGO="Django>=1.7,<1.8"
- python: 3.4
env: DJANGO="Django>=1.8a,<1.9"
env: DJANGO="Django>=1.8,<1.9"

after_success: coveralls
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ deps =
py26: unittest2
django14: Django>=1.4,<1.5
django16: Django>=1.6,<1.7
django17: Django>=1.7,<1.8a
django18: Django>=1.8a,<1.9a
django17: Django>=1.7,<1.8
django18: Django>=1.8,<1.9
djangotrunk: https://github.com/django/django/tarball/master
commands = coverage run -a --branch setup.py test

0 comments on commit 4d296c3

Please sign in to comment.