Skip to content

Commit

Permalink
QA configs updated.
Browse files Browse the repository at this point in the history
  • Loading branch information
idlesign committed Nov 13, 2015
1 parent a3a59f2 commit f9b8dca
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 deletions.
14 changes: 9 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
language: python

python:
- 3.5
- 3.4
- 3.3
- 2.7
- 2.6

env:
- DJANGO="Django>=1.8,<1.9"
- DJANGO="Django==1.9b1"
- DJANGO="Django>=1.8.6,<1.9"
- DJANGO="Django>=1.7,<1.8"
- DJANGO="Django>=1.6,<1.7"
- DJANGO="Django>=1.4,<1.5"
Expand All @@ -20,22 +22,24 @@ script: coverage run -a --source=sitetree sitetree/runtests.py
matrix:

exclude:
- python: 3.4
env: DJANGO="Django>=1.4,<1.5"
- python: 3.3
env: DJANGO="Django>=1.4,<1.5"
- python: 2.6
env: DJANGO="Django>=1.8,<1.9"
env: DJANGO="Django>=1.8.6,<1.9"
- python: 2.6
env: DJANGO="Django>=1.7,<1.8"
- python: 2.6
env: DJANGO="Django>=1.6,<1.7"

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

after_success:
coveralls
16 changes: 15 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ envlist =
py27-django16,
py27-django17,
py27-django18,
py27-django19,

py3-django15,
py3-django16,
py3-django17,
py3-django18
py3-django18,
py3-django19


[django14]
Expand All @@ -27,6 +29,9 @@ deps = Django>=1.7,<1.8
[django18]
deps = Django>=1.8,<1.9

[django19]
deps = Django==1.9b1

[testenv]
commands = python sitetree/runtests.py

Expand Down Expand Up @@ -56,6 +61,11 @@ basepython = python2.7
deps = {[django18]deps}
mock

[testenv:py27-django19]
basepython = python2.7
deps = {[django19]deps}
mock

[testenv:py3-django15]
basepython = python3
deps = {[django15]deps}
Expand All @@ -71,3 +81,7 @@ deps = {[django17]deps}
[testenv:py3-django18]
basepython = python3
deps = {[django18]deps}

[testenv:py3-django19]
basepython = python3
deps = {[django19]deps}

0 comments on commit f9b8dca

Please sign in to comment.