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

Fix for pytest 7 #123

Closed
wants to merge 2 commits into from
Closed

Fix for pytest 7 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6880f9
Fix for pytest 7
hugovk Dec 8, 2021
0309fd1
Update AUTHORS.md
hugovk Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS.md
View file
Open in desktop
Expand Up @@ -18,5 +18,6 @@ along with the following contributors:
- Emmanuel Leblond ([@touilleMan](https://github.com/touilleMan))
- Alex Ford ([@asford](https://github.com/asford))
- And Past ([@apast](https://github.com/apast))
- Hugo van Kemenade ([@hugovk](https://github.com/hugovk))

[home]: README.md
7 changes: 5 additions & 2 deletions pytest_watch/config.py
View file
Open in desktop
Expand Up @@ -33,8 +33,11 @@ def __init__(self):
self.path = None

def pytest_cmdline_main(self, config):
if hasattr(config, 'inifile'):
# pytest >= 2.7.0
if hasattr(config, 'inipath'):
# pytest >= 7
inifile = config.inipath
elif hasattr(config, 'inifile'):
# pytest 2.7.0 - 6
inifile = config.inifile
else:
# pytest < 2.7.0
Expand Down