Merge pull request #60 from finsberg/finsberg/fix_pytest_deprecation_…

…warning_pytestFunction

Fix pytest deprecation warning for pytest version greater than 5.4

pytest_tornado/plugin.py

@@ -3,6 +3,7 @@
 import types
 import inspect
 import datetime
+import pkg_resources
 import pytest
 import tornado
 import tornado.gen
@@ -15,6 +16,8 @@
 else:
     iscoroutinefunction = lambda f: False
 
+_PYTEST_VERSION = pkg_resources.parse_version(pytest.__version__)
+
 
 def _get_async_test_timeout():
     try:
@@ -67,7 +70,10 @@ def _timeout(item):
 @pytest.mark.tryfirst
 def pytest_pycollect_makeitem(collector, name, obj):
     if collector.funcnamefilter(name) and inspect.isgeneratorfunction(obj):
-        item = pytest.Function(name, parent=collector)
+        if _PYTEST_VERSION >= pkg_resources.parse_version("5.4.0"):
+            item = pytest.Function.from_parent(collector, name=name)
+        else:
+            item = pytest.Function(name, parent=collector)
         if 'gen_test' in item.keywords:
             return list(collector._genfunctions(name, obj))
 

setup.py

@@ -36,7 +36,7 @@
     keywords=('pytest py.test tornado async asynchronous '
               'testing unit tests plugin'),
     packages=find_packages(exclude=["tests.*", "tests"]),
-    install_requires=['pytest>=3.6', 'tornado>=4.1'],
+    install_requires=['pytest>=3.6', 'tornado>=4.1', 'setuptools'],
     entry_points={
         'pytest11': ['tornado = pytest_tornado.plugin'],
     },