Home-Assistant/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2026-09-03 12:02:16 +01:00
Code Activity

Bump pytrafikverket to 2.0.0 (#180820)

Browse Source
This commit is contained in:
G Johansson
2026-08-30 16:56:04 +02:00
committed by GitHub
parent 426816eb57
commit 6c92a633b3
9 changed files with 72 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
homeassistant/components/trafikverket_camera/coordinator.py
+4 -2
View File
@@ -73,8 +73,10 @@ class TVDataUpdateCoordinator(DataUpdateCoordinator[CameraData]):
return CameraData(data=camera_data, image=None)
image_url = camera_data.photourl
if camera_data.fullsizephoto:
image_url = f"{camera_data.photourl}?type=fullsize"
if camera_data.has_fullsizephoto:
if TYPE_CHECKING:
assert camera_data.photourlfullsize is not None
image_url = camera_data.photourlfullsize
async with self.session.get(
image_url, timeout=aiohttp.ClientTimeout(total=10)
homeassistant/components/trafikverket_camera/manifest.json
+1 -1
View File
@@ -7,5 +7,5 @@
"integration_type": "service",
"iot_class": "cloud_polling",
"loggers": ["pytrafikverket"],
"requirements": ["pytrafikverket==1.1.1"]
"requirements": ["pytrafikverket==2.0.0"]
}
homeassistant/components/trafikverket_ferry/manifest.json
+1 -1
View File
@@ -7,5 +7,5 @@
"integration_type": "service",
"iot_class": "cloud_polling",
"loggers": ["pytrafikverket"],
"requirements": ["pytrafikverket==1.1.1"]
"requirements": ["pytrafikverket==2.0.0"]
}
homeassistant/components/trafikverket_train/manifest.json
+1 -1
View File
@@ -7,5 +7,5 @@
"integration_type": "service",
"iot_class": "cloud_polling",
"loggers": ["pytrafikverket"],
"requirements": ["pytrafikverket==1.1.1"]
"requirements": ["pytrafikverket==2.0.0"]
}
homeassistant/components/trafikverket_weatherstation/manifest.json
+1 -1
View File
@@ -7,5 +7,5 @@
"integration_type": "service",
"iot_class": "cloud_polling",
"loggers": ["pytrafikverket"],
"requirements": ["pytrafikverket==1.1.1"]
"requirements": ["pytrafikverket==2.0.0"]
}
requirements_all.txt
Generated
+1 -1
View File
@@ -2854,7 +2854,7 @@ pytradfri[async]==9.0.1
# homeassistant.components.trafikverket_ferry
# homeassistant.components.trafikverket_train
# homeassistant.components.trafikverket_weatherstation
pytrafikverket==1.1.1
pytrafikverket==2.0.0
# homeassistant.components.v2c
pytrydan==1.0.5
tests/components/trafikverket_camera/conftest.py
+49 -13
View File
@@ -24,8 +24,9 @@ async def load_integration_from_entry(
get_camera: CameraInfoModel,
) -> MockConfigEntry:
"""Set up the Trafikverket Camera integration in Home Assistant."""
aioclient_mock.get("https://www.testurl.com/test_photo.jpg", content=b"0123456789")
aioclient_mock.get(
"https://www.testurl.com/test_photo.jpg?type=fullsize", content=b"0123456789"
"https://www.testurl.com/test_photo_fullsize.jpg", content=b"0123456789"
)
config_entry = MockConfigEntry(
@@ -57,17 +58,24 @@ def fixture_get_camera() -> CameraInfoModel:
return CameraInfoModel(
camera_name="Test Camera",
camera_id="1234",
camera_group="Test Camera Group",
camera_type="Road",
active=True,
deleted=False,
description="Test Camera for testing",
direction="180",
fullsizephoto=True,
has_fullsizephoto=True,
has_sketchimage=True,
icon="12",
location="Test location",
modified=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
phototime=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
photourl="https://www.testurl.com/test_photo.jpg",
photourlfullsize="https://www.testurl.com/test_photo_fullsize.jpg",
photourlsketch="https://www.testurl.com/test_photo_sketch.jpg",
photourlthumbnail="https://www.testurl.com/test_photo_thumbnail.jpg",
status="Running",
camera_type="Road",
wgs84="POINT (12.345678 56.789012)",
)
@@ -78,17 +86,24 @@ def fixture_get_camera2() -> CameraInfoModel:
return CameraInfoModel(
camera_name="Test Camera2",
camera_id="5678",
camera_group="Test Camera Group2",
camera_type="Road",
active=True,
deleted=False,
description="Test Camera for testing2",
direction="180",
fullsizephoto=True,
has_fullsizephoto=True,
has_sketchimage=True,
icon="12",
location="Test location2",
modified=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
phototime=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
photourl="https://www.testurl.com/test_photo2.jpg",
photourlfullsize="https://www.testurl.com/test_photo2_fullsize.jpg",
photourlsketch="https://www.testurl.com/test_photo2_sketch.jpg",
photourlthumbnail="https://www.testurl.com/test_photo2_thumbnail.jpg",
status="Running",
camera_type="Road",
wgs84="POINT (12.345678 56.789012)",
)
@@ -100,32 +115,46 @@ def fixture_get_cameras() -> CameraInfoModel:
CameraInfoModel(
camera_name="Test Camera",
camera_id="1234",
camera_group="Test Camera Group",
camera_type="Road",
active=True,
deleted=False,
description="Test Camera for testing",
direction="180",
fullsizephoto=True,
location="Test location",
has_fullsizephoto=True,
has_sketchimage=True,
icon="12",
location="Test location2",
modified=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
phototime=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
photourl="https://www.testurl.com/test_photo.jpg",
photourlfullsize="https://www.testurl.com/test_photo_fullsize.jpg",
photourlsketch="https://www.testurl.com/test_photo_sketch.jpg",
photourlthumbnail="https://www.testurl.com/test_photo_thumbnail.jpg",
status="Running",
camera_type="Road",
wgs84="POINT (13.345678 56.789012)",
),
CameraInfoModel(
camera_name="Test Camera2",
camera_id="5678",
camera_group="Test Camera Group2",
camera_type="Road",
active=True,
deleted=False,
description="Test Camera for testing2",
direction="180",
fullsizephoto=True,
has_fullsizephoto=True,
has_sketchimage=True,
icon="12",
location="Test location2",
modified=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
phototime=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
photourl="https://www.testurl.com/test_photo2.jpg",
photourlfullsize="https://www.testurl.com/test_photo2_fullsize.jpg",
photourlsketch="https://www.testurl.com/test_photo2_sketch.jpg",
photourlthumbnail="https://www.testurl.com/test_photo2_thumbnail.jpg",
status="Running",
camera_type="Road",
wgs84="POINT (12.345678 56.789012)",
),
]
@@ -137,15 +166,22 @@ def fixture_get_camera_no_location() -> CameraInfoModel:
return CameraInfoModel(
camera_name="Test Camera",
camera_id="1234",
camera_group="Test Camera Group",
camera_type="Road",
active=True,
deleted=False,
description="Test Camera for testing",
direction="180",
fullsizephoto=True,
location=None,
has_fullsizephoto=True,
has_sketchimage=True,
icon="12",
location="Test location2",
modified=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
phototime=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
photourl="https://www.testurl.com/test_photo.jpg",
photourlfullsize="https://www.testurl.com/test_photo_fullsize.jpg",
photourlsketch="https://www.testurl.com/test_photo_sketch.jpg",
photourlthumbnail="https://www.testurl.com/test_photo_thumbnail.jpg",
status="Running",
camera_type="Road",
wgs84="POINT (12.345678 56.789012)",
)
tests/components/trafikverket_camera/test_coordinator.py
+1 -1
View File
@@ -30,7 +30,7 @@ async def test_coordinator(
) -> None:
"""Test the Trafikverket Camera coordinator."""
aioclient_mock.get(
"https://www.testurl.com/test_photo.jpg?type=fullsize", content=b"0123456789"
"https://www.testurl.com/test_photo_fullsize.jpg", content=b"0123456789"
)
entry = MockConfigEntry(
tests/components/trafikverket_camera/test_init.py
+13 -6
View File
@@ -24,7 +24,7 @@ async def test_setup_entry(
) -> None:
"""Test setup entry."""
aioclient_mock.get(
"https://www.testurl.com/test_photo.jpg?type=fullsize", content=b"0123456789"
"https://www.testurl.com/test_photo_fullsize.jpg", content=b"0123456789"
)
entry = MockConfigEntry(
@@ -56,7 +56,7 @@ async def test_unload_entry(
) -> None:
"""Test unload an entry."""
aioclient_mock.get(
"https://www.testurl.com/test_photo.jpg?type=fullsize", content=b"0123456789"
"https://www.testurl.com/test_photo_fullsize.jpg", content=b"0123456789"
)
entry = MockConfigEntry(
@@ -90,7 +90,7 @@ async def test_migrate_entry(
) -> None:
"""Test migrate entry to version 2."""
aioclient_mock.get(
"https://www.testurl.com/test_photo.jpg?type=fullsize", content=b"0123456789"
"https://www.testurl.com/test_photo_fullsize.jpg", content=b"0123456789"
)
entry = MockConfigEntry(
@@ -204,17 +204,24 @@ async def test_migrate_entry_fails_no_id(
_camera = CameraInfoModel(
camera_name="Test_camera",
camera_id=None,
camera_group="Test Camera Group",
camera_type="Road",
active=True,
deleted=False,
description="Test Camera for testing",
direction="180",
fullsizephoto=True,
location="Test location",
has_fullsizephoto=True,
has_sketchimage=True,
icon="12",
location="Test location2",
modified=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
phototime=datetime(2022, 4, 4, 4, 4, 4, tzinfo=dt_util.UTC),
photourl="https://www.testurl.com/test_photo.jpg",
photourlfullsize="https://www.testurl.com/test_photo_fullsize.jpg",
photourlsketch="https://www.testurl.com/test_photo_sketch.jpg",
photourlthumbnail="https://www.testurl.com/test_photo_thumbnail.jpg",
status="Running",
camera_type="Road",
wgs84="POINT (12.345678 56.789012)",
)
with patch(