Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

stop using constructors deprecated in pytest 5.4 #391

Merged
merged 2 commits into from
Mar 18, 2020
Merged

stop using constructors deprecated in pytest 5.4 #391

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cfa54c
stop using constructors deprecated in pytest5
rotu Mar 13, 2020
58b4ed0
PR feedback
rotu Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions launch_testing/launch_testing/pytest/hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,18 @@ def pytest_pycollect_makemodule(path, parent):
if module is not None:
return module
if path.basename == '__init__.py':
return pytest.Package(path, parent)
return pytest.Module(path, parent)
try:
# since https://docs.pytest.org/en/latest/changelog.html#deprecations
# todo: remove fallback once all platforms use pytest >=5.4
return pytest.Package.from_parent(parent, fspath=path)
except AttributeError:
rotu marked this conversation as resolved.
Show resolved Hide resolved
return pytest.Package(path, parent)
try:
# since https://docs.pytest.org/en/latest/changelog.html#deprecations
# todo: remove fallback once all platforms use pytest >=5.4
return pytest.Module.from_parent(parent, fspath=path)
except AttributeError:
return pytest.Module(path, parent)


@pytest.hookimpl(trylast=True)
Expand Down