Allow pytest versions 3.4.*

pytest-dev/pytest#3074 is resolved as of 3.4.0.
elliterate · Jan 31, 2018 · e8edd0f · e8edd0f
1 parent fc49383
commit e8edd0f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/capybara/tests/collector.py b/capybara/tests/collector.py
@@ -1,6 +1,12 @@
 import py.path
 from _pytest.config import Config, PytestPluginManager, default_plugins
-from _pytest.main import FSCollector
+
+try:
+    # pytest >= 3.4
+    from _pytest.nodes import FSCollector
+except ImportError:
+    # pytest < 3.4
+    from _pytest.main import FSCollector
 
 
 class GraftedSubSession(FSCollector):

diff --git a/setup.py b/setup.py
@@ -11,8 +11,7 @@
     "flaky",
     "flask",
     "py",
-    # See: https://github.com/pytest-dev/pytest/issues/3074
-    "pytest >= 3, < 3.3",
+    "pytest ~= 3.0, != 3.3.*, < 3.5",
     "werkzeug"]
 if sys.version_info < (3, 3):
     driver_verification_tests_require.append("mock")