Skip to content

Commit f55375f

Browse files
committed
Include aiohttp patch in verify
1 parent 1febde8 commit f55375f

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.github/workflows/verify.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,14 @@ jobs:
4545
- name: Create Python virtual environment
4646
if: steps.cache-venv.outputs.cache-hit != 'true'
4747
run: |
48-
pip install virtualenv --upgrade
48+
pip install uv
49+
uv pip install virtualenv --upgrade
4950
python -m venv venv
5051
. venv/bin/activate
51-
pip install -U pip setuptools wheel
52-
pip install -r requirements_test.txt -r requirements_commit.txt
52+
uv pip install -U pip setuptools wheel
53+
uv pip install -r requirements_test.txt -r requirements_commit.txt
54+
# TODO: Remove after update of aiohttp beyond 3.10.0
55+
uv pip show aiohttp | grep -q "Version: 3.10.0" && (grep -q "core.locations" venv/lib/python*/site-packages/aiohttp/web_urldispatcher.py && echo " *** aiohttp already patched" || ( echo "Patching aiohttp 3.10.0 for tests"; patch -tRup0 venv/lib/python*/site-packages/aiohttp/web_urldispatcher.py < patch/aiohttp310.patch && echo " *** aiohttp Patched!" || echo " *** aiohttp patch failed?")) || ( echo " ***"; echo " *** WE CAN REMOVE THE PATCH FOR aiohttp 3.10.0 from $0"; echo " ***" )
5356
- name: Restore pre-commit environment from cache
5457
id: cache-precommit
5558
uses: actions/cache@v4
@@ -194,11 +197,13 @@ jobs:
194197
run: |
195198
python -m venv venv
196199
. venv/bin/activate
197-
pip install -U pip setuptools wheel
200+
uv pip install -U pip setuptools wheel
198201
#pip install -r requirements_test.txt
199202
# 20220124 Mimic setup_test.sh
200-
pip install --upgrade -r requirements_test.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
201-
pip install --upgrade pytest-asyncio
203+
uv pip install --upgrade -r requirements_test.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
204+
uv pip install --upgrade pytest-asyncio
205+
# TODO: Remove after update of aiohttp beyond 3.10.0
206+
uv pip show aiohttp | grep -q "Version: 3.10.0" && (grep -q "core.locations" venv/lib/python*/site-packages/aiohttp/web_urldispatcher.py && echo " *** aiohttp already patched" || ( echo "Patching aiohttp 3.10.0 for tests"; patch -tRup0 venv/lib/python*/site-packages/aiohttp/web_urldispatcher.py < patch/aiohttp310.patch && echo " *** aiohttp Patched!" || echo " *** aiohttp patch failed?")) || ( echo " ***"; echo " *** WE CAN REMOVE THE PATCH FOR aiohttp 3.10.0 from $0"; echo " ***" )
202207
203208
pytest:
204209
runs-on: ubuntu-latest

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## ongoing
4+
5+
- Note2self; remove aiohttp 3.10 test fixing in scripts/* and verify workflow
6+
37
## v0.38.3
48

59
- Implement fix for Core Issue [#119686](https://github.com/home-assistant/core/issues/119686)

0 commit comments

Comments
 (0)