Move testing ENV vars into pytest.ini

requirements.txt

@@ -19,6 +19,7 @@ gunicorn==19.6.0
 pytest
 pytest-django
 pytest-sugar
+pytest-env
 pep8
 flake8
 tox

src/pytest.ini

@@ -1,3 +1,7 @@
 [pytest]
 DJANGO_SETTINGS_MODULE=paperless.settings
-
+env =
+  PAPERLESS_CONSUME=/tmp
+  PAPERLESS_PASSPHRASE=THISISNOTASECRET
+  PAPERLESS_SECRET=paperless
+  PAPERLESS_EMAIL_SECRET=paperless

src/tox.ini

@@ -8,13 +8,8 @@ skipsdist = True
 envlist = py34, py35, py36, pep8
 
 [testenv]
-commands = {envpython} manage.py test
+commands = pytest
 deps = -r{toxinidir}/../requirements.txt
-setenv =
-    PAPERLESS_CONSUME=/tmp
-    PAPERLESS_PASSPHRASE=THISISNOTASECRET
-    PAPERLESS_SECRET=paperless
-    PAPERLESS_EMAIL_SECRET=paperless
 
 [testenv:pep8]
 commands=pep8