From 7f15152f76df3dda17c960f5543cdf78e2dac6fb Mon Sep 17 00:00:00 2001
From: Piper Merriam <pipermerriam@gmail.com>
Date: Mon, 13 Feb 2017 16:44:32 -0700
Subject: [PATCH] travis futzing

---
 .travis.yml | 14 ++++++++------
 tox.ini     | 19 ++-----------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a022700..511f715 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,18 +9,20 @@ before_install:
   - travis_retry sudo apt-get update
 env:
   matrix:
-    - TOX_ENV=py27-all-stdlib
-    - TOX_ENV=py34-all-stdlib
-    - TOX_ENV=py35-all-stdlib
-    - TOX_ENV=py27-all-gevent
-    - TOX_ENV=py34-all-gevent
-    - TOX_ENV=py35-all-gevent
+    - TOX_ENV=py27-stdlib
+    - TOX_ENV=py34-stdlib
+    - TOX_ENV=py35-stdlib
+    - TOX_ENV=py27-gevent
+    - TOX_ENV=py34-gevent
+    - TOX_ENV=py35-gevent
     - TOX_ENV=flake8
 cache:
   pip: true
 install:
   - "travis_retry pip install pip setuptools --upgrade"
   - "travis_retry pip install tox"
+before_script:
+  - pip freeze
 script:
   - tox -e $TOX_ENV --recreate
 after_script:
diff --git a/tox.ini b/tox.ini
index e8b494e..8d681d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    py{27,34,35}-{all,admin,eth,mining,providers,version,contracts,filtering,net,txpool,db,managers,personal,utilities}-{gevent-stdlib}
+    py{27,34,35}-{gevent-stdlib}
     flake8
 
 [flake8]
@@ -10,22 +10,7 @@ exclude= tests/*
 [testenv]
 usedevelop=True
 commands=
-    all: py.test {posargs:tests}
-    admin: py.test {posargs:tests/admin-module}
-    eth: py.test {posargs:tests/eth-module}
-    mining: py.test {posargs:tests/mining-module}
-    providers: py.test {posargs:tests/providers}
-    version: py.test {posargs:tests/version-module}
-    contracts: py.test {posargs:tests/contracts}
-    filtering: py.test {posargs:tests/filtering}
-    net: py.test {posargs:tests/net-module}
-    shh: py.test {posargs:tests/shh-module}
-    txpool: py.test {posargs:tests/txpool-module}
-    db: py.test {posargs:tests/db-module}
-    managers: py.test {posargs:tests/managers}
-    personal: py.test {posargs:tests/personal-module}
-    testing: py.test {posargs:tests/testing-module}
-    utilities: py.test {posargs:tests/utilities}
+    py.test {posargs:tests}
 deps =
     stdlib: -r{toxinidir}/requirements-dev.txt
     gevent: -r{toxinidir}/requirements-gevent.txt