Skip to content

Commit bbda356

Browse files
authored
Update all python dependencies except pydantic (#110)
1 parent ee31b70 commit bbda356

20 files changed

+126
-155
lines changed

pdm.lock

+97-141
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ keywords = [
4040

4141
requires-python = ">=3.11"
4242
dependencies = [
43-
"pydantic>=2.5.2",
43+
"pydantic>=2.5.2, < 2.9",
4444
"httpx>=0.25.0",
4545
"typer[all]>=0.12.4",
4646
"structlog>=24.1.0",

tests/cli/conftest.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
import pytest
44
import structlog
5-
from anycastd._cli.main import app
65
from click.testing import Result
76
from typer.testing import CliRunner
87

8+
from anycastd._cli.main import app
9+
910

1011
@pytest.fixture
1112
def reset_structlog_config() -> Iterator[None]:

tests/cli/test_main.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
from pathlib import Path
44
from unittest.mock import MagicMock
55

6-
import anycastd
76
import pytest
87
import structlog
9-
from anycastd._cli.main import _get_main_configuration
108
from structlog.testing import capture_logs
119

10+
import anycastd
11+
from anycastd._cli.main import _get_main_configuration
12+
1213
RE_ISO_TIMESTAMP = (
1314
r"(\d{4})-(\d{2})-(\d{2})" # date
1415
r"T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)((-(\d{2}):(\d{2})|Z)?)" # time

tests/configuration/conftest.py

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import pytest
66
import tomli_w
7+
78
from anycastd._configuration.healthcheck import CabourotteHealthcheckConfiguration
89
from anycastd._configuration.main import MainConfiguration, ServiceConfiguration
910
from anycastd._configuration.prefix import FRRPrefixConfiguration

tests/configuration/test_conversion.py

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from pathlib import Path
44

55
import pytest
6+
67
from anycastd._configuration.conversion import (
78
_sub_config_to_instance,
89
dict_w_items_named_by_key_to_flat_w_name_value,

tests/configuration/test_main_configuration.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import pytest
2+
23
from anycastd._configuration.exceptions import ConfigurationSyntaxError
34
from anycastd._configuration.main import MainConfiguration
45

tests/configuration/test_reading_configuration_file.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from pathlib import Path
22

33
import pytest
4+
45
from anycastd._configuration.exceptions import (
56
ConfigurationFileUnreadableError,
67
ConfigurationSyntaxError,

tests/configuration/test_sub_configuration.py

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from types import ModuleType
55

66
import pytest
7+
78
from anycastd._configuration import healthcheck, prefix
89
from anycastd._configuration.exceptions import ConfigurationSyntaxError
910
from anycastd._configuration.healthcheck import CabourotteHealthcheckConfiguration

tests/conftest.py

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from typing import TypeAlias
44

55
import pytest
6+
67
from anycastd.prefix import VRF
78

89
_IP_Prefix: TypeAlias = IPv4Network | IPv6Network

tests/healthcheck/cabourotte/test_main.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
import httpx
44
import pytest
5+
from pytest_mock import MockerFixture
6+
from structlog.testing import capture_logs
7+
58
from anycastd.healthcheck._cabourotte.exceptions import CabourotteCheckNotFoundError
69
from anycastd.healthcheck._cabourotte.main import CabourotteHealthcheck
710
from anycastd.healthcheck._cabourotte.result import Result
8-
from pytest_mock import MockerFixture
9-
from structlog.testing import capture_logs
1011

1112

1213
def test__init__():

tests/healthcheck/cabourotte/test_result.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
import httpx
66
import pytest
77
import respx
8+
from hypothesis import assume, given, strategies
9+
from pytest_mock import MockerFixture
10+
811
from anycastd.healthcheck._cabourotte.exceptions import (
912
CabourotteCheckError,
1013
CabourotteCheckNotFoundError,
1114
)
1215
from anycastd.healthcheck._cabourotte.result import Result, get_result
13-
from hypothesis import assume, given, strategies
14-
from pytest_mock import MockerFixture
1516

1617
CABOUROTTE_URL = "http://[::1]:9013"
1718

tests/healthcheck/test_checkers.py

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from unittest.mock import AsyncMock
33

44
import pytest
5+
56
from anycastd.healthcheck._common import interval_check
67

78

tests/prefix/frrouting/conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
import pytest
1010
import stamina
11-
from anycastd.prefix import VRF
1211
from testcontainers.core.container import DockerContainer
1312

13+
from anycastd.prefix import VRF
1414
from tests.conftest import _IP_Prefix
1515

1616
FRR_DOCKER_IMAGE = "quay.io/frrouting/frr:{}".format(

tests/prefix/frrouting/test_basic_functionality.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from pathlib import Path
22

33
import pytest
4+
45
from anycastd._executor import DockerExecutor
56
from anycastd.prefix import FRRoutingPrefix
6-
77
from tests.conftest import skip_without_docker
88

99
pytestmark = [pytest.mark.integration, pytest.mark.frrouting_daemon_required]

tests/prefix/frrouting/test_main.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
from ipaddress import IPv6Network
33
from pathlib import Path
44

5+
from structlog.testing import capture_logs
6+
57
from anycastd._executor import LocalExecutor
68
from anycastd.prefix._frrouting.exceptions import FRRCommandError
79
from anycastd.prefix._frrouting.main import FRRoutingPrefix
8-
from structlog.testing import capture_logs
910

1011

1112
def test_repr(example_networks, example_vrfs):

tests/test_entrypoint_version_check.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
"""Test the Python version check made by the entrypoint."""
22

3-
import anycastd.__main__
43
import pytest
54

5+
import anycastd.__main__
6+
67
MIN_PYTHON_VERSION = (3, 11)
78

89

tests/test_executor.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import pytest
2+
23
from anycastd._executor import LocalExecutor
34

45
pytestmark = pytest.mark.integration

tests/test_run.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
import signal
33

44
import pytest
5+
from structlog.testing import capture_logs
6+
57
from anycastd.core._run import run_services, signal_handler
68
from anycastd.core._service import Service
7-
from structlog.testing import capture_logs
89

910

1011
@pytest.fixture

tests/test_service.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import asyncio
22

33
import pytest
4-
from anycastd.core import Service
54
from pytest_mock import MockerFixture
65
from structlog.testing import capture_logs
76

7+
from anycastd.core import Service
88
from tests.dummy import DummyHealthcheck, DummyPrefix
99

1010

0 commit comments

Comments
 (0)