Skip to content
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
2 changes: 1 addition & 1 deletion homeassistant/components/esphome/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"mqtt": ["esphome/discover/#"],
"quality_scale": "platinum",
"requirements": [
"aioesphomeapi==41.11.0",
"aioesphomeapi==41.12.0",
"esphome-dashboard-api==1.3.0",
"bleak-esphome==3.4.0"
],
Expand Down
7 changes: 4 additions & 3 deletions homeassistant/components/vicare/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@

DEFAULT_CACHE_DURATION = 60

VICARE_BAR = "bar"
VICARE_CUBIC_METER = "cubicMeter"
VICARE_KW = "kilowatt"
VICARE_KWH = "kilowattHour"
VICARE_PERCENT = "percent"
VICARE_W = "watt"
VICARE_KW = "kilowatt"
VICARE_WH = "wattHour"
VICARE_KWH = "kilowattHour"
VICARE_CUBIC_METER = "cubicMeter"


class HeatingType(enum.Enum):
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/vicare/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"documentation": "https://www.home-assistant.io/integrations/vicare",
"iot_class": "cloud_polling",
"loggers": ["PyViCare"],
"requirements": ["PyViCare==2.51.0"]
"requirements": ["PyViCare==2.52.0"]
}
15 changes: 9 additions & 6 deletions homeassistant/components/vicare/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

from .const import (
VICARE_BAR,
VICARE_CUBIC_METER,
VICARE_KW,
VICARE_KWH,
Expand All @@ -62,20 +63,22 @@
_LOGGER = logging.getLogger(__name__)

VICARE_UNIT_TO_DEVICE_CLASS = {
VICARE_WH: SensorDeviceClass.ENERGY,
VICARE_BAR: SensorDeviceClass.PRESSURE,
VICARE_CUBIC_METER: SensorDeviceClass.GAS,
VICARE_KW: SensorDeviceClass.POWER,
VICARE_KWH: SensorDeviceClass.ENERGY,
VICARE_WH: SensorDeviceClass.ENERGY,
VICARE_W: SensorDeviceClass.POWER,
VICARE_KW: SensorDeviceClass.POWER,
VICARE_CUBIC_METER: SensorDeviceClass.GAS,
}

VICARE_UNIT_TO_HA_UNIT = {
VICARE_BAR: UnitOfPressure.BAR,
VICARE_CUBIC_METER: UnitOfVolume.CUBIC_METERS,
VICARE_KW: UnitOfPower.KILO_WATT,
VICARE_KWH: UnitOfEnergy.KILO_WATT_HOUR,
VICARE_PERCENT: PERCENTAGE,
VICARE_W: UnitOfPower.WATT,
VICARE_KW: UnitOfPower.KILO_WATT,
VICARE_WH: UnitOfEnergy.WATT_HOUR,
VICARE_KWH: UnitOfEnergy.KILO_WATT_HOUR,
VICARE_CUBIC_METER: UnitOfVolume.CUBIC_METERS,
}


Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/zeroconf/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"iot_class": "local_push",
"loggers": ["zeroconf"],
"quality_scale": "internal",
"requirements": ["zeroconf==0.147.2"]
"requirements": ["zeroconf==0.148.0"]
}
6 changes: 3 additions & 3 deletions homeassistant/package_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ orjson==3.11.3
packaging>=23.1
paho-mqtt==2.1.0
Pillow==11.3.0
propcache==0.3.2
propcache==0.4.0
psutil-home-assistant==0.0.1
PyJWT==2.10.1
pymicro-vad==1.0.1
Expand All @@ -67,15 +67,15 @@ SQLAlchemy==2.0.41
standard-aifc==3.13.0
standard-telnetlib==3.13.0
typing-extensions>=4.15.0,<5.0
ulid-transform==1.4.0
ulid-transform==1.5.2
urllib3>=2.0
uv==0.8.9
voluptuous-openapi==0.1.0
voluptuous-serialize==2.7.0
voluptuous==0.15.2
webrtc-models==0.3.0
yarl==1.20.1
zeroconf==0.147.2
zeroconf==0.148.0

