Merge pull request #83 from nicoddemus/drop-py36-pytest-6

Author: nicoddemus

.github/workflows/test.yml

@@ -60,23 +60,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
         include:
-          - python: "3.6"
-            tox_env: "py36-pytestlatest"
           - python: "3.7"
-            tox_env: "py37-pytestlatest"
+            tox_env: "py37"
           - python: "3.8"
-            tox_env: "py38-pytestlatest"
+            tox_env: "py38"
           - python: "3.9"
-            tox_env: "py39-pytestlatest py39-pytest53"
+            tox_env: "py39"
           - python: "3.10"
-            tox_env: "py310-pytestlatest"
+            tox_env: "py310"
+          - python: "3.11-dev"
+            tox_env: "py311"
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python }}
     - name: Download compiled tests

.pre-commit-config.yaml

@@ -1,5 +1,11 @@
 exclude: '^($|.*\.bin)'
 repos:
+  - repo: https://github.com/asottile/reorder_python_imports
+    rev: v3.8.2
+    hooks:
+    - id: reorder-python-imports
+      args: ['--application-directories=.:src']
+      name: reorder python imports
   - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.2.0 (2022-08-22)
+
+- Dropped support for Python 3.6.
+- This plugin now requires pytest >=7.0.
+
 # 2.1.2 (2022-03-18)
 
 - Fix warnings in pytest 7.0 ([#78](https://github.com/pytest-dev/pytest-cpp/issues/78)).

setup.py

@@ -11,11 +11,10 @@
         "pytest11": ["cpp = pytest_cpp.plugin"],
     },
     install_requires=[
-        "pytest !=5.4.0, !=5.4.1",
+        "pytest >=7.0",
         "colorama",
     ],
-    python_requires=">=3.6",
-    # metadata for upload to PyPI
+    python_requires=">=3.7",
     author="Bruno Oliveira",
     author_email="[email protected]",
     description="Use pytest's runner to discover and execute C++ tests",
@@ -30,10 +29,11 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "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",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: C++",
         "Topic :: Software Development :: Quality Assurance",
         "Topic :: Software Development :: Testing",

src/pytest_cpp/boost.py

@@ -1,9 +1,10 @@
+import io
 import os
+import shutil
 import subprocess
 import tempfile
 from xml.etree import ElementTree
-import io
-import shutil
+
 from pytest_cpp.error import CppTestFailure
 
 

src/pytest_cpp/error.py

@@ -1,7 +1,7 @@
+import os
 import string
 
-import os
-from py._code.code import ReprFileLocation
+from _pytest._code.code import ReprFileLocation
 
 
 class CppFailureError(Exception):

src/pytest_cpp/google.py

@@ -4,6 +4,7 @@
 from xml.etree import ElementTree
 
 import pytest
+
 from pytest_cpp.error import CppTestFailure
 
 

src/pytest_cpp/plugin.py

@@ -6,20 +6,17 @@
 import pytest
 
 from pytest_cpp.boost import BoostTestFacade
-from pytest_cpp.error import CppFailureRepr, CppFailureError
-from pytest_cpp.google import GoogleTestFacade
 from pytest_cpp.catch2 import Catch2Facade
+from pytest_cpp.error import CppFailureError
+from pytest_cpp.error import CppFailureRepr
+from pytest_cpp.google import GoogleTestFacade
 
 FACADES = [GoogleTestFacade, BoostTestFacade, Catch2Facade]
 DEFAULT_MASKS = ("test_*", "*_test")
 
 _ARGUMENTS = "cpp_arguments"
 
 
-# pytest 5.4 introduced the 'from_parent' constructor
-needs_from_parent = hasattr(pytest.Item, "from_parent")
-
-
 def matches_any_mask(path, masks):
     """Return True if the given path matches any of the masks given"""
     if sys.platform.startswith("win"):
@@ -52,20 +49,12 @@ def pytest_collect_file(parent, file_path):
 
     for facade_class in FACADES:
         if facade_class.is_test_suite(str(file_path)):
-            if needs_from_parent:
-                return CppFile.from_parent(
-                    path=file_path,
-                    parent=parent,
-                    facade=facade_class(),
-                    arguments=test_args,
-                )
-            else:
-                return CppFile(
-                    path=file_path,
-                    parent=parent,
-                    facade_class=facade_class(),
-                    arguments=test_args,
-                )
+            return CppFile.from_parent(
+                path=file_path,
+                parent=parent,
+                facade=facade_class(),
+                arguments=test_args,
+            )
 
 
 def pytest_addoption(parser):
@@ -115,15 +104,12 @@ def from_parent(cls, *, parent, path, facade, arguments, **kwargs):
 
     def collect(self):
         for test_id in self.facade.list_tests(str(self.fspath)):
-            if needs_from_parent:
-                yield CppItem.from_parent(
-                    parent=self,
-                    name=test_id,
-                    facade=self.facade,
-                    arguments=self._arguments,
-                )
-            else:
-                yield CppItem(test_id, self, self.facade, self._arguments)
+            yield CppItem.from_parent(
+                parent=self,
+                name=test_id,
+                facade=self.facade,
+                arguments=self._arguments,
+            )
 
 
 class CppItem(pytest.Item):

tests/conftest.py

@@ -1,8 +1,9 @@
 import os
 import shutil
-import pytest
 import sys
 
+import pytest
+
 pytest_plugins = "pytester"
 
 

tests/test_pytest_cpp.py

@@ -1,13 +1,14 @@
 import subprocess
 import sys
-from distutils.spawn import find_executable
 
 import pytest
+from distutils.spawn import find_executable
 
 from pytest_cpp import error
 from pytest_cpp.boost import BoostTestFacade
 from pytest_cpp.catch2 import Catch2Facade
-from pytest_cpp.error import CppFailureRepr, CppTestFailure
+from pytest_cpp.error import CppFailureRepr
+from pytest_cpp.error import CppTestFailure
 from pytest_cpp.google import GoogleTestFacade