Skip to content

Commit c74c317

Browse files
authored
Update slixmpp to 1.12.0 (home-assistant#154872)
1 parent 9edc624 commit c74c317

File tree

7 files changed

+17
-42
lines changed

7 files changed

+17
-42
lines changed

homeassistant/components/harmony/__init__.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@
33
from __future__ import annotations
44

55
import logging
6-
import sys
76

87
from homeassistant.components.remote import ATTR_ACTIVITY, ATTR_DELAY_SECS
98
from homeassistant.const import CONF_HOST, CONF_NAME, EVENT_HOMEASSISTANT_STOP
109
from homeassistant.core import Event, HomeAssistant, callback
11-
from homeassistant.exceptions import HomeAssistantError
1210
from homeassistant.helpers import entity_registry as er
1311
from homeassistant.helpers.dispatcher import async_dispatcher_send
1412

15-
if sys.version_info < (3, 14):
16-
from .const import HARMONY_OPTIONS_UPDATE, PLATFORMS
17-
from .data import HarmonyConfigEntry, HarmonyData
13+
from .const import HARMONY_OPTIONS_UPDATE, PLATFORMS
14+
from .data import HarmonyConfigEntry, HarmonyData
1815

1916
_LOGGER = logging.getLogger(__name__)
2017

@@ -25,10 +22,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: HarmonyConfigEntry) -> b
2522
# when setting up a config entry, we fallback to adding
2623
# the options to the config entry and pull them out here if
2724
# they are missing from the options
28-
if sys.version_info >= (3, 14):
29-
raise HomeAssistantError(
30-
"Logitech Harmony Hub is not supported on Python 3.14. Please use Python 3.13."
31-
)
3225
_async_import_options_from_data_if_missing(hass, entry)
3326

3427
address = entry.data[CONF_HOST]

homeassistant/components/harmony/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"documentation": "https://www.home-assistant.io/integrations/harmony",
88
"iot_class": "local_push",
99
"loggers": ["aioharmony", "slixmpp"],
10-
"requirements": ["aioharmony==0.5.3;python_version<'3.14'"],
10+
"requirements": ["aioharmony==0.5.3"],
1111
"ssdp": [
1212
{
1313
"manufacturer": "Logitech",

homeassistant/components/xmpp/manifest.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,5 @@
66
"iot_class": "cloud_push",
77
"loggers": ["pyasn1", "slixmpp"],
88
"quality_scale": "legacy",
9-
"requirements": [
10-
"slixmpp==1.10.0;python_version<'3.14'",
11-
"emoji==2.8.0;python_version<'3.14'"
12-
]
9+
"requirements": ["slixmpp==1.12.0", "emoji==2.8.0"]
1310
}

homeassistant/components/xmpp/notify.py

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,16 @@
99
import pathlib
1010
import random
1111
import string
12-
import sys
1312

1413
import requests
14+
import slixmpp
15+
from slixmpp.exceptions import IqError, IqTimeout, XMPPError
16+
from slixmpp.plugins.xep_0363.http_upload import (
17+
FileTooBig,
18+
FileUploadError,
19+
UploadServiceNotFound,
20+
)
21+
from slixmpp.xmlstream.xmlstream import NotConnectedError
1522
import voluptuous as vol
1623

1724
from homeassistant.components.notify import (
@@ -30,20 +37,9 @@
3037
CONF_SENDER,
3138
)
3239
from homeassistant.core import HomeAssistant
33-
from homeassistant.exceptions import HomeAssistantError
3440
from homeassistant.helpers import config_validation as cv, template as template_helper
3541
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
3642

37-
if sys.version_info < (3, 14):
38-
import slixmpp
39-
from slixmpp.exceptions import IqError, IqTimeout, XMPPError
40-
from slixmpp.plugins.xep_0363.http_upload import (
41-
FileTooBig,
42-
FileUploadError,
43-
UploadServiceNotFound,
44-
)
45-
from slixmpp.xmlstream.xmlstream import NotConnectedError
46-
4743
_LOGGER = logging.getLogger(__name__)
4844

4945
ATTR_PATH = "path"
@@ -79,10 +75,6 @@ async def async_get_service(
7975
discovery_info: DiscoveryInfoType | None = None,
8076
) -> XmppNotificationService:
8177
"""Get the Jabber (XMPP) notification service."""
82-
if sys.version_info >= (3, 14):
83-
raise HomeAssistantError(
84-
"Jabber (XMPP) is not supported on Python 3.14. Please use Python 3.13."
85-
)
8678
return XmppNotificationService(
8779
config.get(CONF_SENDER),
8880
config.get(CONF_RESOURCE),

requirements_all.txt

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

requirements_test_all.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/components/harmony/conftest.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
from __future__ import annotations
44

55
from collections.abc import Generator
6-
import sys
76
from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch
87

8+
from aioharmony.const import ClientCallbackType
99
import pytest
1010

1111
from homeassistant.components.harmony.const import ACTIVITY_POWER_OFF, DOMAIN
@@ -20,13 +20,6 @@
2020

2121
from tests.common import MockConfigEntry
2222

23-
if sys.version_info < (3, 14):
24-
from aioharmony.const import ClientCallbackType
25-
26-
if sys.version_info >= (3, 14):
27-
collect_ignore_glob = ["test_*.py"]
28-
29-
3023
ACTIVITIES_TO_IDS = {
3124
ACTIVITY_POWER_OFF: -1,
3225
"Watch TV": WATCH_TV_ACTIVITY_ID,

0 commit comments

Comments
 (0)