testit-adapter-pytest 3.0.2__tar.gz → 3.1.0__tar.gz

{testit_adapter_pytest-3.0.2 → testit_adapter_pytest-3.1.0}/PKG-INFO

@@ -1,14 +1,12 @@
 Metadata-Version: 2.1
 Name: testit-adapter-pytest
-Version: 3.0.2
+Version: 3.1.0
 Summary: Pytest adapter for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
 Author-email: integrations@testit.software
 License: Apache-2.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -18,7 +16,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pytest
 Requires-Dist: pytest-xdist
 Requires-Dist: attrs
-Requires-Dist: testit-python-commons==3.0.2
+Requires-Dist: testit-python-commons==3.1.0
 
 # Test IT TMS adapter for Pytest
 

{testit_adapter_pytest-3.0.2 → testit_adapter_pytest-3.1.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='testit-adapter-pytest',
-    version='3.0.2',
+    version='3.1.0',
     description='Pytest adapter for Test IT',
     long_description=open('README.md', "r").read(),
     long_description_content_type="text/markdown",
@@ -12,8 +12,6 @@ setup(
     license='Apache-2.0',
     classifiers=[
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
@@ -23,6 +21,6 @@ setup(
     py_modules=['testit_adapter_pytest'],
     packages=find_packages(where='src'),
     package_dir={'': 'src'},
-    install_requires=['pytest', 'pytest-xdist', 'attrs', 'testit-python-commons==3.0.2'],
+    install_requires=['pytest', 'pytest-xdist', 'attrs', 'testit-python-commons==3.1.0'],
     entry_points={'pytest11': ['testit_adapter_pytest = testit_adapter_pytest.plugin']}
 )

{testit_adapter_pytest-3.0.2 → testit_adapter_pytest-3.1.0}/src/testit_adapter_pytest/listener.py

@@ -1,4 +1,5 @@
 import pickle
+from importlib.metadata import metadata
 from uuid import uuid4
 
 from packaging import version
@@ -61,6 +62,7 @@ class SeparationOfTests:
 
 class TmsListener(object):
     __executable_test = None
+    __pytest_info = None
     __pytest_check_info = None
     __failures = None
 
@@ -73,6 +75,8 @@ class TmsListener(object):
 
     @pytest.hookimpl
     def pytest_configure(self, config):
+        self.__pytest_info = metadata("pytest")
+
         if not hasattr(config, "workerinput") and not hasattr(self, "test_run_id"):
             config.test_run_id = self.__adapter_manager.get_test_run_id()
         else:
@@ -303,7 +307,7 @@ class TmsListener(object):
                                                 stacktrace=utils.get_traceback(exc_tb))
 
     def _update_fixtures_external_ids(self, item):
-        for fixturedef in _test_fixtures(item):
+        for fixturedef in self._test_fixtures(item):
             group_uuid = self._cache.get(fixturedef)
             if group_uuid:
                 group = self.fixture_manager.get_item(group_uuid)
@@ -314,15 +318,18 @@ class TmsListener(object):
             if item.nodeid not in group.node_ids:
                 self.fixture_manager.update_group(group_uuid, node_ids=item.nodeid)
 
+    def _test_fixtures(self, item):
+        fixturemanager = item.session._fixturemanager
+        fixturedefs = []
 
-def _test_fixtures(item):
-    fixturemanager = item.session._fixturemanager
-    fixturedefs = []
+        if hasattr(item, "_request") and hasattr(item._request, "fixturenames"):
+            for name in item._request.fixturenames:
+                if self.__pytest_info and version.parse(self.__pytest_info["version"]) >= version.parse("8.1.0"):
+                    fixturedefs_pytest = fixturemanager.getfixturedefs(name, item)
+                else:
+                    fixturedefs_pytest = fixturemanager.getfixturedefs(name, item.nodeid)
 
-    if hasattr(item, "_request") and hasattr(item._request, "fixturenames"):
-        for name in item._request.fixturenames:
-            fixturedefs_pytest = fixturemanager.getfixturedefs(name, item.nodeid)
-            if fixturedefs_pytest:
-                fixturedefs.extend(fixturedefs_pytest)
+                if fixturedefs_pytest:
+                    fixturedefs.extend(fixturedefs_pytest)
 
-    return fixturedefs
+        return fixturedefs

{testit_adapter_pytest-3.0.2 → testit_adapter_pytest-3.1.0}/src/testit_adapter_pytest.egg-info/PKG-INFO

@@ -1,14 +1,12 @@
 Metadata-Version: 2.1
 Name: testit-adapter-pytest
-Version: 3.0.2
+Version: 3.1.0
 Summary: Pytest adapter for Test IT
 Home-page: https://github.com/testit-tms/adapters-python/
 Author: Integration team
 Author-email: integrations@testit.software
 License: Apache-2.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -18,7 +16,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pytest
 Requires-Dist: pytest-xdist
 Requires-Dist: attrs
-Requires-Dist: testit-python-commons==3.0.2
+Requires-Dist: testit-python-commons==3.1.0
 
 # Test IT TMS adapter for Pytest
 

testit_adapter_pytest-3.1.0/src/testit_adapter_pytest.egg-info/requires.txt

@@ -0,0 +1,4 @@
+pytest
+pytest-xdist
+attrs
+testit-python-commons==3.1.0

testit_adapter_pytest-3.0.2/src/testit_adapter_pytest.egg-info/requires.txt

@@ -1,4 +0,0 @@
-pytest
-pytest-xdist
-attrs
-testit-python-commons==3.0.2