ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #47 from nephila/feature/test_matrix_changes

Browse source 
Switch to tox 1.8 and add Django 1.7 to travis matrix
This commit is contained in:
Iacopo Spalletti 2014-10-11 09:45:51 +02:00
commit 04c5c9f35a
3 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -12,6 +12,7 @@ env:
matrix:
- DJANGO='django>=1.5,<1.6' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
- DJANGO='django>=1.6,<1.7' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
- DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install:
@ -24,13 +25,22 @@ script: djangocms-helper djangocms_blog test --cms --nose-runner
after_success: coveralls
matrix:
exclude:
- python: 2.6
env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
allow_failures:
- python: 2.7
env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
- python: 3.3
env: DJANGO='django>=1.5,<1.6' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
- python: 3.3
env: DJANGO='django>=1.6,<1.7' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
- python: 3.3
end: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
- python: 3.4
env: DJANGO='django>=1.5,<1.6' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
- python: 3.4
env: DJANGO='django>=1.6,<1.7' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
- python: 3.4
env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1

1
requirements-test.txt
View file

@ -6,3 +6,4 @@ nose>=1.3.0
django-nose>=1.2
flake8
djangocms-helper>=0.4
tox>=1.8

35
tox.ini
View file

@ -1,32 +1,13 @@
[tox]
envlist = py26dj15, py26dj16, py27dj15, py27dj16
envlist = {py26,py27}-django{15,16}
[testenv]
commands = djangocms-helper djangocms_blog test --cms --nose
basepython =
py26: python2.6
py27: python2.7
deps =
django15: Django>=1.5,<1.6
django16: Django>=1.6,<1.7
py26: unittest2
-r{toxinidir}/requirements-test.txt
[testenv:py26dj15]
basepython=python2.6
deps =
django<1.6
{[testenv]deps}
[testenv:py26dj16]
basepython=python2.6
deps =
django<1.7
{[testenv]deps}
[testenv:py27dj15]
basepython=python2.7
deps =
django<1.6
{[testenv]deps}
[testenv:py27dj16]
basepython=python2.7
deps =
django<1.7
{[testenv]deps}
commands = djangocms-helper djangocms_blog test --cms --nose