Merge pull request #59 from marsam/pytest4

Compatibility with pytest 4
HPAC · Jun 12, 2019 · a90cc46 · a90cc46
2 parents 570b70e + a61fb8b
commit a90cc46
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -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

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -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: