Skip to content

Commit 714c024

Browse files
authored
chore: update dependencies and fix warnings (#9933)
1 parent b9646bd commit 714c024

File tree

8 files changed

+772
-692
lines changed

8 files changed

+772
-692
lines changed

poetry.lock

Lines changed: 756 additions & 685 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Changelog = "https://python-poetry.org/history/"
3131
[tool.poetry.dependencies]
3232
python = "^3.9"
3333

34-
poetry-core = { git = "https://github.com/python-poetry/poetry-core.git", branch = "main" }
34+
poetry-core = "2.0.0"
3535
build = "^1.2.1"
3636
cachecontrol = { version = "^0.14.0", extras = ["filecache"] }
3737
cleo = "^2.1.0"
@@ -72,6 +72,7 @@ pytest-cov = ">=4.0"
7272
pytest-mock = ">=3.9"
7373
pytest-randomly = ">=3.12"
7474
pytest-xdist = { version = ">=3.1", extras = ["psutil"] }
75+
urllib3 = "<2.3" # see https://github.com/gabrielfalcao/HTTPretty/issues/484
7576

7677
[tool.poetry.group.typing.dependencies]
7778
mypy = ">=1.8.0"

tests/console/commands/test_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import pytest
1111

12-
from deepdiff import DeepDiff
12+
from deepdiff.diff import DeepDiff
1313
from poetry.core.pyproject.exceptions import PyProjectError
1414

1515
from poetry.config.config_source import ConfigSource

tests/inspection/test_info.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from __future__ import annotations
22

3+
import contextlib
34
import shutil
45
import uuid
56

@@ -210,7 +211,12 @@ def test_info_from_wheel_metadata_versions(
210211
fixture_dir("distributions")
211212
/ f"demo_metadata_version_{version}-0.1.0-py2.py3-none-any.whl"
212213
)
213-
info = PackageInfo.from_wheel(path)
214+
with (
215+
pytest.warns(NewMetadataVersion)
216+
if version == "299"
217+
else contextlib.nullcontext()
218+
):
219+
info = PackageInfo.from_wheel(path)
214220
demo_check_info(info)
215221
assert info._source_type == "file"
216222
assert info._source_url == path.resolve().as_posix()

tests/masonry/builders/test_editable_builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import pytest
1212

1313
from cleo.io.null_io import NullIO
14-
from deepdiff import DeepDiff
14+
from deepdiff.diff import DeepDiff
1515
from poetry.core.constraints.version import Version
1616
from poetry.core.masonry.metadata import Metadata
1717
from poetry.core.packages.package import Package

tests/test_factory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import pytest
88

99
from cleo.io.buffered_io import BufferedIO
10-
from deepdiff import DeepDiff
10+
from deepdiff.diff import DeepDiff
1111
from packaging.utils import canonicalize_name
1212
from poetry.core.constraints.version import Version
1313
from poetry.core.constraints.version import parse_constraint

tests/utils/test_dependency_specification.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import pytest
77

8-
from deepdiff import DeepDiff
8+
from deepdiff.diff import DeepDiff
99

1010
from poetry.inspection.info import PackageInfo
1111
from poetry.utils.dependency_specification import RequirementsParser

tests/utils/test_password_manager.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from __future__ import annotations
22

3+
import contextlib
34
import logging
45
import os
56

@@ -54,7 +55,8 @@ def test_get_http_auth(
5455
with_simple_keyring: None,
5556
dummy_keyring: DummyBackend,
5657
) -> None:
57-
dummy_keyring.set_password("poetry-repository-foo", username, password)
58+
with contextlib.nullcontext() if username else pytest.warns(DeprecationWarning):
59+
dummy_keyring.set_password("poetry-repository-foo", username, password)
5860
config.auth_config_source.add_property("http-basic.foo", {"username": username})
5961
manager = PasswordManager(config)
6062

0 commit comments

Comments
 (0)