Remove legacy pip resolver (home-assistant#92124)

Co-authored-by: J. Nick Koston <[email protected]>
peribeir · Apr 27, 2023 · cdbffee · cdbffee
1 parent 89d8bda
commit cdbffee
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 98 deletions.
diff --git a/.core_files.yaml b/.core_files.yaml
@@ -137,7 +137,6 @@ other: &other
 requirements: &requirements
   - .github/workflows/**
   - homeassistant/package_constraints.txt
-  - script/pip_check
   - requirements*.txt
   - pyproject.toml
 

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
@@ -140,7 +140,7 @@ jobs:
         shell: bash
         run: |
           python3 -m pip install packaging tomli
-          python3 -m pip install --use-deprecated=legacy-resolver .
+          python3 -m pip install .
           version="$(python3 script/version_bump.py nightly)"
 
           if [[ "$(ls home_assistant_frontend*.whl)" =~ ^home_assistant_frontend-(.*)-py3-none-any.whl$ ]]; then

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -544,8 +544,8 @@ jobs:
           . venv/bin/activate
           python --version
           pip install --cache-dir=$PIP_CACHE -U "pip>=21.0,<23.2" setuptools wheel
-          pip install --cache-dir=$PIP_CACHE -r requirements_all.txt --use-deprecated=legacy-resolver
-          pip install --cache-dir=$PIP_CACHE -r requirements_test.txt --use-deprecated=legacy-resolver
+          pip install --cache-dir=$PIP_CACHE -r requirements_all.txt
+          pip install --cache-dir=$PIP_CACHE -r requirements_test.txt
           pip install -e .
 
   hassfest:
@@ -719,42 +719,6 @@ jobs:
           python --version
           mypy homeassistant/components/${{ needs.info.outputs.integrations_glob }}
 
-  pip-check:
-    runs-on: ubuntu-22.04
-    if: |
-      github.event.inputs.pylint-only != 'true'
-      && github.event.inputs.mypy-only != 'true'
-    needs:
-      - info
-      - base
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
-    name: Run pip check ${{ matrix.python-version }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/[email protected]
-      - name: Set up Python ${{ matrix.python-version }}
-        id: python
-        uses: actions/[email protected]
-        with:
-          python-version: ${{ matrix.python-version }}
-          check-latest: true
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
-        id: cache-venv
-        uses: actions/cache/[email protected]
-        with:
-          path: venv
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-            needs.info.outputs.python_cache_key }}
-      - name: Run pip check
-        run: |
-          . venv/bin/activate
-          ./script/pip_check $PIP_CACHE
-
   pytest:
     runs-on: ubuntu-22.04
     if: |

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -187,7 +187,6 @@ jobs:
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
           skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
-          legacy: true
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtaa"
@@ -202,7 +201,6 @@ jobs:
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
           skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
-          legacy: true
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtab"
@@ -334,7 +332,6 @@ jobs:
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
           skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
-          legacy: true
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtaa"
@@ -349,7 +346,6 @@ jobs:
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
           skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
-          legacy: true
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtab"
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -103,7 +103,7 @@
     {
       "label": "Install all Requirements",
       "type": "shell",
-      "command": "pip3 install --use-deprecated=legacy-resolver -r requirements_all.txt",
+      "command": "pip3 install -r requirements_all.txt",
       "group": {
         "kind": "build",
         "isDefault": true
@@ -117,7 +117,7 @@
     {
       "label": "Install all Test Requirements",
       "type": "shell",
-      "command": "pip3 install --use-deprecated=legacy-resolver -r requirements_test_all.txt",
+      "command": "pip3 install -r requirements_test_all.txt",
       "group": {
         "kind": "build",
         "isDefault": true

diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,6 @@ RUN \
         --no-index \
         --only-binary=:all: \
         --find-links "${WHEELS_LINKS}" \
-        --use-deprecated=legacy-resolver \
         -r homeassistant/requirements.txt
 
 COPY requirements_all.txt home_assistant_frontend-* home_assistant_intents-* homeassistant/
@@ -43,7 +42,6 @@ RUN \
             --no-index \
             --only-binary=:all: \
             --find-links "${WHEELS_LINKS}" \
-            --use-deprecated=legacy-resolver \
             -r homeassistant/requirements_all.txt
 
 ## Setup Home Assistant Core
@@ -54,7 +52,6 @@ RUN \
         --no-index \
         --only-binary=:all: \
         --find-links "${WHEELS_LINKS}" \
-        --use-deprecated=legacy-resolver \
         -e ./homeassistant \
     && python3 -m compileall \
         homeassistant/homeassistant

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -45,9 +45,9 @@ WORKDIR /workspaces
 # Install Python dependencies from requirements
 COPY requirements.txt ./
 COPY homeassistant/package_constraints.txt homeassistant/package_constraints.txt
-RUN pip3 install -r requirements.txt --use-deprecated=legacy-resolver
+RUN pip3 install -r requirements.txt
 COPY requirements_test.txt requirements_test_pre_commit.txt ./
-RUN pip3 install -r requirements_test.txt --use-deprecated=legacy-resolver
+RUN pip3 install -r requirements_test.txt
 RUN rm -rf requirements.txt requirements_test.txt requirements_test_pre_commit.txt homeassistant/
 
 # Set the default shell to bash instead of sh

diff --git a/homeassistant/components/mycroft/manifest.json b/homeassistant/components/mycroft/manifest.json
@@ -2,6 +2,7 @@
   "domain": "mycroft",
   "name": "Mycroft",
   "codeowners": [],
+  "disabled": "Dependencies not compatible with the new pip resolver",
   "documentation": "https://www.home-assistant.io/integrations/mycroft",
   "iot_class": "local_push",
   "loggers": ["mycroftapi"],

diff --git a/homeassistant/components/mycroft/notify.py b/homeassistant/components/mycroft/notify.py
@@ -3,7 +3,7 @@
 
 import logging
 
-from mycroftapi import MycroftAPI
+from mycroftapi import MycroftAPI  # pylint: disable=import-error
 
 from homeassistant.components.notify import BaseNotificationService
 from homeassistant.core import HomeAssistant

diff --git a/homeassistant/components/smarty/__init__.py b/homeassistant/components/smarty/__init__.py
@@ -3,7 +3,7 @@
 import ipaddress
 import logging
 
-from pysmarty import Smarty
+from pysmarty import Smarty  # pylint: disable=import-error
 import voluptuous as vol
 
 from homeassistant.const import CONF_HOST, CONF_NAME, Platform

diff --git a/homeassistant/components/smarty/binary_sensor.py b/homeassistant/components/smarty/binary_sensor.py
@@ -3,7 +3,7 @@
 
 import logging
 
-from pysmarty import Smarty
+from pysmarty import Smarty  # pylint: disable=import-error
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,

diff --git a/homeassistant/components/smarty/fan.py b/homeassistant/components/smarty/fan.py
@@ -5,7 +5,7 @@
 import math
 from typing import Any
 
-from pysmarty import Smarty
+from pysmarty import Smarty  # pylint: disable=import-error
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.core import HomeAssistant, callback

diff --git a/homeassistant/components/smarty/manifest.json b/homeassistant/components/smarty/manifest.json
@@ -2,6 +2,7 @@
   "domain": "smarty",
   "name": "Salda Smarty",
   "codeowners": ["@z0mbieprocess"],
+  "disabled": "Dependencies not compatible with the new pip resolver",
   "documentation": "https://www.home-assistant.io/integrations/smarty",
   "iot_class": "local_polling",
   "loggers": ["pymodbus", "pysmarty"],

diff --git a/homeassistant/components/smarty/sensor.py b/homeassistant/components/smarty/sensor.py
@@ -4,7 +4,7 @@
 import datetime as dt
 import logging
 
-from pysmarty import Smarty
+from pysmarty import Smarty  # pylint: disable=import-error
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.const import UnitOfTemperature

diff --git a/homeassistant/components/watson_tts/manifest.json b/homeassistant/components/watson_tts/manifest.json
@@ -2,6 +2,7 @@
   "domain": "watson_tts",
   "name": "IBM Watson TTS",
   "codeowners": ["@rutkai"],
+  "disabled": "Dependencies not compatible with the new pip resolver",
   "documentation": "https://www.home-assistant.io/integrations/watson_tts",
   "iot_class": "cloud_push",
   "loggers": ["ibm_cloud_sdk_core", "ibm_watson"],

diff --git a/homeassistant/components/watson_tts/tts.py b/homeassistant/components/watson_tts/tts.py
@@ -1,8 +1,10 @@
 """Support for IBM Watson TTS integration."""
 import logging
 
-from ibm_cloud_sdk_core.authenticators import IAMAuthenticator
-from ibm_watson import TextToSpeechV1
+from ibm_cloud_sdk_core.authenticators import (  # pylint: disable=import-error
+    IAMAuthenticator,
+)
+from ibm_watson import TextToSpeechV1  # pylint: disable=import-error
 import voluptuous as vol
 
 from homeassistant.components.tts import PLATFORM_SCHEMA, Provider

diff --git a/requirements_all.txt b/requirements_all.txt
@@ -949,9 +949,6 @@ iaqualink==0.5.0
 # homeassistant.components.ibeacon
 ibeacon_ble==1.0.1
 
-# homeassistant.components.watson_tts
-ibm-watson==5.2.2
-
 # homeassistant.components.watson_iot
 ibmiotf==0.3.4
 
@@ -1162,9 +1159,6 @@ mutagen==1.46.0
 # homeassistant.components.mutesync
 mutesync==0.0.1
 
-# homeassistant.components.mycroft
-mycroftapi==2.0
-
 # homeassistant.components.nad
 nad_receiver==0.3.0
 
@@ -1977,9 +1971,6 @@ pysmartapp==0.3.3
 # homeassistant.components.smartthings
 pysmartthings==0.7.6
 
-# homeassistant.components.smarty
-pysmarty==0.8
-
 # homeassistant.components.edl21
 pysml==0.0.10
 

diff --git a/script/bootstrap b/script/bootstrap
@@ -8,5 +8,5 @@ cd "$(dirname "$0")/.."
 
 echo "Installing development dependencies..."
 python3 -m pip install wheel --constraint homeassistant/package_constraints.txt --upgrade
-python3 -m pip install colorlog pre-commit $(grep awesomeversion requirements.txt) --constraint homeassistant/package_constraints.txt --use-deprecated=legacy-resolver --upgrade
-python3 -m pip install -r requirements_test.txt -c homeassistant/package_constraints.txt --use-deprecated legacy-resolver --upgrade
+python3 -m pip install colorlog pre-commit $(grep awesomeversion requirements.txt) --constraint homeassistant/package_constraints.txt --upgrade
+python3 -m pip install -r requirements_test.txt -c homeassistant/package_constraints.txt --upgrade
diff --git a/script/pip_check b/script/pip_check
diff --git a/script/setup b/script/setup
@@ -24,7 +24,7 @@ fi
 script/bootstrap
 
 pre-commit install
-python3 -m pip install -e . --constraint homeassistant/package_constraints.txt --use-deprecated=legacy-resolver
+python3 -m pip install -e . --constraint homeassistant/package_constraints.txt
 python3 -m script.translations develop --all
 
 hass --script ensure_config -c config