Merge branch 'features' into pluggy-master

2017-09-06 13:13:35 -03:00
parent 7d59b2e350 e1f2254fc2
commit d01f08e96f
45 changed files with 409 additions and 142 deletions
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ envlist =
    {py27,py35}-{pexpect,xdist,trial,numpy,pluggymaster}
    py27-nobyte
    doctesting
-    freeze
+    py35-freeze
    docs

 [testenv]
@@ -187,7 +187,7 @@ changedir = testing
 commands =
    {envpython} {envbindir}/py.test-jython -ra {posargs}

-[testenv:freeze]
+[testenv:py35-freeze]
 changedir = testing/freeze
 deps = pyinstaller
 commands =