From 6b38adaa3dd47b46da6e728730baf5c0df87bba2 Mon Sep 17 00:00:00 2001 From: Ruslan Sayfutdinov Date: Mon, 17 May 2021 04:36:23 +0100 Subject: [PATCH] Downgrade setuptools to fix CI (#50734) --- .github/workflows/ci.yaml | 4 ++-- homeassistant/helpers/template.py | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fe14e44beed..a68aaa549c6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -56,7 +56,7 @@ jobs: run: | python -m venv venv . venv/bin/activate - pip install -U "pip<20.3" setuptools + pip install -U "pip<20.3" "setuptools<56.2" pip install -r requirements.txt -r requirements_test.txt - name: Generate partial pre-commit restore key id: generate-pre-commit-key @@ -580,7 +580,7 @@ jobs: python -m venv venv . venv/bin/activate - pip install -U "pip<20.3" setuptools wheel + pip install -U "pip<20.3" "setuptools<56.2" wheel pip install -r requirements_all.txt pip install -r requirements_test.txt pip install -e . diff --git a/homeassistant/helpers/template.py b/homeassistant/helpers/template.py index 6ac220788e0..40101e17128 100644 --- a/homeassistant/helpers/template.py +++ b/homeassistant/helpers/template.py @@ -24,7 +24,7 @@ import weakref import jinja2 from jinja2 import contextfilter, contextfunction from jinja2.sandbox import ImmutableSandboxedEnvironment -from jinja2.utils import Namespace # type: ignore +from jinja2.utils import Namespace import voluptuous as vol from homeassistant.const import ( @@ -581,9 +581,8 @@ class Template: self._strict = strict env = self._env - self._compiled = cast( - jinja2.Template, - jinja2.Template.from_code(env, self._compiled_code, env.globals, None), + self._compiled = jinja2.Template.from_code( + env, self._compiled_code, env.globals, None ) return self._compiled