Skip to content

Commit

Permalink
Replace _pytest imports with modern pytest imports
Browse files Browse the repository at this point in the history
  • Loading branch information
jwodder committed Nov 8, 2023
1 parent 59b6e12 commit bcd1d93
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 1 addition & 3 deletions dandi/conftest.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from typing import List

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]

Expand Down
3 changes: 1 addition & 2 deletions dandi/tests/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
from typing import TYPE_CHECKING, Any, Callable, Dict, Iterator, List, Optional, Union
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
Expand Down Expand Up @@ -565,7 +564,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}"
Expand Down

0 comments on commit bcd1d93

Please sign in to comment.