Skip to content

Commit

Permalink
Consolidate CI tools into setup.cfg and drop tox
Browse files Browse the repository at this point in the history
  • Loading branch information
danielquinn committed Feb 25, 2018
1 parent 1f68223 commit a55a915
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 30 deletions.
10 changes: 4 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 9 additions & 2 deletions src/pytest.ini → src/setup.cfg
Original file line number Diff line number Diff line change
@@ -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 = ./
22 changes: 0 additions & 22 deletions src/tox.ini

This file was deleted.

0 comments on commit a55a915

Please sign in to comment.