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

Update deprecated pytest api #43

Closed
wants to merge 5 commits into from
Closed

Update deprecated pytest api #43

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
049d64c
Update __init__.py
tonyfast Sep 8, 2020
1a76fe5
add dowhat param
tonyfast Sep 8, 2020
4ce7f91
apply from parent patch to dowhat
tonyfast Sep 8, 2020
05d6793
from parent logic
tonyfast Sep 9, 2020
e61c5d1
yield item properly
tonyfast Sep 10, 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
6 changes: 5 additions & 1 deletion nbsmoke/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def __init__(self, fspath, parent=None, config=None, session=None, dowhat=RunNb)
super(IPyNbFile,self).__init__(fspath, parent=parent, config=None, session=None)

def collect(self):
yield self._dowhat(str(self.fspath), self)
yield self._dowhat(str(self.fspath), self)


def pytest_collect_file(path, parent):
Expand All @@ -162,4 +162,8 @@ def pytest_collect_file(path, parent):
dowhat = LintNb
elif opt.nbsmoke_verify:
dowhat = VerifyNb

if hasattr(IPyNbFile, "from_parent"):
return IPyNbFile.from_parent(parent, fspath=path, dowhat=dowhat)

return IPyNbFile(path, parent, dowhat=dowhat)