diff --git a/CHANGELOG b/CHANGELOG index 651c46657..853e8de2c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,11 +21,13 @@ Changes between 2.4.1 and 2.4.2 details of the node.keywords pseudo-dicts. Adapated docs. - - remove attempt to "dup" stdout at startup as it's icky. the normal capturing should catch enough possibilities of tests messing up standard FDs. +- add pluginmanager.do_configure(config) as a link to + config.do_configure() for plugin-compatibility + Changes between 2.4.0 and 2.4.1 ----------------------------------- diff --git a/_pytest/core.py b/_pytest/core.py index fbd7b1582..a23e74c27 100644 --- a/_pytest/core.py +++ b/_pytest/core.py @@ -76,6 +76,10 @@ class PluginManager(object): self._shutdown = [] self.hook = HookRelay(hookspecs or [], pm=self) + def do_configure(self, config): + # backward compatibility + config.do_configure() + def set_register_callback(self, callback): assert not hasattr(self, "_registercallback") self._registercallback = callback diff --git a/plugin-test.sh b/plugin-test.sh index 65a072ae9..9c61b5053 100644 --- a/plugin-test.sh +++ b/plugin-test.sh @@ -9,8 +9,12 @@ cd ../pytest-instafail py.test cd ../pytest-cache py.test +cd ../pytest-xprocess +py.test #cd ../pytest-cov #py.test +cd ../pytest-capturelog +py.test cd ../pytest-xdist py.test diff --git a/setup.py b/setup.py index 0fb682597..b62d9f095 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup, Command long_description = open("README.rst").read() def main(): - install_requires = ["py>=1.4.17.dev2"] + install_requires = ["py>=1.4.17"] if sys.version_info < (2,7): install_requires.append("argparse") if sys.platform == "win32":