diff --git a/.coveragerc b/.coveragerc index d80d81c..909a803 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,5 +1,2 @@ -[report] -source=django_markdown - [run] source=django_markdown diff --git a/.travis.yml b/.travis.yml index 53b1684..0f1e396 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,18 +2,13 @@ language: python python: - "2.7" +- "3.4" env: -- TOXENV=py27-d16 -- TOXENV=py27-d17 -- TOXENV=py34-d17 +- TOXENV=d16 +- TOXENV=d17 - TOXENV=cov -branches: - only: - - master - - develop - install: pip install --quiet --use-mirrors tox script: tox diff --git a/tox.ini b/tox.ini index b0df3bd..2fc7061 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=py27-d16,py27-d17,py34-d17,cov +envlist=d16,d17,cov [pylama] skip=example/* @@ -26,24 +26,18 @@ commands=py.test deps = pytest -[testenv:py27-d16] +[testenv:d16] basepython = python2.7 deps = django==1.6.7 {[testenv]deps} -[testenv:py27-d17] +[testenv:d17] basepython = python2.7 deps = django==1.7 {[testenv]deps} -[testenv:py34-d17] -basepython = python3.4 -deps = - django==1.7 - {[testenv]deps} - [testenv:cov] deps = coverage