From e4280b2c0013cf0098bbf493f57c9052247442c7 Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Wed, 17 Apr 2024 17:57:34 +0200
Subject: [PATCH] Use aiohttp-zlib-ng[isal] (#115767)

---
 .github/workflows/builder.yml         | 9 ---------
 .github/workflows/wheels.yml          | 5 -----
 homeassistant/package_constraints.txt | 2 +-
 pyproject.toml                        | 2 +-
 requirements.txt                      | 2 +-
 5 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 217093793d1..f02a8bacce8 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -174,15 +174,6 @@ jobs:
           sed -i "s|pyezviz|# pyezviz|g" requirements_all.txt
           sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
 
-      - name: Adjustments for 64-bit
-        if: matrix.arch == 'amd64' || matrix.arch == 'aarch64'
-        run: |
-          # Some speedups are only available on 64-bit, and since
-          # we build 32bit images on 64bit hosts, we only enable
-          # the speed ups on 64bit since the wheels for 32bit
-          # are not available.
-          sed -i "s|aiohttp-zlib-ng|aiohttp-zlib-ng\[isal\]|g" requirements_all.txt
-
       - name: Download translations
         uses: actions/download-artifact@v4.1.4
         with:
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 3636906c305..7102df0ae4d 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -161,11 +161,6 @@ jobs:
               sed -i "s|pykrakenapi|# pykrakenapi|g" ${requirement_file}
             fi
 
-            # Some speedups are only for 64-bit
-            if [ "${{ matrix.arch }}" = "amd64" ] || [ "${{ matrix.arch }}" = "aarch64" ]; then
-              sed -i "s|aiohttp-zlib-ng|aiohttp-zlib-ng\[isal\]|g" ${requirement_file}
-            fi
-
           done
 
       - name: Split requirements all
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index dca7c82a885..6dce47b734d 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -4,7 +4,7 @@ aiodhcpwatcher==1.0.0
 aiodiscover==2.0.0
 aiodns==3.2.0
 aiohttp-fast-url-dispatcher==0.3.0
-aiohttp-zlib-ng==0.3.1
+aiohttp-zlib-ng[isal]==0.3.1
 aiohttp==3.9.5
 aiohttp_cors==0.7.0
 aiohttp_session==2.12.0
diff --git a/pyproject.toml b/pyproject.toml
index 2216295d00d..90466aa7290 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,7 +28,7 @@ dependencies    = [
     "aiohttp_cors==0.7.0",
     "aiohttp_session==2.12.0",
     "aiohttp-fast-url-dispatcher==0.3.0",
-    "aiohttp-zlib-ng==0.3.1",
+    "aiohttp-zlib-ng[isal]==0.3.1",
     "astral==2.2",
     "async-interrupt==1.1.1",
     "attrs==23.2.0",
diff --git a/requirements.txt b/requirements.txt
index 650a9bf7554..980bf84eb26 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ aiohttp==3.9.5
 aiohttp_cors==0.7.0
 aiohttp_session==2.12.0
 aiohttp-fast-url-dispatcher==0.3.0
-aiohttp-zlib-ng==0.3.1
+aiohttp-zlib-ng[isal]==0.3.1
 astral==2.2
 async-interrupt==1.1.1
 attrs==23.2.0