From 592acb41a61cdf26d531d3ebc5bc98c238903a5f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 7 Jul 2022 18:58:04 +0200 Subject: [PATCH 1/6] Add Python 3.11 beta to CI --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7209a0fbf6f76b..707c9457dfcb5f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,7 +26,7 @@ env: # Pin latest Python patch versions to avoid issues # with runners using different versions. DEFAULT_PYTHON: 3.9.14 - ALL_PYTHON_VERSIONS: "['3.9.14', '3.10.7']" + ALL_PYTHON_VERSIONS: "['3.9.14', '3.10.7', '3.11.0-rc.2']" PRE_COMMIT_CACHE: ~/.cache/pre-commit PIP_CACHE: /tmp/pip-cache SQLALCHEMY_WARN_20: 1 From 3d1cfb1354d2591c32c5bc43b3d9e1ea36b4ff35 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 7 Jul 2022 19:06:19 +0200 Subject: [PATCH 2/6] Add xml libs --- .github/workflows/ci.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 707c9457dfcb5f..274e8cceaa7f4c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -515,7 +515,9 @@ jobs: libavutil-dev \ libswresample-dev \ libswscale-dev \ - libudev-dev + libudev-dev \ + libxml2-dev \ + libxslt-dev - name: Create Python virtual environment if: steps.cache-venv.outputs.cache-hit != 'true' run: | From 420346afc874941a53f8190dd6f03507fb974d23 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 7 Jul 2022 19:20:17 +0200 Subject: [PATCH 3/6] Bump restrictedpython to 6.0a1.dev0 --- homeassistant/components/python_script/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/python_script/manifest.json b/homeassistant/components/python_script/manifest.json index 2bc2763e777667..e57e728e6ddb83 100644 --- a/homeassistant/components/python_script/manifest.json +++ b/homeassistant/components/python_script/manifest.json @@ -2,7 +2,7 @@ "domain": "python_script", "name": "Python Scripts", "documentation": "https://www.home-assistant.io/integrations/python_script", - "requirements": ["restrictedpython==5.2"], + "requirements": ["restrictedpython==6.0a1.dev0"], "codeowners": [], "quality_scale": "internal", "loggers": ["RestrictedPython"] diff --git a/requirements_all.txt b/requirements_all.txt index 3a4f2f451ed0ef..c24d6dc81a2141 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2144,7 +2144,7 @@ regenmaschine==2022.09.2 renault-api==0.1.11 # homeassistant.components.python_script -restrictedpython==5.2 +restrictedpython==6.0a1.dev0 # homeassistant.components.idteck_prox rfk101py==0.0.1 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 5ce8b6914feddf..18936857163885 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1477,7 +1477,7 @@ regenmaschine==2022.09.2 renault-api==0.1.11 # homeassistant.components.python_script -restrictedpython==5.2 +restrictedpython==6.0a1.dev0 # homeassistant.components.rflink rflink==0.0.63 From a90d2d0024d304c73e6596de0203a14a8ad04b55 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 7 Jul 2022 19:39:17 +0200 Subject: [PATCH 4/6] No extensions --- .github/workflows/ci.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 274e8cceaa7f4c..7eebeee78f4054 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -520,6 +520,13 @@ jobs: libxslt-dev - name: Create Python virtual environment if: steps.cache-venv.outputs.cache-hit != 'true' + env: + # https://github.com/aio-libs/aiohttp/issues/6600 (Python 3.11 beta) + AIOHTTP_NO_EXTENSIONS: 1 + # https://github.com/aio-libs/frozenlist/issues/285 (Python 3.11 beta) + FROZENLIST_NO_EXTENSIONS: 1 + # https://github.com/aio-libs/yarl/issues/680 (Python 3.11 beta) + YARL_NO_EXTENSIONS: 1 run: | python -m venv venv . venv/bin/activate From 94eed83e8947f1684e53d914d26e7bd2ae9491eb Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 21 Sep 2022 08:14:40 +0200 Subject: [PATCH 5/6] Revert "No extensions" This reverts commit c3532d06f19ca3f56b133b607a3da18c2daecc85. --- .github/workflows/ci.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7eebeee78f4054..274e8cceaa7f4c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -520,13 +520,6 @@ jobs: libxslt-dev - name: Create Python virtual environment if: steps.cache-venv.outputs.cache-hit != 'true' - env: - # https://github.com/aio-libs/aiohttp/issues/6600 (Python 3.11 beta) - AIOHTTP_NO_EXTENSIONS: 1 - # https://github.com/aio-libs/frozenlist/issues/285 (Python 3.11 beta) - FROZENLIST_NO_EXTENSIONS: 1 - # https://github.com/aio-libs/yarl/issues/680 (Python 3.11 beta) - YARL_NO_EXTENSIONS: 1 run: | python -m venv venv . venv/bin/activate From 634f54c353e90bb10bb4ccc74a1f5e820aa3dbcb Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 21 Sep 2022 08:44:39 +0200 Subject: [PATCH 6/6] Update aiohttp to 3.8.2 --- homeassistant/package_constraints.txt | 2 +- pyproject.toml | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index e4c2de90e75af0..6e769fc92a02f4 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -1,7 +1,7 @@ PyJWT==2.5.0 PyNaCl==1.5.0 aiodiscover==1.4.13 -aiohttp==3.8.1 +aiohttp==3.8.2 aiohttp_cors==0.7.0 astral==2.2 async-upnp-client==0.31.2 diff --git a/pyproject.toml b/pyproject.toml index c76b015c84a34b..1cc8542988133f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ classifiers = [ ] requires-python = ">=3.9.0" dependencies = [ - "aiohttp==3.8.1", + "aiohttp==3.8.2", "astral==2.2", "async_timeout==4.0.2", "attrs==21.2.0", diff --git a/requirements.txt b/requirements.txt index 28d3c11081b880..73e91dba38aec6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -c homeassistant/package_constraints.txt # Home Assistant Core -aiohttp==3.8.1 +aiohttp==3.8.2 astral==2.2 async_timeout==4.0.2 attrs==21.2.0