Fix pytest 7 warning (#75)

Author: alex-treebeard

poetry.lock

@@ -23,7 +23,7 @@ Pygments = "^2.7.3"
 ipykernel = ">=5.4.0"
 
 [tool.poetry.dev-dependencies]
-pytest = "6.2.5"
+pytest = "^7.1.0"
 pre-commit = "^2.8.2"
 pytest-cov = "^2.10.1"
 pytest-xdist = "^2.1.0"

pyproject.toml

@@ -3,6 +3,8 @@
 from pathlib import Path
 from typing import Any, Optional
 
+import pkg_resources
+
 from .pytest_items import NotebookFile
 
 
@@ -45,6 +47,11 @@ def pytest_collect_file(path: str, parent: Any) -> Optional[Any]:
     opt = parent.config.option
     p = Path(path)
     if opt.nbmake and p.match("*ipynb") and "_build" not in p.parts:
-        return NotebookFile.from_parent(parent, fspath=path)
+        ver: int = int(pkg_resources.get_distribution("pytest").version[0])
+
+        if ver < 7:
+            return NotebookFile.from_parent(parent, fspath=path)
+
+        return NotebookFile.from_parent(parent, path=p)
 
     return None

src/nbmake/pytest_plugin.py

@@ -3,10 +3,9 @@
 from typing import Any, Dict, List
 
 import yaml
-from _pytest.pytester import Testdir
 from nbformat import write
 from nbformat.v4 import new_code_cell, new_markdown_cell, new_notebook
-from pytest import fixture
+from pytest import Pytester, fixture
 
 HOME: str = os.environ["HOME"]
 
@@ -49,8 +48,7 @@ def write_config(conf: Dict[Any, Any], filename: Path = Path("_config.yml")) ->
 
 
 @fixture
-def testdir2(testdir: Testdir) -> Testdir:
+def testdir2(pytester: Pytester):
     os.environ[
         "HOME"
     ] = HOME  # ensures jupyter client can start the ipykernel subprocess without module location issues
-    return testdir

tests/helper.py

@@ -1,8 +1,10 @@
+import os
 from pathlib import Path
 
-from _pytest.pytester import Testdir
 from nbformat import write
 from nbformat.v4 import new_code_cell, new_notebook, new_output
+from pytest import Pytester
+from typing_extensions import Never
 
 NB_VERSION = 4
 from nbmake.nb_result import NotebookResult
@@ -16,17 +18,17 @@
 
 
 class TestNotebookRun:
-    def test_when_passing_then_no_failing_cell(self, testdir2: Testdir):
+    def test_when_passing_then_no_failing_cell(self, testdir2: Never):
         write_nb(passing_nb, filename)
 
         run = NotebookRun(filename, 300)
         res: NotebookResult = run.execute()
 
         assert res.error == None
 
-    def test_when_runs_then_cwd_is_nb_location(self, testdir2: Testdir):
+    def test_when_runs_then_cwd_is_nb_location(self, testdir2: Never):
         subdir = Path("subdir")
-        subdir.mkdir()
+        subdir.mkdir(exist_ok=True)
         write_nb(
             ["import os; assert os.getcwd().endswith('subdir')"], subdir / filename
         )
@@ -36,14 +38,14 @@ def test_when_runs_then_cwd_is_nb_location(self, testdir2: Testdir):
 
         assert res.error == None
 
-    def test_failing(self, testdir2: Testdir):
+    def test_failing(self, testdir2: Never):
         write_nb(failing_nb, filename)
         run = NotebookRun(filename, 300)
         res: NotebookResult = run.execute()
 
         assert res.error and res.error.failing_cell_index == 1
 
-    def test_when_allow_errors_then_passing(self, testdir2: Testdir):
+    def test_when_allow_errors_then_passing(self, testdir2: Never):
         nb = new_notebook()
         nb.metadata.execution = {"allow_errors": True}
         cell = new_code_cell("raise Exception()")
@@ -56,7 +58,7 @@ def test_when_allow_errors_then_passing(self, testdir2: Testdir):
         assert not res.error
         assert res.nb.cells[0].outputs[0].ename == "Exception"
 
-    def test_when_timeout_then_fails(self, testdir2: Testdir):
+    def test_when_timeout_then_fails(self, testdir2: Never):
         nb = new_notebook()
         nb.metadata.execution = {"timeout": 1}
         nb.cells += [
@@ -72,7 +74,7 @@ def test_when_timeout_then_fails(self, testdir2: Testdir):
         assert not Path("fail.txt").exists()
         assert res.error and res.error.failing_cell_index == 1
 
-    def test_when_executed_then_stripped_out(self, testdir2: Testdir):
+    def test_when_executed_then_stripped_out(self, testdir2: Never):
         nb = new_notebook(metadata={})
         nb.cells += [
             new_code_cell(
@@ -91,7 +93,7 @@ def test_when_executed_then_stripped_out(self, testdir2: Testdir):
         assert res.nb.cells[0].outputs[0].ename == "Exception"
         assert res.nb.cells[1].outputs == []
 
-    def test_when_unknown_kernel_then_error(self, testdir2: Testdir):
+    def test_when_unknown_kernel_then_error(self, testdir2: Never):
         nb = new_notebook(
             metadata={"kernelspec": {"display_name": "asdf", "name": "asdf"}}
         )
@@ -102,19 +104,19 @@ def test_when_unknown_kernel_then_error(self, testdir2: Testdir):
         res: NotebookResult = run.execute()
         assert res.error and "No such kernel" in res.error.summary
 
-    def test_when_cell_ignored_then_does_not_run(self, testdir2: Testdir):
+    def test_when_cell_ignored_then_does_not_run(self, testdir2: Never):
         nb = Path(__file__).parent / "resources" / "ignore_tag.ipynb"
         run = NotebookRun(nb, 300)
         res: NotebookResult = run.execute()
         assert res.error == None
 
-    def test_when_raises_exc_tag_then_succeeds(self, testdir2: Testdir):
+    def test_when_raises_exc_tag_then_succeeds(self, testdir2: Never):
         nb = Path(__file__).parent / "resources" / "raises_tag.ipynb"
         run = NotebookRun(nb, 300)
         res: NotebookResult = run.execute()
         assert res.error == None
 
-    def test_when_mock_then_succeeds(self, testdir2: Testdir):
+    def test_when_mock_then_succeeds(self, testdir2: Never):
         nb = Path(__file__).parent / "resources" / "mock.ipynb"
         run = NotebookRun(nb, 300)
         res: NotebookResult = run.execute()