From 2f3daa894e621216bd9ab0057a0d56945dcb969e Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 13 Oct 2024 21:31:51 -0400 Subject: [PATCH] Special case ci-constraints-requirements.txt for Python 3.9 as well (#11759) --- ci-constraints-requirements.txt | 48 +++++++++++++++++++-------------- pyproject.toml | 7 ++++- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/ci-constraints-requirements.txt b/ci-constraints-requirements.txt index 079d6200a..72305728f 100644 --- a/ci-constraints-requirements.txt +++ b/ci-constraints-requirements.txt @@ -1,6 +1,8 @@ # This file was autogenerated by uv via the following command: # uv pip compile --universal -p 3.7 --extra=docs --extra=docstest --extra=pep8test --extra=test --extra=test-randomorder --extra=nox --extra=sdist --unsafe-package=cffi --unsafe-package=pycparser --unsafe-package=setuptools --unsafe-package=cryptography-vectors pyproject.toml -alabaster==0.7.13 ; python_full_version < '3.10' +alabaster==0.7.13 ; python_full_version < '3.9' + # via sphinx +alabaster==0.7.16 ; python_full_version == '3.9.*' # via sphinx alabaster==1.0.0 ; python_full_version >= '3.10' # via sphinx @@ -41,9 +43,9 @@ colorlog==6.8.2 # via nox coverage==7.2.7 ; python_full_version < '3.8' # via pytest-cov -coverage==7.6.1 ; python_full_version >= '3.8' and python_full_version < '3.10' +coverage==7.6.1 ; python_full_version == '3.8.*' # via pytest-cov -coverage==7.6.3 ; python_full_version >= '3.10' +coverage==7.6.3 ; python_full_version >= '3.9' # via pytest-cov distlib==0.3.9 # via virtualenv @@ -51,12 +53,12 @@ docutils==0.19 ; python_full_version < '3.8' # via # readme-renderer # sphinx -docutils==0.20.1 ; python_full_version >= '3.8' and python_full_version < '3.10' +docutils==0.20.1 ; python_full_version == '3.8.*' # via # readme-renderer # sphinx # sphinx-rtd-theme -docutils==0.21.2 ; python_full_version >= '3.10' +docutils==0.21.2 ; python_full_version >= '3.9' # via # readme-renderer # sphinx @@ -98,9 +100,9 @@ iniconfig==2.0.0 # via pytest jinja2==3.1.4 # via sphinx -markupsafe==2.1.5 ; python_full_version < '3.10' +markupsafe==2.1.5 ; python_full_version < '3.9' # via jinja2 -markupsafe==3.0.1 ; python_full_version >= '3.10' +markupsafe==3.0.1 ; python_full_version >= '3.9' # via jinja2 mypy==1.4.1 ; python_full_version < '3.8' # via cryptography (pyproject.toml) @@ -186,9 +188,9 @@ pytz==2024.2 ; python_full_version < '3.9' # via babel readme-renderer==37.3 ; python_full_version < '3.8' # via cryptography (pyproject.toml) -readme-renderer==43.0 ; python_full_version >= '3.8' and python_full_version < '3.10' +readme-renderer==43.0 ; python_full_version == '3.8.*' # via cryptography (pyproject.toml) -readme-renderer==44.0 ; python_full_version >= '3.10' +readme-renderer==44.0 ; python_full_version >= '3.9' # via cryptography (pyproject.toml) requests==2.31.0 ; python_full_version < '3.8' # via sphinx @@ -204,7 +206,13 @@ sphinx==5.3.0 ; python_full_version < '3.8' # via # cryptography (pyproject.toml) # sphinxcontrib-spelling -sphinx==7.1.2 ; python_full_version >= '3.8' and python_full_version < '3.10' +sphinx==7.1.2 ; python_full_version == '3.8.*' + # via + # cryptography (pyproject.toml) + # sphinx-rtd-theme + # sphinxcontrib-jquery + # sphinxcontrib-spelling +sphinx==7.4.7 ; python_full_version == '3.9.*' # via # cryptography (pyproject.toml) # sphinx-rtd-theme @@ -220,31 +228,31 @@ sphinx-rtd-theme==3.0.1 ; python_full_version >= '3.8' # via cryptography (pyproject.toml) sphinxcontrib-applehelp==1.0.2 ; python_full_version < '3.8' # via sphinx -sphinxcontrib-applehelp==1.0.4 ; python_full_version >= '3.8' and python_full_version < '3.10' +sphinxcontrib-applehelp==1.0.4 ; python_full_version == '3.8.*' # via sphinx -sphinxcontrib-applehelp==2.0.0 ; python_full_version >= '3.10' +sphinxcontrib-applehelp==2.0.0 ; python_full_version >= '3.9' # via sphinx -sphinxcontrib-devhelp==1.0.2 ; python_full_version < '3.10' +sphinxcontrib-devhelp==1.0.2 ; python_full_version < '3.9' # via sphinx -sphinxcontrib-devhelp==2.0.0 ; python_full_version >= '3.10' +sphinxcontrib-devhelp==2.0.0 ; python_full_version >= '3.9' # via sphinx sphinxcontrib-htmlhelp==2.0.0 ; python_full_version < '3.8' # via sphinx -sphinxcontrib-htmlhelp==2.0.1 ; python_full_version >= '3.8' and python_full_version < '3.10' +sphinxcontrib-htmlhelp==2.0.1 ; python_full_version == '3.8.*' # via sphinx -sphinxcontrib-htmlhelp==2.1.0 ; python_full_version >= '3.10' +sphinxcontrib-htmlhelp==2.1.0 ; python_full_version >= '3.9' # via sphinx sphinxcontrib-jquery==4.1 ; python_full_version >= '3.8' # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 ; python_full_version < '3.10' +sphinxcontrib-qthelp==1.0.3 ; python_full_version < '3.9' # via sphinx -sphinxcontrib-qthelp==2.0.0 ; python_full_version >= '3.10' +sphinxcontrib-qthelp==2.0.0 ; python_full_version >= '3.9' # via sphinx -sphinxcontrib-serializinghtml==1.1.5 ; python_full_version < '3.10' +sphinxcontrib-serializinghtml==1.1.5 ; python_full_version < '3.9' # via sphinx -sphinxcontrib-serializinghtml==2.0.0 ; python_full_version >= '3.10' +sphinxcontrib-serializinghtml==2.0.0 ; python_full_version >= '3.9' # via sphinx sphinxcontrib-spelling==8.0.0 # via cryptography (pyproject.toml) diff --git a/pyproject.toml b/pyproject.toml index 5202e4a9e..e58219cc9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -188,4 +188,9 @@ git-only = [ [tool.uv] # These cover all Python versions, but by expressing multiple environments we # force uv's resolver to pick the latest versions of packages for each version. -environments = ["python_version >= '3.10'", "python_version >= '3.8' and python_version < '3.10'", "python_version < '3.8'"] +environments = [ + "python_version >= '3.10'", + "python_version >= '3.9' and python_version < '3.10'", + "python_version >= '3.8' and python_version < '3.9'", + "python_version < '3.8'", +]