diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..75a24c2 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,11 @@ +[run] +source = src/postorius +omit = + src/postorius/tests/*.py + src/postorius/tests/*/*.py + src/postorius/doc/*.py + src/postorius/south_migrations/*.py + src/postorius/migrations/*.py + +[html] +directory = coverage diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4aa73cd..594a319 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,3 +15,4 @@ - tox -e py27-django18 tags: - sqlite + diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100644 index 0d5d5ca..0000000 --- a/dev-requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -git+https://gitlab.com/mailman/mailmanclient.git -tox -mock -coverage==3.7.1 -vcrpy diff --git a/tox.ini b/tox.ini index 84f3749..7fdb1bf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,22 +1,30 @@ [tox] envlist = py27-django{16,17,18} +[base] +deps = + git+https://gitlab.com/mailman/mailmanclient.git + mock + vcrpy + coverage + [testenv] usedevelop = True deps = - -rdev-requirements.txt + {[base]deps} django16: Django>=1.6,<1.7 - django17: Django>=1.6,<1.8 - django18: Django==1.8 + django17: Django>=1.7,<1.8 + django18: Django>=1.8,<1.9 commands = - django-admin.py test --settings=testing.test_settings {posargs:postorius} + coverage run {envbindir}/django-admin.py test --settings=testing.test_settings {posargs:postorius} + coverage report setenv = PYTHONPATH = {toxinidir} [testenv:record] basepython = python2.7 deps = - -rdev-requirements.txt + {[base]deps} Django==1.8 setenv = PYTHONPATH = {toxinidir} @@ -31,7 +39,7 @@ usedevelop = True basepython = python2.7 deps = - -rdev-requirements.txt + {[base]deps} Django==1.8 setenv = PYTHONPATH = {toxinidir} @@ -44,7 +52,7 @@ usedevelop = True basepython = python2.7 deps = - -rdev-requirements.txt + {[base]deps} Django==1.8 setenv = PYTHONPATH = {toxinidir}