diff --git a/AUTHORS b/AUTHORS index 608cba37..783e04bb 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,2 @@ -Jeremy Grossmann \ No newline at end of file +Jeremy Grossmann +Julien Duponchelle \ No newline at end of file diff --git a/tox.ini b/tox.ini index 8c8c31ae..e5480bfc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py33, py34 +envlist = py34 [testenv] commands = python setup.py test @@ -9,5 +9,5 @@ deps = -rdev-requirements.txt ignore = E501,E402 [pytest] -norecursedirs = old_tests .tox +norecursedirs = .tox timeout = 5