Merge pull request #1347 from dandi/pytest-up

Replace `_pytest` imports with modern `pytest` imports
dandi · Nov 9, 2023 · cb86c9c · cb86c9c
2 parents 27e418d + bcd1d93
commit cb86c9c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/dandi/conftest.py b/dandi/conftest.py
@@ -1,8 +1,6 @@
 from __future__ import annotations
 
-from _pytest.config import Config
-from _pytest.config.argparsing import Parser
-from _pytest.nodes import Item
+from pytest import Config, Item, Parser
 
 from .tests.fixtures import *  # noqa: F401, F403  # lgtm [py/polluting-import]
 

diff --git a/dandi/tests/fixtures.py b/dandi/tests/fixtures.py
@@ -13,7 +13,6 @@
 from typing import Any, Literal
 from uuid import uuid4
 
-from _pytest.fixtures import FixtureRequest
 from click.testing import CliRunner
 from dandischema.consts import DANDI_SCHEMA_VERSION
 from dateutil.tz import tzlocal, tzutc
@@ -560,7 +559,7 @@ def sample_dandiset_factory(
 
 @pytest.fixture()
 def new_dandiset(
-    request: FixtureRequest, sample_dandiset_factory: SampleDandisetFactory
+    request: pytest.FixtureRequest, sample_dandiset_factory: SampleDandisetFactory
 ) -> SampleDandiset:
     return sample_dandiset_factory.mkdandiset(
         f"Sample Dandiset for {request.node.name}"