Support latest pytest versions

Author: Cito

.github/workflows/main.yml

@@ -4,20 +4,23 @@ on:
   push:
     branches:
       - main
+      - 2.2.x
     tags:
       - '*'
 
   pull_request:
     branches:
       - main
 
+  workflow_dispatch:
+
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ (matrix.python == '3.7' || matrix.python == '3.8') && 'ubuntu-22.04' || 'ubuntu-latest' }}
 
     strategy:
       matrix:
-        python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy3.9', 'pypy3.10']
+        python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy3.9', 'pypy3.10', 'pypy3.11']
 
     steps:
     - uses: actions/checkout@v3
@@ -40,31 +43,35 @@ jobs:
 
     - name: Test with Python 3.8
       if: matrix.python == '3.8'
-      run: tox run -x "tox.envlist=py38-pytest{4,5,60,61,62,70,71,72,73,74,80}"
+      run: tox run -x "tox.envlist=py38-pytest{4,5,60,61,62,70,71,72,73,74,80,81,82,83}"
 
     - name: Test with Python 3.9
       if: matrix.python == '3.9'
-      run: tox run -x "tox.envlist=py39-pytest{4,5,60,61,62,70,71,72,73,74,80}"
+      run: tox run -x "tox.envlist=py39-pytest{4,5,60,61,62,70,71,72,73,74,80,81,82,83,84}"
 
     - name: Test with Python 3.10
       if: matrix.python == '3.10'
-      run: tox run -x "tox.envlist=py310-pytest{70,71,72,73,74,80}"
+      run: tox run -x "tox.envlist=py310-pytest{70,71,72,73,74,80,81,82,83,84}"
 
     - name: Test with Python 3.11
       if: matrix.python == '3.11'
-      run: tox run -x "tox.envlist=spy311-pytest{73,74,80}"
+      run: tox run -x "tox.envlist=spy311-pytest{73,74,80,81,82,83,84}"
 
     - name: Test with Python 3.12
       if: matrix.python == '3.12'
-      run: tox run -x "tox.envlist=spy312-pytest{74,80}"
+      run: tox run -x "tox.envlist=spy312-pytest{74,80,81,82,83,84}"
 
     - name: Test with PyPy 3.9
       if: matrix.python == 'pypy3.9'
       run: tox run -x "tox.envlist=pypy39-pytest{4,5,60,61,62,70,71,72,73,74}"
 
     - name: Test with PyPy 3.10
       if: matrix.python == 'pypy3.10'
-      run: tox run -x "tox.envlist=pypy310-pytest{70,71,72,73,74,80}"
+      run: tox run -x "tox.envlist=pypy310-pytest{70,71,72,73,74,80,81,82,83,84}"
+
+    - name: Test with PyPy 3.11
+      if: matrix.python == 'pypy3.11'
+      run: tox run -x "tox.envlist=pypy311-pytest{73,74,80,81,82,83,84}"
 
     - name: Linting with Flake8
       if: matrix.python == '3.11'
@@ -88,7 +95,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.12'
 
       - name: Install dependencies
         run: |

README.md

@@ -26,7 +26,7 @@ Running pytest will show that the plugin is loaded:
 ```sh
 $ pytest 
 ...
-plugins: describe-2.2.0
+plugins: describe-2.2.1
 ...
 ```
 

pytest_describe/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ['behaves_like']
 
-__version__ = '2.2.0'
+__version__ = '2.2.1'

pytest_describe/plugin.py

@@ -5,7 +5,23 @@
 import pytest
 
 
-PYTEST_GTE_7_0 = getattr(pytest, 'version_tuple', (0, 0)) >= (7, 0)
+try:
+    from _pytest.fixtures import FixtureFunctionDefinition
+except ImportError:  # pragma: no cover (pytest < 8.4)
+    def is_function_or_fixture(obj):
+        return isinstance(obj, types.FunctionType)
+
+    def is_fixture_function_definition(obj):
+        return hasattr(obj, '_pytestfixturefunction')
+else:
+    def is_function_or_fixture(obj):
+        return isinstance(obj, (types.FunctionType, FixtureFunctionDefinition))
+
+    def is_fixture_function_definition(obj):
+        return isinstance(obj, FixtureFunctionDefinition)
+
+
+PYTEST_GTE_7_0 = getattr(pytest, 'version_tuple', (4, 0)) >= (7, 0)
 PYTEST_GTE_5_4 = PYTEST_GTE_7_0 or hasattr(pytest.Collector, 'from_parent')
 
 
@@ -50,14 +66,14 @@ def evaluate_shared_behavior(func):
     except AttributeError:
         shared_functions = {}
         for name, obj in trace_function(func).items():
-            # Only functions are relevant here
-            if not isinstance(obj, types.FunctionType):
+            # Only functions and fixtures are relevant here
+            if not is_function_or_fixture(obj):
                 continue
 
-            # Mangle names of imported functions, except fixtures because we
-            # want fixtures to be overridden in the block that's importing the
-            # behavior.
-            if not hasattr(obj, '_pytestfixturefunction'):
+            # Mangle names of imported functions, except fixtures
+            # because we want fixtures to be overridden in the block
+            # that's importing the behavior.
+            if not is_fixture_function_definition(obj):
                 name = obj._mangled_name = f"{func.__name__}::{name}"
 
             shared_functions[name] = obj

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py37-pytest{4,5,60,61,62,70,71,72,73,74},py{38,39,py39}-pytest{4,5,60,61,62,70,71,72,73,74,80},py{310,py310}-pytest{70,71,72,73,74,80},py311-pytest{73,74,80,-latest},py312-pytest{74,80,-latest},flake8,coverage
+envlist = py37-pytest{4,5,60,61,62,70,71,72,73,74},py38-pytest{4,5,60,61,62,70,71,72,73,74,80,81,82,83},py{39,py39}-pytest{4,5,60,61,62,70,71,72,73,74,80,81,82,83,84,-latest},py{310,py310}-pytest{70,71,72,73,74,80,81,82,83,84,-latest},py{311,py311}-pytest{73,74,80,81,82,83,84,-latest},py312-pytest{74,80,81,82,83,84,-latest},flake8,coverage
 
 [testenv]
 basepython =
@@ -11,6 +11,7 @@ basepython =
     py312: python3.12
     pypy39: pypy3.9
     pypy310: pypy3.10
+    pypy311: pypy3.11
 deps =
     pytest4: pytest>=4.6,<5.0
     pytest5: pytest>=5.4,<5.5
@@ -23,18 +24,22 @@ deps =
     pytest73: pytest>=7.3,<7.4
     pytest74: pytest>=7.4,<7.5
     pytest80: pytest>=8.0,<8.1
+    pytest81: pytest>=8.1,<8.2
+    pytest82: pytest>=8.2,<8.3
+    pytest83: pytest>=8.3,<8.4
+    pytest84: pytest>=8.4,<8.5
     pytest-latest: pytest
     pytest-main: git+https://github.com/pytest-dev/pytest.git@main
 commands = pytest test {posargs}
 
 [testenv:flake8]
-basepython = python3.11
+basepython = python3.12
 deps = flake8>=7,<8
 commands =
     flake8 pytest_describe test setup.py
 
 [testenv:coverage]
-basepython = python3.11
+basepython = python3.12
 deps =
     coverage
     pytest