Merge remote-tracking branch 'origin/unstable' into unstable

2024-12-29 02:08:10 +00:00 · 2015-07-12 19:03:22 -06:00 · 2015-07-12 19:03:22 -06:00 · f08817f335
commit f08817f335
parent e785baaa29 6048222797
2 changed files with 4 additions and 3 deletions
--- a/3
+++ b/3
@ -1 +1,2 @@
-Jeremy Grossmann
+Jeremy Grossmann
+Julien Duponchelle
--- 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