remove pytest_namespace from _pytest.freeze_support
This commit is contained in:
parent
5818e65cf3
commit
fab9b993f8
|
@ -101,6 +101,7 @@ default_plugins = (
|
||||||
"junitxml resultlog doctest cacheprovider freeze_support "
|
"junitxml resultlog doctest cacheprovider freeze_support "
|
||||||
"setuponly setupplan warnings").split()
|
"setuponly setupplan warnings").split()
|
||||||
|
|
||||||
|
|
||||||
builtin_plugins = set(default_plugins)
|
builtin_plugins = set(default_plugins)
|
||||||
builtin_plugins.add("pytester")
|
builtin_plugins.add("pytester")
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,6 @@ pytest
|
||||||
from __future__ import absolute_import, division, print_function
|
from __future__ import absolute_import, division, print_function
|
||||||
|
|
||||||
|
|
||||||
def pytest_namespace():
|
|
||||||
return {'freeze_includes': freeze_includes}
|
|
||||||
|
|
||||||
|
|
||||||
def freeze_includes():
|
def freeze_includes():
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -9,7 +9,8 @@ __all__ = [
|
||||||
'hookspec',
|
'hookspec',
|
||||||
'hookimpl',
|
'hookimpl',
|
||||||
'__version__',
|
'__version__',
|
||||||
'register_assert_rewrite'
|
'register_assert_rewrite',
|
||||||
|
'freeze_includes',
|
||||||
]
|
]
|
||||||
|
|
||||||
if __name__ == '__main__': # if run as a script or by 'python -m pytest'
|
if __name__ == '__main__': # if run as a script or by 'python -m pytest'
|
||||||
|
@ -24,7 +25,9 @@ from _pytest.config import (
|
||||||
hookspec, hookimpl
|
hookspec, hookimpl
|
||||||
)
|
)
|
||||||
from _pytest.assertion import register_assert_rewrite
|
from _pytest.assertion import register_assert_rewrite
|
||||||
|
from _pytest.freeze_support import freeze_includes
|
||||||
from _pytest import __version__
|
from _pytest import __version__
|
||||||
|
|
||||||
|
|
||||||
_preloadplugins() # to populate pytest.* namespace so help(pytest) works
|
_preloadplugins() # to populate pytest.* namespace so help(pytest) works
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue