adapt pytest to pluggy's decoratorclass branch

--HG-- branch : pluggy1
2015-04-29 16:40:52 +02:00
parent 5ee7ee0850
commit 25963e0544
6 changed files with 43 additions and 17 deletions
--- a/_pytest/genscript.py
+++ b/_pytest/genscript.py
@@ -70,7 +70,7 @@ def pytest_cmdline_main(config):
    genscript = config.getvalue("genscript")
    if genscript:
        tw = py.io.TerminalWriter()
-        deps =  ['py', '_pytest', 'pytest', 'pluggy']
+        deps =  ['py', 'pluggy', '_pytest', 'pytest']
        if sys.version_info < (2,7):
            deps.append("argparse")
            tw.line("generated script will run on python2.6-python3.3++")