fix: tox

Author: heikoheiko

.coveragerc

@@ -5,8 +5,9 @@ To exclude parts of your source from coverage, for example migrations folders:
 
 [report]
 omit =
-  */dispatch/*
+  */fixtures/*
   */tests/*
+  */utils/*
 
 [report]
 exclude_lines =

Makefile

@@ -7,6 +7,7 @@ help:
 	@echo "clean-test - remove test and coverage artifacts"
 	@echo "lint - check style with flake8"
 	@echo "test - run tests quickly with the default Python"
+	@echo "testtb - run tests quickly with tracebacks"
 	@echo "test-all - run tests on every Python version with tox"
 	@echo "coverage - check code coverage quickly with the default Python"
 	@echo "docs - generate Sphinx HTML documentation, including API docs"
@@ -35,6 +36,9 @@ lint:
 	flake8 ethereum tests --ignore=E501
 
 test:
+	py.test --tb=no ethereum/tests/
+
+testtb:
 	python setup.py test
 
 test-all:

setup.py

@@ -28,6 +28,6 @@ def run_tests(self):
       url='https://github.com/ethereum/pyethereum/',
       install_requires=install_requires,
       entry_points=dict(console_scripts=console_scripts),
-      version='0.9.60',
+      version='0.9.61',
       cmdclass=cmdclass
       )

tox.ini

@@ -1,13 +1,12 @@
 [tox]
 envlist = py27
 
+
 [testenv]
-deps=
-  mock
-  coveralls
-  pytest
-  ethereum-serpent
-commands=
-  py.test
-  coveralls
-sitepackages=False
+setenv =
+    PYTHONPATH = {toxinidir}:{toxinidir}/pyethereum
+commands = python setup.py test
+
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/dev_requirements.txt