diff --git a/.travis.yml b/.travis.yml index ccb5e2c2a..1e66024ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,16 +9,14 @@ sudo: false matrix: include: - python: 3.4 - env: TOXENV=py34 - python: 3.5 - env: TOXENV=py35 - python: 3.6 - env: TOXENV=py36 - python: 3.6 - env: TOXENV=pycodestyle install: - pip install --requirement requirements.txt - - pip install tox -script: tox -c src/tox.ini +script: + - pytest src/ + - pycodestyle src/ + - coveralls diff --git a/src/pytest.ini b/src/setup.cfg similarity index 55% rename from src/pytest.ini rename to src/setup.cfg index 013a01b28..ed8efebfb 100644 --- a/src/pytest.ini +++ b/src/setup.cfg @@ -1,8 +1,15 @@ -[pytest] +[pycodestyle] +exclude = migrations, paperless/settings.py + + +[tool:pytest] DJANGO_SETTINGS_MODULE=paperless.settings -addopts = --pythonwarnings=all +addopts = --pythonwarnings=all -n auto env = PAPERLESS_CONSUME=/tmp PAPERLESS_PASSPHRASE=THISISNOTASECRET PAPERLESS_SECRET=paperless PAPERLESS_EMAIL_SECRET=paperless + +[coverage:paths] +source = ./ diff --git a/src/tox.ini b/src/tox.ini deleted file mode 100644 index 4ea231f46..000000000 --- a/src/tox.ini +++ /dev/null @@ -1,22 +0,0 @@ -# Tox (http://tox.testrun.org/) is a tool for running tests -# in multiple virtualenvs. This configuration file will run the -# test suite on all supported python versions. To use it, "pip install tox" -# and then run "tox" from this directory. - -[tox] -skipsdist = True -envlist = py34, py35, py36, pycodestyle - -[testenv] -commands = pytest -deps = -r{toxinidir}/../requirements.txt - -[testenv:pycodestyle] -commands=pycodestyle -deps=pycodestyle - -[pycodestyle] -exclude= - .tox, - migrations, - paperless/settings.py