From ba660f871b9fa2324270db5bd984ed271f32630f Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Mon, 3 Nov 2025 14:32:14 -0800 Subject: [PATCH] update syntax and repin --- tools/oldest_constraints.txt | 56 ++++++++++++++-------------- tools/pinning/current/pyproject.toml | 8 +++- tools/pinning/oldest/pyproject.toml | 11 ++++-- tools/requirements.txt | 27 +++++++------- 4 files changed, 55 insertions(+), 47 deletions(-) diff --git a/tools/oldest_constraints.txt b/tools/oldest_constraints.txt index d24c4f36d..ac72a441c 100644 --- a/tools/oldest_constraints.txt +++ b/tools/oldest_constraints.txt @@ -2,20 +2,20 @@ # that script. apacheconfig==0.3.2 ; python_version == "3.10" asn1crypto==0.24.0 ; python_version == "3.10" -astroid==3.3.11 ; python_version == "3.10" -attrs==25.3.0 ; python_version == "3.10" -beautifulsoup4==4.13.4 ; python_version == "3.10" +astroid==4.0.1 ; python_version == "3.10" +attrs==25.4.0 ; python_version == "3.10" +beautifulsoup4==4.14.2 ; python_version == "3.10" boto3==1.20.34 ; python_version == "3.10" botocore==1.23.34 ; python_version == "3.10" cachetools==5.5.2 ; python_version == "3.10" -certifi==2025.8.3 ; python_version == "3.10" +certifi==2025.10.5 ; python_version == "3.10" cffi==1.14.1 ; python_version == "3.10" chardet==3.0.4 ; python_version == "3.10" cloudflare==2.19.0 ; python_version == "3.10" colorama==0.4.6 ; (sys_platform == "win32" or platform_system == "Windows") and python_version == "3.10" configargparse==1.5.3 ; python_version == "3.10" configobj==5.0.6 ; python_version == "3.10" -coverage==7.10.4 ; python_version == "3.10" +coverage==7.11.0 ; python_version == "3.10" cryptography==43.0.0 ; python_version == "3.10" cython==0.29.37 ; python_version == "3.10" dill==0.4.0 ; python_version == "3.10" @@ -25,30 +25,30 @@ dns-lexicon==3.15.1 ; python_version == "3.10" dnspython==2.6.1 ; python_version == "3.10" exceptiongroup==1.3.0 ; python_version == "3.10" execnet==2.1.1 ; python_version == "3.10" -filelock==3.19.1 ; python_version == "3.10" +filelock==3.20.0 ; python_version == "3.10" funcsigs==0.4 ; python_version == "3.10" google-api-python-client==1.6.5 ; python_version == "3.10" google-auth==2.16.0 ; python_version == "3.10" httplib2==0.9.2 ; python_version == "3.10" idna==2.6 ; python_version == "3.10" -iniconfig==2.1.0 ; python_version == "3.10" +iniconfig==2.3.0 ; python_version == "3.10" ipaddress==1.0.16 ; python_version == "3.10" -isort==6.0.1 ; python_version == "3.10" +isort==7.0.0 ; python_version == "3.10" jmespath==0.10.0 ; python_version == "3.10" -josepy==2.1.0 ; python_version == "3.10" +josepy==2.2.0 ; python_version == "3.10" jsonlines==4.0.0 ; python_version == "3.10" jsonpickle==4.1.1 ; python_version == "3.10" mccabe==0.7.0 ; python_version == "3.10" mypy-extensions==1.1.0 ; python_version == "3.10" -mypy==1.17.1 ; python_version == "3.10" +mypy==1.18.2 ; python_version == "3.10" ndg-httpsclient==0.3.2 ; python_version == "3.10" oauth2client==4.1.3 ; python_version == "3.10" packaging==25.0 ; python_version == "3.10" parsedatetime==2.6 ; python_version == "3.10" pathspec==0.12.1 ; python_version == "3.10" pbr==1.8.0 ; python_version == "3.10" -pip==25.2 ; python_version == "3.10" -platformdirs==4.3.8 ; python_version == "3.10" +pip==25.3 ; python_version == "3.10" +platformdirs==4.5.0 ; python_version == "3.10" pluggy==1.6.0 ; python_version == "3.10" ply==3.4 ; python_version == "3.10" py==1.11.0 ; python_version == "3.10" @@ -56,42 +56,42 @@ pyasn1-modules==0.4.1 ; python_version == "3.10" pyasn1==0.4.8 ; python_version == "3.10" pycparser==2.14 ; python_version == "3.10" pygments==2.19.2 ; python_version == "3.10" -pylint==3.3.8 ; python_version == "3.10" +pylint==4.0.2 ; python_version == "3.10" pyopenssl==25.0.0 ; python_version == "3.10" pyotp==2.9.0 ; python_version == "3.10" pyparsing==2.4.7 ; python_version == "3.10" pyrfc3339==1.0 ; python_version == "3.10" -pytest-cov==6.2.1 ; python_version == "3.10" +pytest-cov==7.0.0 ; python_version == "3.10" pytest-xdist==3.8.0 ; python_version == "3.10" -pytest==8.4.1 ; python_version == "3.10" +pytest==8.4.2 ; python_version == "3.10" python-augeas==0.5.0 ; python_version == "3.10" python-dateutil==2.9.0.post0 ; python_version == "3.10" python-digitalocean==1.15.0 ; python_version == "3.10" pytz==2025.2 ; python_version == "3.10" pywin32==311 ; python_version == "3.10" and sys_platform == "win32" -pyyaml==6.0.2 ; python_version == "3.10" -requests-file==2.1.0 ; python_version == "3.10" +pyyaml==6.0.3 ; python_version == "3.10" +requests-file==3.0.1 ; python_version == "3.10" requests==2.25.1 ; python_version == "3.10" rsa==4.9.1 ; python_version == "3.10" -ruff==0.12.9 ; python_version == "3.10" +ruff==0.14.3 ; python_version == "3.10" s3transfer==0.5.2 ; python_version == "3.10" setuptools==80.9.0 ; python_version == "3.10" six==1.16.0 ; python_version == "3.10" -soupsieve==2.7 ; python_version == "3.10" +soupsieve==2.8 ; python_version == "3.10" tldextract==5.3.0 ; python_version == "3.10" -tomli==2.2.1 ; python_version == "3.10" +tomli==2.3.0 ; python_version == "3.10" tomlkit==0.13.3 ; python_version == "3.10" tox==3.28.0 ; python_version == "3.10" -types-httplib2==0.22.0.20250622 ; python_version == "3.10" -types-pyrfc3339==2.0.1.20241107 ; python_version == "3.10" -types-python-dateutil==2.9.0.20250809 ; python_version == "3.10" -types-pywin32==311.0.0.20250809 ; python_version == "3.10" +types-httplib2==0.31.0.20250913 ; python_version == "3.10" +types-pyrfc3339==2.0.1.20250825 ; python_version == "3.10" +types-python-dateutil==2.9.0.20251008 ; python_version == "3.10" +types-pywin32==311.0.0.20251008 ; python_version == "3.10" types-requests==2.31.0.6 ; python_version == "3.10" -types-setuptools==80.9.0.20250809 ; python_version == "3.10" +types-setuptools==80.9.0.20250822 ; python_version == "3.10" types-urllib3==1.26.25.14 ; python_version == "3.10" -typing-extensions==4.14.1 ; python_version == "3.10" +typing-extensions==4.15.0 ; python_version == "3.10" uritemplate==3.0.1 ; python_version == "3.10" urllib3==1.26.5 ; python_version == "3.10" -uv==0.8.11 ; python_version == "3.10" -virtualenv==20.34.0 ; python_version == "3.10" +uv==0.9.7 ; python_version == "3.10" +virtualenv==20.35.4 ; python_version == "3.10" wheel==0.45.1 ; python_version == "3.10" diff --git a/tools/pinning/current/pyproject.toml b/tools/pinning/current/pyproject.toml index d46290910..8889cf620 100644 --- a/tools/pinning/current/pyproject.toml +++ b/tools/pinning/current/pyproject.toml @@ -42,8 +42,12 @@ letstest = {path = "../../../letstest"} # stability. # # As of pyyaml 6.0.2, cython >= 3.0 is required for py >= 3.13, and < 3.0 for py < 3.13. -# So don't pin to a specific version, and let the resolver handle it. -cython = "*" +# See https://github.com/yaml/pyyaml/pull/808/files. +cython = [ + { version = "<3.0", python = "<3.13" }, + { version = ">=3.0", python = ">=3.13" } +] + # setuptools-rust is a build dependency of cryptography, and since we don't have # a great way of pinning build dependencies, we simply list it here to ensure a # working version. Note: if build dependencies of setuptools-rust break at some diff --git a/tools/pinning/oldest/pyproject.toml b/tools/pinning/oldest/pyproject.toml index 3b501abb9..b56625e1f 100644 --- a/tools/pinning/oldest/pyproject.toml +++ b/tools/pinning/oldest/pyproject.toml @@ -95,10 +95,13 @@ urllib3 = "1.26.5" # cython is a build dependency of pyyaml # -# We also pin back cython as is required by pyyaml for python < 3.13. See -# https://github.com/yaml/pyyaml/pull/702 and -# https://github.com/yaml/pyyaml/issues/601. -cython = "<3.0" +# +# As of pyyaml 6.0.2, cython >= 3.0 is required for py >= 3.13, and < 3.0 for py < 3.13. +# See https://github.com/yaml/pyyaml/pull/808/files. +cython = [ + { version = "<3.0", python = "<3.13" }, + { version = ">=3.0", python = ">=3.13" } +] # Other dependencies # We add any dependencies that must be specified in this file for any another diff --git a/tools/requirements.txt b/tools/requirements.txt index b5d47646f..ae7c995cc 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -17,8 +17,8 @@ babel==2.17.0 ; python_version >= "3.10" and python_version < "4.0" backports-tarfile==1.2.0 ; python_version >= "3.10" and python_version < "3.12" bcrypt==5.0.0 ; python_version >= "3.10" and python_version < "4.0" beautifulsoup4==4.14.2 ; python_version >= "3.10" and python_version < "4.0" -boto3==1.40.61 ; python_version >= "3.10" and python_version < "4.0" -botocore==1.40.61 ; python_version >= "3.10" and python_version < "4.0" +boto3==1.40.65 ; python_version >= "3.10" and python_version < "4.0" +botocore==1.40.65 ; python_version >= "3.10" and python_version < "4.0" build==1.3.0 ; python_version >= "3.10" and python_version < "4.0" cachecontrol==0.14.3 ; python_version >= "3.10" and python_version < "4.0" cachetools==6.2.1 ; python_version >= "3.10" and python_version < "4.0" @@ -35,16 +35,17 @@ configobj==5.0.9 ; python_version >= "3.10" and python_version < "4.0" coverage==7.11.0 ; python_version >= "3.10" and python_version < "4.0" crashtest==0.4.1 ; python_version >= "3.10" and python_version < "4.0" cryptography==46.0.3 ; python_version >= "3.10" and python_version < "4.0" -cython==3.1.6 ; python_version >= "3.10" and python_version < "4.0" +cython==0.29.37 ; python_version >= "3.10" and python_version <= "3.12" +cython==3.1.6 ; python_version >= "3.13" and python_version < "4.0" decorator==5.2.1 ; python_version >= "3.10" and python_version < "4.0" -deprecated==1.3.0 ; python_version >= "3.10" and python_version < "4.0" +deprecated==1.3.1 ; python_version >= "3.10" and python_version < "4.0" dill==0.4.0 ; python_version >= "3.10" and python_version < "4.0" distlib==0.4.0 ; python_version >= "3.10" and python_version < "4.0" distro==1.9.0 ; python_version >= "3.10" and python_version < "4.0" dns-lexicon==3.21.1 ; python_version >= "3.10" and python_version < "4.0" dnspython==2.8.0 ; python_version >= "3.10" and python_version < "4.0" docutils==0.21.2 ; python_version >= "3.10" and python_version < "4.0" -dulwich==0.24.7 ; python_version >= "3.10" and python_version < "4.0" +dulwich==0.24.8 ; python_version >= "3.10" and python_version < "4.0" exceptiongroup==1.3.0 ; python_version == "3.10" execnet==2.1.1 ; python_version >= "3.10" and python_version < "4.0" executing==2.2.1 ; python_version >= "3.10" and python_version < "4.0" @@ -53,9 +54,9 @@ fastjsonschema==2.21.2 ; python_version >= "3.10" and python_version < "4.0" filelock==3.20.0 ; python_version >= "3.10" and python_version < "4.0" findpython==0.7.0 ; python_version >= "3.10" and python_version < "4.0" google-api-core==2.28.1 ; python_version >= "3.10" and python_version < "4.0" -google-api-python-client==2.185.0 ; python_version >= "3.10" and python_version < "4.0" -google-auth-httplib2==0.2.0 ; python_version >= "3.10" and python_version < "4.0" -google-auth==2.42.0 ; python_version >= "3.10" and python_version < "4.0" +google-api-python-client==2.186.0 ; python_version >= "3.10" and python_version < "4.0" +google-auth-httplib2==0.2.1 ; python_version >= "3.10" and python_version < "4.0" +google-auth==2.42.1 ; python_version >= "3.10" and python_version < "4.0" googleapis-common-protos==1.71.0 ; python_version >= "3.10" and python_version < "4.0" h11==0.16.0 ; python_version >= "3.10" and python_version < "4.0" httpcore==1.0.9 ; python_version >= "3.10" and python_version < "4.0" @@ -95,13 +96,13 @@ msgpack==1.1.2 ; python_version >= "3.10" and python_version < "4.0" msrest==0.7.1 ; python_version >= "3.10" and python_version < "4.0" mypy-extensions==1.1.0 ; python_version >= "3.10" and python_version < "4.0" mypy==1.9.0 ; python_version >= "3.10" and python_version < "4.0" -nh3==0.3.1 ; python_version >= "3.10" and python_version < "4.0" +nh3==0.3.2 ; python_version >= "3.10" and python_version < "4.0" oauthlib==3.3.1 ; python_version >= "3.10" and python_version < "4.0" packaging==25.0 ; python_version >= "3.10" and python_version < "4.0" paramiko==4.0.0 ; python_version >= "3.10" and python_version < "4.0" parsedatetime==2.6 ; python_version >= "3.10" and python_version < "4.0" parso==0.8.5 ; python_version >= "3.10" and python_version < "4.0" -pbs-installer==2025.10.28 ; python_version >= "3.10" and python_version < "4.0" +pbs-installer==2025.10.31 ; python_version >= "3.10" and python_version < "4.0" pexpect==4.9.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform != "win32" and sys_platform != "emscripten" pip==25.3 ; python_version >= "3.10" and python_version < "4.0" pkginfo==1.12.1.2 ; python_version >= "3.10" and python_version < "4.0" @@ -137,7 +138,7 @@ python-digitalocean==1.17.0 ; python_version >= "3.10" and python_version < "4.0 pywin32-ctypes==0.2.3 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32" pywin32==311 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32" pyyaml==6.0.3 ; python_version >= "3.10" and python_version < "4.0" -rapidfuzz==3.14.1 ; python_version >= "3.10" and python_version < "4.0" +rapidfuzz==3.14.3 ; python_version >= "3.10" and python_version < "4.0" readme-renderer==44.0 ; python_version >= "3.10" and python_version < "4.0" requests-file==3.0.1 ; python_version >= "3.10" and python_version < "4.0" requests-oauthlib==2.0.0 ; python_version >= "3.10" and python_version < "4.0" @@ -147,7 +148,7 @@ rfc3986==2.0.0 ; python_version >= "3.10" and python_version < "4.0" rich==14.2.0 ; python_version >= "3.10" and python_version < "4.0" roman-numerals-py==3.1.0 ; python_version >= "3.11" and python_version < "4.0" rsa==4.9.1 ; python_version >= "3.10" and python_version < "4.0" -ruff==0.14.2 ; python_version >= "3.10" and python_version < "4.0" +ruff==0.14.3 ; python_version >= "3.10" and python_version < "4.0" s3transfer==0.14.0 ; python_version >= "3.10" and python_version < "4.0" secretstorage==3.4.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "linux" semantic-version==2.10.0 ; python_version >= "3.10" and python_version < "4.0" @@ -186,7 +187,7 @@ types-setuptools==80.9.0.20250822 ; python_version >= "3.10" and python_version typing-extensions==4.15.0 ; python_version >= "3.10" and python_version < "4.0" uritemplate==4.2.0 ; python_version >= "3.10" and python_version < "4.0" urllib3==2.5.0 ; python_version >= "3.10" and python_version < "4.0" -uv==0.9.6 ; python_version >= "3.10" and python_version < "4.0" +uv==0.9.7 ; python_version >= "3.10" and python_version < "4.0" virtualenv==20.35.4 ; python_version >= "3.10" and python_version < "4.0" wcwidth==0.2.14 ; python_version >= "3.10" and python_version < "4.0" wheel==0.45.1 ; python_version >= "3.10" and python_version < "4.0"