simplify tox.ini

requirements/tests.txt

@@ -1,6 +1,6 @@
--r requirements/zeromq.txt
--r requirements/dev.txt
--r requirements/pytest.txt
+-r zeromq.txt
+-r dev.txt
+-r pytest.txt
 apache-libcloud>=1.0.0
 boto>=2.32.1
 boto3>=1.2.1
@@ -9,23 +9,21 @@ docker; sys.platform != 'win32'
 docker==2.7.0; sys.platform == 'win32'
 virtualenv
 setuptools>=30
-mock<1.1.0
-six
+six>=1.10.0
 timelib
 coverage
-requests
 keyring==5.7.1
 python-gnupg
 python-etcd==0.4.2
 GitPython
 supervisor; python_version < '3'
 kubernetes<4.0
-psutils
+psutil
 pyvmomi
 setproctitle
-python.cherrypy; sys.platform != 'win32' and sys.platform != 'darwin'
 cherrypy; sys.platform != 'win32' and sys.platform != 'darwin'
 pyinotify; sys.platform != 'win32' and sys.platform != 'darwin'
+PyMySQL; sys.platform != 'win32' and sys.platform != 'darwin'
 jsonschema
 strict_rfc3339
 rfc3987
@@ -33,6 +31,6 @@ jinja2
 pyOpenSSL
 ioflo
 dnspython
-SaltTesting=2017.6.1
+SaltTesting==2017.6.1
 junos-eznc
 jxmlease

tox.ini

@@ -2,15 +2,5 @@
 envlist = py27,py34,py35,py36
 
 [testenv]
-sitepackages = True
-deps =
-  py27,pylint: -r{toxinidir}/requirements/dev_python27.txt
-  py34,py35,py36: -r{toxinidir}/requirements/dev_python34.txt
-commands =
-  py27: python2 {toxinidir}/tests/runtests.py {posargs:-v --run-destructive}
-  py34,py35,py36: python3 {toxinidir}/tests/runtests.py {posargs:-v --run-destructive}
-
-[testenv:pylint]
-basepython = python2.7
-commands = pylint --rcfile={toxinidir}/.testing.pylintrc --disable=W1307 {posargs:setup.py salt/}
-           pylint --rcfile={toxinidir}/.testing.pylintrc --disable=W0232,E1002,W1307 {posargs:tests/}
+deps = -r{toxinidir}/requirements/tests.txt
+commands = pytest --rootdir {toxinidir} {posargs:--no-print-logs --run-destructive}