From 1b74359ddbec997a1827499522c65c25a924a00e Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 16 May 2021 23:12:23 -0700 Subject: [PATCH] Disable free-mobile because requirement breaks setuptools (#50749) --- .github/workflows/ci.yaml | 4 ++-- homeassistant/components/free_mobile/manifest.json | 3 ++- homeassistant/components/free_mobile/notify.py | 2 +- requirements_all.txt | 3 --- script/hassfest/model.py | 2 +- script/hassfest/requirements.py | 3 +++ 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a68aaa549c6..fe14e44beed 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -56,7 +56,7 @@ jobs: run: | python -m venv venv . venv/bin/activate - pip install -U "pip<20.3" "setuptools<56.2" + pip install -U "pip<20.3" setuptools pip install -r requirements.txt -r requirements_test.txt - name: Generate partial pre-commit restore key id: generate-pre-commit-key @@ -580,7 +580,7 @@ jobs: python -m venv venv . venv/bin/activate - pip install -U "pip<20.3" "setuptools<56.2" wheel + pip install -U "pip<20.3" setuptools wheel pip install -r requirements_all.txt pip install -r requirements_test.txt pip install -e . diff --git a/homeassistant/components/free_mobile/manifest.json b/homeassistant/components/free_mobile/manifest.json index ea6ea921a38..89a21298a38 100644 --- a/homeassistant/components/free_mobile/manifest.json +++ b/homeassistant/components/free_mobile/manifest.json @@ -4,5 +4,6 @@ "documentation": "https://www.home-assistant.io/integrations/free_mobile", "requirements": ["freesms==0.1.2"], "codeowners": [], - "iot_class": "cloud_push" + "iot_class": "cloud_push", + "disabled": "https://github.com/home-assistant/core/pull/50749" } diff --git a/homeassistant/components/free_mobile/notify.py b/homeassistant/components/free_mobile/notify.py index a4351bfe678..2cde2dd135e 100644 --- a/homeassistant/components/free_mobile/notify.py +++ b/homeassistant/components/free_mobile/notify.py @@ -1,7 +1,7 @@ """Support for Free Mobile SMS platform.""" import logging -from freesms import FreeClient +from freesms import FreeClient # pylint: disable=import-error import voluptuous as vol from homeassistant.components.notify import PLATFORM_SCHEMA, BaseNotificationService diff --git a/requirements_all.txt b/requirements_all.txt index 8000472f721..c61196e20c1 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -623,9 +623,6 @@ fortiosapi==0.10.8 # homeassistant.components.freebox freebox-api==0.0.10 -# homeassistant.components.free_mobile -freesms==0.1.2 - # homeassistant.components.fritz # homeassistant.components.fritzbox_callmonitor # homeassistant.components.fritzbox_netmonitor diff --git a/script/hassfest/model.py b/script/hassfest/model.py index 10bc10626a2..59d75be5c4a 100644 --- a/script/hassfest/model.py +++ b/script/hassfest/model.py @@ -83,7 +83,7 @@ class Integration: @property def disabled(self) -> str | None: - """List of disabled.""" + """Return if integration is disabled.""" return self.manifest.get("disabled") @property diff --git a/script/hassfest/requirements.py b/script/hassfest/requirements.py index fa5a36c6559..5927824b21f 100644 --- a/script/hassfest/requirements.py +++ b/script/hassfest/requirements.py @@ -95,6 +95,9 @@ def validate_requirements(integration: Integration): integration_requirements.add(req) integration_packages.add(package) + if integration.disabled: + return + install_ok = install_requirements(integration, integration_requirements) if not install_ok: