diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 616e25d9162..c735a446938 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -141,7 +141,6 @@ jobs: run: | requirement_files="requirements_all.txt requirements_diff.txt" for requirement_file in ${requirement_files}; do - sed -i "s|# azure-servicebus|azure-servicebus|g" ${requirement_file} sed -i "s|# pybluez|pybluez|g" ${requirement_file} sed -i "s|# beacontools|beacontools|g" ${requirement_file} sed -i "s|# fritzconnection|fritzconnection|g" ${requirement_file} @@ -264,12 +263,6 @@ jobs: # beacontools requires PyBluez. # sed -i "s|# beacontools|beacontools|g" ${requirement_file} - # azure-servicebus requires uamqp, which requires OpenSSL 1.1 to - # compile/build. This is not available on Alpine 3.17. The compat - # layer offered by Alpine conflicts, so we have no way to build - # this package. - # sed -i "s|# azure-servicebus|azure-servicebus|g" ${requirement_file} - # It doesn't build for some reason, so we skip it for now. # Bumping to the latest version (4.7.0.72) supporting Python 3.11 # doesn't help. Reverted bump in #91871. There are 8 registered diff --git a/homeassistant/components/azure_event_hub/__init__.py b/homeassistant/components/azure_event_hub/__init__.py index 30417a7f94a..4e69bea1a38 100644 --- a/homeassistant/components/azure_event_hub/__init__.py +++ b/homeassistant/components/azure_event_hub/__init__.py @@ -155,7 +155,6 @@ class AzureEventHub: Suppress the INFO and below logging on the underlying packages, they are very verbose, even at INFO. """ - logging.getLogger("uamqp").setLevel(logging.WARNING) logging.getLogger("azure.eventhub").setLevel(logging.WARNING) self._listener_remover = self.hass.bus.async_listen( MATCH_ALL, self.async_listen diff --git a/homeassistant/components/azure_service_bus/manifest.json b/homeassistant/components/azure_service_bus/manifest.json index 1ec3c690c4e..059f6300aec 100644 --- a/homeassistant/components/azure_service_bus/manifest.json +++ b/homeassistant/components/azure_service_bus/manifest.json @@ -5,5 +5,5 @@ "documentation": "https://www.home-assistant.io/integrations/azure_service_bus", "iot_class": "cloud_push", "loggers": ["azure"], - "requirements": ["azure-servicebus==7.8.0"] + "requirements": ["azure-servicebus==7.10.0"] } diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index 122e82c4bf8..3384bc4f651 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -152,10 +152,6 @@ matplotlib==3.6.1 # cryptography 40.0.1 is installed with botocore pyOpenSSL>=23.1.0 -# uamqp newer versions we currently can't build for armv7/armhf -# Limit this to Python 3.10, to not block Python 3.11 dev for now -uamqp==1.6.0;python_version<'3.11' - # protobuf must be in package constraints for the wheel # builder to build binary wheels protobuf==4.22.3 diff --git a/requirements_all.txt b/requirements_all.txt index 04a494536ab..74134c0574c 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -407,7 +407,7 @@ axis==48 azure-eventhub==5.11.1 # homeassistant.components.azure_service_bus -# azure-servicebus==7.8.0 +azure-servicebus==7.10.0 # homeassistant.components.baidu baidu-aip==1.6.6 diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py index f3479d47789..594c78c81aa 100755 --- a/script/gen_requirements_all.py +++ b/script/gen_requirements_all.py @@ -24,7 +24,6 @@ COMMENT_REQUIREMENTS = ( "atenpdu", # depends on pysnmp which is not maintained at this time "avea", # depends on bluepy "avion", - "azure-servicebus", # depends on uamqp, which requires OpenSSL 1.1 "beacontools", "beewi_smartclim", # depends on bluepy "bluepy", @@ -157,10 +156,6 @@ matplotlib==3.6.1 # cryptography 40.0.1 is installed with botocore pyOpenSSL>=23.1.0 -# uamqp newer versions we currently can't build for armv7/armhf -# Limit this to Python 3.10, to not block Python 3.11 dev for now -uamqp==1.6.0;python_version<'3.11' - # protobuf must be in package constraints for the wheel # builder to build binary wheels protobuf==4.22.3