Skip to content

Remove workarounds (HA-core updated to aiohttp 3.10.1 #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Remove workarounds (HA-core updated to aiohttp 3.10.1 #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24c215e
Remove workarounds (HA-core updated to aiohttp 3.10.1
CoMPaTech Aug 5, 2024
cb88722
Remove stale patches
CoMPaTech Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# Changelog

## ongoing

- Note2self; remove aiohttp 3.10 test fixing in scripts/* and verify workflow

## v0.38.3

- Implement fix for Core Issue [#119686](https://github.com/home-assistant/core/issues/119686)
Expand Down
19 changes: 0 additions & 19 deletions patch/aiohttp310.patch
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions scripts/tests_and_coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ pre-commit install
pre-commit install-hooks
pip install uv
uv pip install -r requirements_test.txt -r requirements_commit.txt
# TODO: Remove after update of aiohttp beyond 3.10.0
# shellcheck disable=SC2015
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 " ***" )

set +u

Expand Down