From 44f138d53990235783766318ddfbd96d9c8fc6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bence=20Sz=C3=A9pk=C3=BAti?= Date: Fri, 13 May 2022 15:35:55 +0200 Subject: [PATCH] Add minimum requirements for Python 3.10 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed for min_requirements.py, since it installs the oldest possible version of all the requirements. Signed-off-by: Bence Szépkúti --- scripts/driver.requirements.txt | 4 +++- scripts/min_requirements.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/driver.requirements.txt b/scripts/driver.requirements.txt index 0d75a3d2a..5364d8efa 100644 --- a/scripts/driver.requirements.txt +++ b/scripts/driver.requirements.txt @@ -10,7 +10,9 @@ markupsafe < 2.1 # See https://github.com/Mbed-TLS/mbedtls/pull/5067#discussion_r738794607 . # Note that Jinja 3.0 drops support for Python 3.5, so we need to support # Jinja 2.x as long as we're still using Python 3.5 anywhere. -Jinja2 >= 2.10.1 +# Jinja 2.10.1 doesn't support Python 3.10+ +Jinja2 >= 2.10.1; python_version < '3.10' +Jinja2 >= 2.10.3; python_version >= '3.10' # Jinja2 >=2.10, <3.0 needs a separate package for type annotations types-Jinja2 diff --git a/scripts/min_requirements.py b/scripts/min_requirements.py index eecab1c1e..c00d58e05 100755 --- a/scripts/min_requirements.py +++ b/scripts/min_requirements.py @@ -44,8 +44,9 @@ class Requirements: """Adjust a requirement to the minimum specified version.""" # allow inheritance #pylint: disable=no-self-use # If a requirement specifies a minimum version, impose that version. - req = re.sub(r'>=|~=', r'==', req) - return req + split_req = req.split(';', 1) + split_req[0] = re.sub(r'>=|~=', r'==', split_req[0]) + return ';'.join(split_req) def add_file(self, filename: str) -> None: """Add requirements from the specified file.