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

Compatibility with pytest 4 #59

Merged
merged 2 commits into from
Jun 12, 2019
Merged

Compatibility with pytest 4 #59

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
b405a27
Compatibility with pytest 4
marsam Jun 9, 2019
a61fb8b
Relax version bounds of hypothesis
marsam Jun 9, 2019
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
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ exclude = tests

[options.extras_require]
graphs = graphviz>=0.5,<0.6
tests = pytest>=3.0,<4.0
hypothesis>=3.6,<4.0
tests = pytest>=4.0,<5.0
hypothesis>=3.6,<5.0
docs = sphinx_rtd_theme
Sphinx>=1.4,<2.0
develop = %(docs)s
Expand Down
4 changes: 2 additions & 2 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
from matchpy.expressions.functions import preorder_iter
from matchpy.matching.code_generation import CodeGenerator

def pytest_namespace():
return { 'matcher': None }
def pytest_configure():
pytest.matcher = None

def pytest_generate_tests(metafunc):
if 'match' in metafunc.fixturenames:
Expand Down