From 2c8609464c3e371053f78e515fc7beb26446f5a3 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 11 Dec 2024 15:15:55 -0800 Subject: [PATCH] fix upgrading pyopenssl (#10080) i hit this when working on https://github.com/certbot/certbot/pull/10076 where i found that updating all our dependencies no longer worked because of new deprecations in pyopenssl. this pr fixes that --- pytest.ini | 11 ++++++++++- tools/requirements.txt | 18 +++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/pytest.ini b/pytest.ini index 433033e53..d4e0111e2 100644 --- a/pytest.ini +++ b/pytest.ini @@ -21,8 +21,14 @@ # from dateutil. See https://github.com/dateutil/dateutil/issues/1314. # 4) Ignoring this allows us to continue to update pyOpenSSL (one of our crypto # dependencies) until https://github.com/certbot/certbot/issues/9828 is resolved. -# 5) Similarly to 6), CSR support is deprecated in pyOpenSSL since 24.2, we silence +# 5) CSR support is deprecated in pyOpenSSL since 24.2, we silence # the warning until https://github.com/certbot/certbot/issues/9992 is resolved. +# 6) pyOpenSSL 24.3 deprecated methods using pyOpenSSL X509Extension objects. +# Fixing this should also be resolved by the work on +# https://github.com/certbot/certbot/issues/9828 and the open PR +# https://github.com/certbot/certbot/pull/9909 currently resolves this issue. +# 7 & 8) Resolving these warnings is being tracked by +# https://github.com/certbot/certbot/issues/10079. filterwarnings = error ignore:.*rsyncdir:DeprecationWarning @@ -30,3 +36,6 @@ filterwarnings = ignore:.*datetime.utcfromtimestamp\(\) is deprecated:DeprecationWarning:dateutil ignore:X509Extension support in pyOpenSSL is deprecated:DeprecationWarning ignore:CSR support in pyOpenSSL is deprecated:DeprecationWarning + ignore:.*You should use pyca/cryptography's X.509 APIs:DeprecationWarning + ignore:Passing pyOpenSSL PKey objects is deprecated:DeprecationWarning + ignore:Passing pyOpenSSL X509 objects is deprecated:DeprecationWarning diff --git a/tools/requirements.txt b/tools/requirements.txt index d2961f989..73e9061c4 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -15,8 +15,8 @@ azure-devops==7.1.0b4 ; python_version >= "3.9" and python_version < "4.0" babel==2.16.0 ; python_version >= "3.9" and python_version < "4.0" bcrypt==4.2.1 ; python_version >= "3.9" and python_version < "4.0" beautifulsoup4==4.12.3 ; python_version >= "3.9" and python_version < "4.0" -boto3==1.35.74 ; python_version >= "3.9" and python_version < "4.0" -botocore==1.35.74 ; python_version >= "3.9" and python_version < "4.0" +boto3==1.35.78 ; python_version >= "3.9" and python_version < "4.0" +botocore==1.35.78 ; python_version >= "3.9" and python_version < "4.0" build==1.2.2.post1 ; python_version >= "3.9" and python_version < "4.0" cachecontrol==0.14.1 ; python_version >= "3.9" and python_version < "4.0" cachetools==5.5.0 ; python_version >= "3.9" and python_version < "4.0" @@ -29,7 +29,7 @@ cloudflare==2.19.4 ; python_version >= "3.9" and python_version < "4.0" colorama==0.4.6 ; python_version >= "3.9" and python_version < "4.0" configargparse==1.7 ; python_version >= "3.9" and python_version < "4.0" configobj==5.0.9 ; python_version >= "3.9" and python_version < "4.0" -coverage==7.6.8 ; python_version >= "3.9" and python_version < "4.0" +coverage==7.6.9 ; python_version >= "3.9" and python_version < "4.0" crashtest==0.4.1 ; python_version >= "3.9" and python_version < "4.0" cryptography==43.0.3 ; python_version >= "3.9" and python_version < "4.0" cython==0.29.37 ; python_version >= "3.9" and python_version < "4.0" @@ -48,7 +48,7 @@ executing==2.1.0 ; python_version >= "3.9" and python_version < "4.0" fabric==3.2.2 ; python_version >= "3.9" and python_version < "4.0" fastjsonschema==2.21.1 ; python_version >= "3.9" and python_version < "4.0" filelock==3.16.1 ; python_version >= "3.9" and python_version < "4.0" -google-api-core==2.23.0 ; python_version >= "3.9" and python_version < "4.0" +google-api-core==2.24.0 ; python_version >= "3.9" and python_version < "4.0" google-api-python-client==2.154.0 ; python_version >= "3.9" and python_version < "4.0" google-auth-httplib2==0.2.0 ; python_version >= "3.9" and python_version < "4.0" google-auth==2.36.0 ; python_version >= "3.9" and python_version < "4.0" @@ -97,10 +97,10 @@ pluggy==1.5.0 ; python_version >= "3.9" and python_version < "4.0" ply==3.11 ; python_version >= "3.9" and python_version < "4.0" poetry-core==1.9.1 ; python_version >= "3.9" and python_version < "4.0" poetry-plugin-export==1.8.0 ; python_version >= "3.9" and python_version < "4.0" -poetry==1.8.4 ; python_version >= "3.9" and python_version < "4.0" +poetry==1.8.5 ; python_version >= "3.9" and python_version < "4.0" prompt-toolkit==3.0.48 ; python_version >= "3.9" and python_version < "4.0" proto-plus==1.25.0 ; python_version >= "3.9" and python_version < "4.0" -protobuf==5.29.0 ; python_version >= "3.9" and python_version < "4.0" +protobuf==5.29.1 ; python_version >= "3.9" and python_version < "4.0" ptyprocess==0.7.0 ; python_version >= "3.9" and python_version < "4.0" pure-eval==0.2.3 ; python_version >= "3.9" and python_version < "4.0" pyasn1-modules==0.4.1 ; python_version >= "3.9" and python_version < "4.0" @@ -110,7 +110,7 @@ pygments==2.18.0 ; python_version >= "3.9" and python_version < "4.0" pylint==3.0.2 ; python_version >= "3.9" and python_version < "4.0" pynacl==1.5.0 ; python_version >= "3.9" and python_version < "4.0" pynsist==2.7 ; python_version >= "3.9" and python_version < "4.0" -pyopenssl==24.2.1 ; python_version >= "3.9" and python_version < "4.0" +pyopenssl==24.3.0 ; python_version >= "3.9" and python_version < "4.0" pyotp==2.9.0 ; python_version >= "3.9" and python_version < "4.0" pyparsing==3.2.0 ; python_version >= "3.9" and python_version < "4.0" pyproject-api==1.8.0 ; python_version >= "3.9" and python_version < "4.0" @@ -142,7 +142,7 @@ semantic-version==2.10.0 ; python_version >= "3.9" and python_version < "4.0" setuptools-rust==1.10.2 ; python_version >= "3.9" and python_version < "4.0" setuptools==75.6.0 ; python_version >= "3.9" and python_version < "4.0" shellingham==1.5.4 ; python_version >= "3.9" and python_version < "4.0" -six==1.16.0 ; python_version >= "3.9" and python_version < "4.0" +six==1.17.0 ; python_version >= "3.9" and python_version < "4.0" snowballstemmer==2.2.0 ; python_version >= "3.9" and python_version < "4.0" soupsieve==2.6 ; python_version >= "3.9" and python_version < "4.0" sphinx-rtd-theme==3.0.2 ; python_version >= "3.9" and python_version < "4.0" @@ -166,7 +166,7 @@ types-cffi==1.16.0.20240331 ; python_version >= "3.9" and python_version < "4.0" types-httplib2==0.22.0.20240310 ; python_version >= "3.9" and python_version < "4.0" types-pyopenssl==24.1.0.20240722 ; python_version >= "3.9" and python_version < "4.0" types-pyrfc3339==2.0.1.20241107 ; python_version >= "3.9" and python_version < "4.0" -types-python-dateutil==2.9.0.20241003 ; python_version >= "3.9" and python_version < "4.0" +types-python-dateutil==2.9.0.20241206 ; python_version >= "3.9" and python_version < "4.0" types-pytz==2024.2.0.20241003 ; python_version >= "3.9" and python_version < "4.0" types-pywin32==308.0.0.20241128 ; python_version >= "3.9" and python_version < "4.0" types-requests==2.31.0.6 ; python_version >= "3.9" and python_version < "4.0"