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.

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

Stop using private pytest API #9733

Merged
merged 2 commits into from
Oct 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
from collections.abc import Iterator
from collections.abc import Mapping

from _pytest.config import Config as PyTestConfig
from _pytest.config.argparsing import Parser
from _pytest.tmpdir import TempPathFactory
from keyring.credentials import Credential
from pytest import Config as PyTestConfig
from pytest import Parser
from pytest import TempPathFactory
from pytest_mock import MockerFixture

from poetry.poetry import Poetry
Expand Down
2 changes: 1 addition & 1 deletion tests/console/commands/cache/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
if TYPE_CHECKING:
from pathlib import Path

from _pytest.monkeypatch import MonkeyPatch
from pytest import MonkeyPatch

from tests.conftest import Config

Expand Down
2 changes: 1 addition & 1 deletion tests/console/commands/test_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
if TYPE_CHECKING:
from collections.abc import Iterator

from _pytest.fixtures import FixtureRequest
from poetry.core.packages.package import Package
from pytest import FixtureRequest
from pytest_mock import MockerFixture

from poetry.config.config import Config
Expand Down
2 changes: 1 addition & 1 deletion tests/installation/test_wheel_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


if TYPE_CHECKING:
from _pytest.tmpdir import TempPathFactory
from pytest import TempPathFactory

from tests.types import FixtureDirGetter

Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_utils_vcs_git.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@


if TYPE_CHECKING:
from _pytest.tmpdir import TempPathFactory
from dulwich.client import FetchPackResult
from dulwich.client import GitClient
from pytest import TempPathFactory
from pytest_mock import MockerFixture

from tests.conftest import Config
Expand Down
2 changes: 1 addition & 1 deletion tests/packages/test_locker.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@


if TYPE_CHECKING:
from _pytest.logging import LogCaptureFixture
from pytest import LogCaptureFixture
from pytest_mock import MockerFixture


Expand Down
2 changes: 1 addition & 1 deletion tests/repositories/test_installed_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@


if TYPE_CHECKING:
from _pytest.logging import LogCaptureFixture
from poetry.core.packages.package import Package
from pytest import LogCaptureFixture
from pytest_mock.plugin import MockerFixture

from poetry.poetry import Poetry
Expand Down
2 changes: 1 addition & 1 deletion tests/repositories/test_legacy_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
if TYPE_CHECKING:
import httpretty

from _pytest.monkeypatch import MonkeyPatch
from pytest import MonkeyPatch
from pytest_mock import MockerFixture

from poetry.config.config import Config
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/env/test_env_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from collections.abc import Callable
from collections.abc import Iterator

from _pytest.logging import LogCaptureFixture
from pytest import LogCaptureFixture
from pytest_mock import MockerFixture

from poetry.poetry import Poetry
Expand Down
4 changes: 2 additions & 2 deletions tests/utils/test_authenticator.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@


if TYPE_CHECKING:
from _pytest.logging import LogCaptureFixture
from _pytest.monkeypatch import MonkeyPatch
from pytest import LogCaptureFixture
from pytest import MonkeyPatch
from pytest_mock import MockerFixture

from tests.conftest import Config
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/test_password_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


if TYPE_CHECKING:
from _pytest.logging import LogCaptureFixture
from pytest import LogCaptureFixture
from pytest_mock import MockerFixture

from tests.conftest import Config
Expand Down
Loading