Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace _pytest imports with modern pytest imports #1347

Merged
merged 1 commit into from
Nov 9, 2023
Merged

Replace _pytest imports with modern pytest imports #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions dandi/conftest.py
View file
Open in desktop
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
View file
Open in desktop
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