r46955 - move some tox things about

Author: hawkowl
Date: Wed Mar  9 00:42:12 2016
New Revision: 46955

Modified:
   branches/manhole-hardcodedkey-8229/tox.ini

Log:
move some tox things about

Modified: branches/manhole-hardcodedkey-8229/tox.ini
==============================================================================
--- branches/manhole-hardcodedkey-8229/tox.ini	(original)
+++ branches/manhole-hardcodedkey-8229/tox.ini	Wed Mar  9 00:42:12 2016
@@ -11,22 +11,9 @@
 [testenv]
 changedir={envtmpdir}
 deps =
-     ; zope.interface is love, zope.interface is life
-     zope.interface
-
-     ; Some relatively standard dependencies that we want to have
-     ; We cannot use extras here, because it is not supported on Py3
-     {tests,coverage}: pyopenssl
-     {tests,coverage}: service_identity
-     {tests,coverage}: idna
-     {tests,coverage}: pyserial
-     {tests,coverage}: python-subunit
-     {tests,coverage}: pycrypto
      py27-{tests,coverage}-posix: pysqlite
      windows: pypiwin32
 
-     py27-{tests,coverage}: soappy
-
      coverage: coverage
 
      ; Code quality checkers
@@ -38,6 +25,8 @@
      narrativedocs: sphinx
 
 commands =
+    py27-{tests,coverage}: pip install Twisted[conch,tls,soap,serial,dev]
+    py27-{tests,coverage}-windows: pip install Twisted[windows]
     {tests,nomodules}: {envbindir}/trial {posargs:twisted}
 
     twistedchecker: twistedchecker {posargs:twisted}