Drop compatibility with pytest < 3.6 (#322)

* Remove support code for pytest < 3.6

* Update setup.py tags

* Require pytest>=3.6 from setup.py

Author: youtux

CHANGES.rst

@@ -5,6 +5,7 @@ Unreleased
 ----------
 
 - Fix ``pytest --generate-missing`` functionality being broken.
+- Drop compatibility with pytest < 3.6
 
 3.2.1
 ----------

pytest_bdd/utils.py

@@ -30,21 +30,4 @@ def get_parametrize_markers_args(node):
 
     This function uses that API if it is available otherwise it uses MarkInfo objects.
     """
-    mark_name = "parametrize"
-    try:
-        return get_markers_args_using_iter_markers(node, mark_name)
-    except AttributeError:
-        return get_markers_args_using_get_marker(node, mark_name)
-
-
-def get_markers_args_using_iter_markers(node, mark_name):
-    """Recommended on pytest>=3.6"""
-    args = []
-    for mark in node.iter_markers(mark_name):
-        args += mark.args
-    return tuple(args)
-
-
-def get_markers_args_using_get_marker(node, mark_name):
-    """Deprecated on pytest>=3.6"""
-    return getattr(node.get_marker(mark_name), "args", ())
+    return tuple(arg for mark in node.iter_markers("parametrize") for arg in mark.args)

setup.py

@@ -4,37 +4,8 @@
 import codecs
 import os
 import re
-import sys
 
 from setuptools import setup
-from setuptools.command.test import test as TestCommand
-
-
-class ToxTestCommand(TestCommand):
-
-    """Test command which runs tox under the hood."""
-
-    user_options = [("tox-args=", "a", "Arguments to pass to tox")]
-
-    def initialize_options(self):
-        """Initialize options and set their defaults."""
-        TestCommand.initialize_options(self)
-        self.tox_args = "--recreate"
-
-    def finalize_options(self):
-        """Add options to the test runner (tox)."""
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        """Invoke the test runner (tox)."""
-        # import here, cause outside the eggs aren't loaded
-        import tox
-        import shlex
-
-        errno = tox.cmdline(args=shlex.split(self.tox_args))
-        sys.exit(errno)
 
 
 dirname = os.path.dirname(__file__)
@@ -72,9 +43,8 @@ def run_tests(self):
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 3",
     ]
-    + [("Programming Language :: Python :: %s" % x) for x in "2.7 3.4 3.5 3.6 3.7".split()],
-    cmdclass={"test": ToxTestCommand},
-    install_requires=["glob2", "Mako", "parse", "parse_type", "py", "pytest>=3.0.0", "six>=1.9.0"],
+    + [("Programming Language :: Python :: %s" % x) for x in "2.7 3.5 3.6 3.7 3.8".split()],
+    install_requires=["glob2", "Mako", "parse", "parse_type", "py", "pytest>=3.6.0", "six>=1.9.0"],
     # the following makes a plugin available to py.test
     entry_points={
         "pytest11": ["pytest-bdd = pytest_bdd.plugin"],