From 1dd87810bc0c0b51529a0a5194054effe8946de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 11 Jan 2022 11:50:17 +0200 Subject: [PATCH] Generate supported python versions based on current and next required (#62618) --- script/hassfest/requirements.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/script/hassfest/requirements.py b/script/hassfest/requirements.py index 2da82762240..09afd11b147 100644 --- a/script/hassfest/requirements.py +++ b/script/hassfest/requirements.py @@ -3,7 +3,6 @@ from __future__ import annotations from collections import deque import json -import operator import os import re import subprocess @@ -13,7 +12,7 @@ from awesomeversion import AwesomeVersion, AwesomeVersionStrategy from stdlib_list import stdlib_list from tqdm import tqdm -from homeassistant.const import REQUIRED_PYTHON_VER +from homeassistant.const import REQUIRED_NEXT_PYTHON_VER, REQUIRED_PYTHON_VER import homeassistant.util.package as pkg_util from script.gen_requirements_all import COMMENT_REQUIREMENTS, normalize_package_name @@ -29,8 +28,10 @@ PIP_REGEX = re.compile(r"^(--.+\s)?([-_\.\w\d]+.*(?:==|>=|<=|~=|!=|<|>|===)?.*$) PIP_VERSION_RANGE_SEPARATOR = re.compile(r"^(==|>=|<=|~=|!=|<|>|===)?(.*)$") SUPPORTED_PYTHON_TUPLES = [ REQUIRED_PYTHON_VER[:2], - tuple(map(operator.add, REQUIRED_PYTHON_VER, (0, 1, 0)))[:2], ] +if REQUIRED_PYTHON_VER[0] == REQUIRED_NEXT_PYTHON_VER[0]: + for minor in range(REQUIRED_PYTHON_VER[1] + 1, REQUIRED_NEXT_PYTHON_VER[1] + 1): + SUPPORTED_PYTHON_TUPLES.append((REQUIRED_PYTHON_VER[0], minor)) SUPPORTED_PYTHON_VERSIONS = [ ".".join(map(str, version_tuple)) for version_tuple in SUPPORTED_PYTHON_TUPLES ]