Merge pull request #171 from saimn/pytest7

Compat with Pytest 7.0.0rc1

Author: pllim

.github/workflows/python-tests.yml

@@ -44,6 +44,10 @@ jobs:
           - os: macos-latest
             python-version: 3.8
             toxenv: py38-test-pytestdev
+          - os: ubuntu-latest
+            python-version: '3.10'
+            toxenv: py310-test-pytest70
+            toxargs: --pre
 
     steps:
     - uses: actions/checkout@v2
@@ -56,7 +60,7 @@ jobs:
     - name: Install Tox
       run: python -m pip install tox
     - name: Run Tox
-      run: tox -v -e ${{ matrix.toxenv }}
+      run: tox ${{ matrix.toxargs }} -v -e ${{ matrix.toxenv }}
 
     # - name: Slack Notification
     #   uses: 8398a7/action-slack@v3

CHANGES.rst

@@ -1,6 +1,8 @@
-0.12.0 (unreleased)
+0.11.2 (unreleased)
 ===================
 
+- Fix version check for pytest 7.0.0rc1. [#171]
+
 0.11.1 (2021-11-16)
 ===================
 

pytest_doctestplus/plugin.py

@@ -23,8 +23,9 @@
 _pytest_version = Version(pytest.__version__)
 PYTEST_GT_5 = _pytest_version > Version('5.9.9')
 PYTEST_GE_5_4 = _pytest_version >= Version('5.4')
-PYTEST_GE_6_3 = _pytest_version.is_devrelease or _pytest_version >= Version('6.3')
-PYTEST_GE_7_0 = _pytest_version.is_devrelease or _pytest_version >= Version('7.0')
+PYTEST_GE_7_0 = any([_pytest_version.is_devrelease,
+                     _pytest_version.is_prerelease,
+                     _pytest_version >= Version('7.0')])
 
 comment_characters = {
     '.txt': '#',
@@ -192,7 +193,7 @@ class DocTestModulePlus(doctest_plugin.DoctestModule):
         def collect(self):
             # When running directly from pytest we need to make sure that we
             # don't accidentally import setup.py!
-            if PYTEST_GE_6_3:
+            if PYTEST_GE_7_0:
                 fspath = self.path
                 filepath = self.path.name
             else:
@@ -206,9 +207,6 @@ def collect(self):
                     module = self.config.pluginmanager._importconftest(
                         self.path, self.config.getoption("importmode"),
                         rootpath=self.config.rootpath)
-                elif PYTEST_GE_6_3:
-                    module = self.config.pluginmanager._importconftest(
-                        self.path, self.config.getoption("importmode"))
                 elif PYTEST_GT_5:
                     module = self.config.pluginmanager._importconftest(
                         self.fspath, self.config.getoption("importmode"))
@@ -220,7 +218,7 @@ def collect(self):
                     if PYTEST_GT_5:
                         from _pytest.pathlib import import_path
 
-                    if PYTEST_GE_6_3:
+                    if PYTEST_GE_7_0:
                         module = import_path(fspath, root=self.config.rootpath)
                     elif PYTEST_GT_5:
                         module = import_path(fspath)
@@ -284,7 +282,7 @@ def collect(self):
     class DocTestTextfilePlus(pytest.Module):
 
         def collect(self):
-            if PYTEST_GE_6_3:
+            if PYTEST_GE_7_0:
                 fspath = self.path
                 filepath = self.path.name
             else:
@@ -475,7 +473,7 @@ def pytest_ignore_collect(self, path, config):
         Skip paths that match any of the doctest_norecursedirs patterns or
         if doctest_only is True then skip all regular test files (eg test_*.py).
         """
-        if PYTEST_GE_6_3:
+        if PYTEST_GE_7_0:
             dirpath = Path(path).parent
         else:
             dirpath = path.dirpath()

setup.cfg

@@ -15,6 +15,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: Implementation :: CPython
     Topic :: Software Development :: Testing
     Topic :: Utilities

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{37,38,39}-test
+    py{37,38,39,310}-test
     codestyle
 requires =
     setuptools >= 30.3.0
@@ -19,6 +19,7 @@ deps =
     pytest60: pytest==6.0.*
     pytest61: pytest==6.1.*
     pytest62: pytest==6.2.*
+    pytest70: pytest==7.0.*
     pytestdev: git+https://github.com/pytest-dev/pytest#egg=pytest
 
 extras =