# Constrain pycryptodome to avoid vulnerability
# see https://github.com/home-assistant/core/pull/16238
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ dependencies = [
# PyJWT has loose dependency. We want the latest one.
"cryptography==46.0.2",
"Pillow==11.3.0",
"propcache==0.3.2",
"propcache==0.4.0",
"pyOpenSSL==25.3.0",
"orjson==3.11.3",
"packaging>=23.1",
Expand All @@ -72,15 +72,15 @@ dependencies = [
"standard-aifc==3.13.0",
"standard-telnetlib==3.13.0",
"typing-extensions>=4.15.0,<5.0",
"ulid-transform==1.4.0",
"ulid-transform==1.5.2",
"urllib3>=2.0",
"uv==0.8.9",
"voluptuous==0.15.2",
"voluptuous-serialize==2.7.0",
"voluptuous-openapi==0.1.0",
"yarl==1.20.1",
"webrtc-models==0.3.0",
"zeroconf==0.147.2",
"zeroconf==0.148.0",
]

[project.urls]
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions requirements_all.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions requirements_test_all.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions script/hassfest/requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,23 @@
"typing_extensions": "SemVer",
"urllib3": "SemVer",
"yarl": "SemVer",
"zeroconf": "SemVer",
}
PACKAGE_CHECK_PREPARE_UPDATE: dict[str, int] = {
# In the form dict("dependencyX": n+1)
# - dependencyX should be the name of the referenced dependency
# - current major version +1
# Pandas will only fully support Python 3.14 in v3.
# Zeroconf will switch to v1 soon, without any breaking changes.
"pandas": 3,
"zeroconf": 1,
}
PACKAGE_CHECK_VERSION_RANGE_EXCEPTIONS: dict[str, dict[str, set[str]]] = {
# In the form dict("domain": {"package": {"dependency1", "dependency2"}})
# - domain is the integration domain
# - package is the package (can be transitive) referencing the dependency
# - dependencyX should be the name of the referenced dependency
"altruist": {"altruistclient": {"zeroconf"}},
"geocaching": {
# scipy version closely linked to numpy
# geocachingapi > reverse_geocode > scipy > numpy
Expand All @@ -74,6 +78,9 @@
# Current has an upper bound on major >=3.10.0,<4.0.0
"pystiebeleltron": {"pymodbus"}
},
"xiaomi_miio": {
"python-miio": {"zeroconf"},
},
}

PACKAGE_REGEX = re.compile(
Expand Down
6 changes: 5 additions & 1 deletion tests/components/vicare/snapshots/test_sensor.ambr
Original file line number Diff line number Diff line change
Expand Up @@ -2561,6 +2561,9 @@
}),
'name': None,
'options': dict({
'sensor': dict({
'suggested_display_precision': 2,
}),
}),
'original_device_class': <SensorDeviceClass.PRESSURE: 'pressure'>,
'original_icon': None,
Expand All @@ -2571,7 +2574,7 @@
'supported_features': 0,
'translation_key': 'supply_pressure',
'unique_id': 'gateway0_deviceSerialVitocal250A-supply_pressure',
'unit_of_measurement': None,
'unit_of_measurement': <UnitOfPressure.BAR: 'bar'>,
})
# ---
# name: test_all_entities[type:heatpump-vicare/Vitocal250A.json][sensor.model0_supply_pressure-state]
Expand All @@ -2580,6 +2583,7 @@
'device_class': 'pressure',
'friendly_name': 'model0 Supply pressure',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': <UnitOfPressure.BAR: 'bar'>,
}),
'context': <ANY>,
'entity_id': 'sensor.model0_supply_pressure',
Expand Down
Loading