From 443ec2200f8c4eaf2cf28623392d4a7588f0ed44 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Thu, 16 May 2024 09:18:21 -0700 Subject: [PATCH] pin back cloudflare (#9940) * pin back cloudflare * update readme --- certbot-dns-cloudflare/setup.py | 4 +- certbot/CHANGELOG.md | 3 +- tools/requirements.txt | 83 +++++++++++++++++---------------- 3 files changed, 47 insertions(+), 43 deletions(-) diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py index 5b2c16f8a..e261ef997 100644 --- a/certbot-dns-cloudflare/setup.py +++ b/certbot-dns-cloudflare/setup.py @@ -7,7 +7,9 @@ from setuptools import setup version = '2.11.0.dev0' install_requires = [ - 'cloudflare>=1.5.1', + # for now, do not upgrade to cloudflare>=2.20 to avoid deprecation warnings and the breaking + # changes in version 3.0. see https://github.com/certbot/certbot/issues/9938 + 'cloudflare>=1.5.1, <2.20', 'setuptools>=41.6.0', ] diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index 348f958fe..b718aa6c0 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -10,7 +10,8 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). ### Changed -* +* In anticipation of backwards incompatible changes, certbot-dns-cloudflare now + requires less than version 2.20 of Cloudflare's python library. ### Fixed diff --git a/tools/requirements.txt b/tools/requirements.txt index cf1109fac..805014e13 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -13,12 +13,12 @@ asttokens==2.4.1 ; python_version >= "3.8" and python_version < "4.0" attrs==23.2.0 ; python_version >= "3.8" and python_version < "4.0" azure-core==1.30.1 ; python_version >= "3.8" and python_version < "4.0" azure-devops==7.1.0b4 ; python_version >= "3.8" and python_version < "4.0" -babel==2.14.0 ; python_version >= "3.8" and python_version < "4.0" +babel==2.15.0 ; python_version >= "3.8" and python_version < "4.0" backcall==0.2.0 ; python_version >= "3.8" and python_version < "4.0" -bcrypt==4.1.2 ; python_version >= "3.8" and python_version < "4.0" +bcrypt==4.1.3 ; python_version >= "3.8" and python_version < "4.0" beautifulsoup4==4.12.3 ; python_version >= "3.8" and python_version < "4.0" -boto3==1.34.73 ; python_version >= "3.8" and python_version < "4.0" -botocore==1.34.73 ; python_version >= "3.8" and python_version < "4.0" +boto3==1.34.103 ; python_version >= "3.8" and python_version < "4.0" +botocore==1.34.103 ; python_version >= "3.8" and python_version < "4.0" build==1.2.1 ; python_version >= "3.8" and python_version < "4.0" cachecontrol==0.14.0 ; python_version >= "3.8" and python_version < "4.0" cachetools==5.3.3 ; python_version >= "3.8" and python_version < "4.0" @@ -27,36 +27,36 @@ cffi==1.16.0 ; python_version >= "3.8" and python_version < "4.0" chardet==5.2.0 ; python_version >= "3.8" and python_version < "4.0" charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "4.0" cleo==2.1.0 ; python_version >= "3.8" and python_version < "4.0" -cloudflare==2.19.2 ; python_version >= "3.8" and python_version < "4.0" +cloudflare==2.19.4 ; python_version >= "3.8" and python_version < "4.0" colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" configargparse==1.7 ; python_version >= "3.8" and python_version < "4.0" configobj==5.0.8 ; python_version >= "3.8" and python_version < "4.0" -coverage==7.4.4 ; python_version >= "3.8" and python_version < "4.0" +coverage==7.5.1 ; python_version >= "3.8" and python_version < "4.0" crashtest==0.4.1 ; python_version >= "3.8" and python_version < "4.0" -cryptography==42.0.5 ; python_version >= "3.8" and python_version < "4.0" +cryptography==42.0.7 ; python_version >= "3.8" and python_version < "4.0" cython==0.29.37 ; python_version >= "3.8" and python_version < "4.0" decorator==5.1.1 ; python_version >= "3.8" and python_version < "4.0" deprecated==1.2.14 ; python_version >= "3.8" and python_version < "4.0" -dill==0.3.8 ; python_version < "4.0" and python_version >= "3.8" +dill==0.3.8 ; python_version >= "3.8" and python_version < "4.0" distlib==0.3.8 ; python_version >= "3.8" and python_version < "4.0" distro==1.9.0 ; python_version >= "3.8" and python_version < "4.0" dns-lexicon==3.17.0 ; python_version >= "3.8" and python_version < "4.0" dnspython==2.6.1 ; python_version >= "3.8" and python_version < "4.0" docutils==0.20.1 ; python_version >= "3.8" and python_version < "4.0" dulwich==0.21.7 ; python_version >= "3.8" and python_version < "4.0" -exceptiongroup==1.2.0 ; python_version >= "3.8" and python_version < "3.11" -execnet==2.0.2 ; python_version >= "3.8" and python_version < "4.0" +exceptiongroup==1.2.1 ; python_version >= "3.8" and python_version < "3.11" +execnet==2.1.1 ; python_version >= "3.8" and python_version < "4.0" executing==2.0.1 ; python_version >= "3.8" and python_version < "4.0" fabric==3.2.2 ; python_version >= "3.8" and python_version < "4.0" fastjsonschema==2.19.1 ; python_version >= "3.8" and python_version < "4.0" -filelock==3.13.3 ; python_version >= "3.8" and python_version < "4.0" -google-api-core==2.18.0 ; python_version >= "3.8" and python_version < "4.0" -google-api-python-client==2.124.0 ; python_version >= "3.8" and python_version < "4.0" +filelock==3.14.0 ; python_version >= "3.8" and python_version < "4.0" +google-api-core==2.19.0 ; python_version >= "3.8" and python_version < "4.0" +google-api-python-client==2.129.0 ; python_version >= "3.8" and python_version < "4.0" google-auth-httplib2==0.2.0 ; python_version >= "3.8" and python_version < "4.0" google-auth==2.29.0 ; python_version >= "3.8" and python_version < "4.0" googleapis-common-protos==1.63.0 ; python_version >= "3.8" and python_version < "4.0" httplib2==0.22.0 ; python_version >= "3.8" and python_version < "4.0" -idna==3.6 ; python_version >= "3.8" and python_version < "4.0" +idna==3.7 ; python_version >= "3.8" and python_version < "4.0" imagesize==1.4.1 ; python_version >= "3.8" and python_version < "4.0" importlib-metadata==7.1.0 ; python_version >= "3.8" and python_version < "4.0" importlib-resources==6.4.0 ; python_version >= "3.8" and python_version < "4.0" @@ -67,18 +67,18 @@ ipdb==0.13.13 ; python_version >= "3.8" and python_version < "4.0" ipython==8.12.3 ; python_version >= "3.8" and python_version < "4.0" isodate==0.6.1 ; python_version >= "3.8" and python_version < "4.0" isort==5.13.2 ; python_version >= "3.8" and python_version < "4.0" -jaraco-classes==3.3.1 ; python_version >= "3.8" and python_version < "4.0" +jaraco-classes==3.4.0 ; python_version >= "3.8" and python_version < "4.0" jedi==0.19.1 ; python_version >= "3.8" and python_version < "4.0" jeepney==0.8.0 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "linux" -jinja2==3.1.3 ; python_version >= "3.8" and python_version < "4.0" +jinja2==3.1.4 ; python_version >= "3.8" and python_version < "4.0" jmespath==1.0.1 ; python_version >= "3.8" and python_version < "4.0" josepy==1.14.0 ; python_version >= "3.8" and python_version < "4.0" jsonlines==4.0.0 ; python_version >= "3.8" and python_version < "4.0" -jsonpickle==3.0.3 ; python_version >= "3.8" and python_version < "4.0" +jsonpickle==3.0.4 ; python_version >= "3.8" and python_version < "4.0" keyring==24.3.1 ; python_version >= "3.8" and python_version < "4.0" markdown-it-py==3.0.0 ; python_version >= "3.8" and python_version < "4.0" markupsafe==2.1.5 ; python_version >= "3.8" and python_version < "4.0" -matplotlib-inline==0.1.6 ; python_version >= "3.8" and python_version < "4.0" +matplotlib-inline==0.1.7 ; python_version >= "3.8" and python_version < "4.0" mccabe==0.7.0 ; python_version >= "3.8" and python_version < "4.0" mdurl==0.1.2 ; python_version >= "3.8" and python_version < "4.0" more-itertools==10.2.0 ; python_version >= "3.8" and python_version < "4.0" @@ -91,17 +91,17 @@ oauthlib==3.2.2 ; python_version >= "3.8" and python_version < "4.0" packaging==24.0 ; python_version >= "3.8" and python_version < "4.0" paramiko==3.4.0 ; python_version >= "3.8" and python_version < "4.0" parsedatetime==2.6 ; python_version >= "3.8" and python_version < "4.0" -parso==0.8.3 ; python_version >= "3.8" and python_version < "4.0" +parso==0.8.4 ; python_version >= "3.8" and python_version < "4.0" pexpect==4.9.0 ; python_version >= "3.8" and python_version < "4.0" pickleshare==0.7.5 ; python_version >= "3.8" and python_version < "4.0" pip==24.0 ; python_version >= "3.8" and python_version < "4.0" pkginfo==1.10.0 ; python_version >= "3.8" and python_version < "4.0" -platformdirs==4.2.0 ; python_version >= "3.8" and python_version < "4.0" -pluggy==1.4.0 ; python_version >= "3.8" and python_version < "4.0" +platformdirs==4.2.1 ; python_version >= "3.8" and python_version < "4.0" +pluggy==1.5.0 ; python_version >= "3.8" and python_version < "4.0" ply==3.11 ; python_version >= "3.8" and python_version < "4.0" poetry-core==1.9.0 ; python_version >= "3.8" and python_version < "4.0" poetry-plugin-export==1.7.1 ; python_version >= "3.8" and python_version < "4.0" -poetry==1.8.2 ; python_version >= "3.8" and python_version < "4.0" +poetry==1.8.3 ; python_version >= "3.8" and python_version < "4.0" prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "4.0" proto-plus==1.23.0 ; python_version >= "3.8" and python_version < "4.0" protobuf==4.25.3 ; python_version >= "3.8" and python_version < "4.0" @@ -109,8 +109,8 @@ ptyprocess==0.7.0 ; python_version >= "3.8" and python_version < "4.0" pure-eval==0.2.2 ; python_version >= "3.8" and python_version < "4.0" pyasn1-modules==0.4.0 ; python_version >= "3.8" and python_version < "4.0" pyasn1==0.6.0 ; python_version >= "3.8" and python_version < "4.0" -pycparser==2.21 ; python_version >= "3.8" and python_version < "4.0" -pygments==2.17.2 ; python_version >= "3.8" and python_version < "4.0" +pycparser==2.22 ; python_version >= "3.8" and python_version < "4.0" +pygments==2.18.0 ; python_version >= "3.8" and python_version < "4.0" pylint==3.0.2 ; python_version >= "3.8" and python_version < "4.0" pynacl==1.5.0 ; python_version >= "3.8" and python_version < "4.0" pynsist==2.7 ; python_version >= "3.8" and python_version < "4.0" @@ -118,11 +118,11 @@ pyopenssl==24.1.0 ; python_version >= "3.8" and python_version < "4.0" pyotp==2.9.0 ; python_version >= "3.8" and python_version < "4.0" pyparsing==3.1.2 ; python_version >= "3.8" and python_version < "4.0" pyproject-api==1.6.1 ; python_version >= "3.8" and python_version < "4.0" -pyproject-hooks==1.0.0 ; python_version >= "3.8" and python_version < "4.0" +pyproject-hooks==1.1.0 ; python_version >= "3.8" and python_version < "4.0" pyrfc3339==1.1 ; python_version >= "3.8" and python_version < "4.0" pytest-cov==5.0.0 ; python_version >= "3.8" and python_version < "4.0" -pytest-xdist==3.5.0 ; python_version >= "3.8" and python_version < "4.0" -pytest==8.1.1 ; python_version >= "3.8" and python_version < "4.0" +pytest-xdist==3.6.1 ; python_version >= "3.8" and python_version < "4.0" +pytest==8.2.0 ; python_version >= "3.8" and python_version < "4.0" python-augeas==1.1.0 ; python_version >= "3.8" and python_version < "4.0" python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "4.0" python-digitalocean==1.17.0 ; python_version >= "3.8" and python_version < "4.0" @@ -130,7 +130,7 @@ pytz==2024.1 ; python_version >= "3.8" and python_version < "4.0" pywin32-ctypes==0.2.2 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32" pywin32==306 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32" pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "4.0" -rapidfuzz==3.7.0 ; python_version >= "3.8" and python_version < "4.0" +rapidfuzz==3.9.0 ; python_version >= "3.8" and python_version < "4.0" readme-renderer==43.0 ; python_version >= "3.8" and python_version < "4.0" requests-download==0.1.2 ; python_version >= "3.8" and python_version < "4.0" requests-file==2.0.0 ; python_version >= "3.8" and python_version < "4.0" @@ -144,7 +144,7 @@ s3transfer==0.10.1 ; python_version >= "3.8" and python_version < "4.0" secretstorage==3.3.3 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "linux" semantic-version==2.10.0 ; python_version >= "3.8" and python_version < "4.0" setuptools-rust==1.9.0 ; python_version >= "3.8" and python_version < "4.0" -setuptools==69.2.0 ; python_version >= "3.8" and python_version < "4.0" +setuptools==69.5.1 ; python_version >= "3.8" and python_version < "4.0" shellingham==1.5.4 ; python_version >= "3.8" and python_version < "4.0" six==1.16.0 ; python_version >= "3.8" and python_version < "4.0" snowballstemmer==2.2.0 ; python_version >= "3.8" and python_version < "4.0" @@ -161,25 +161,26 @@ sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.8" and python_versio stack-data==0.6.3 ; python_version >= "3.8" and python_version < "4.0" tldextract==5.1.2 ; python_version >= "3.8" and python_version < "4.0" tomli==2.0.1 ; python_version >= "3.8" and python_full_version <= "3.11.0a6" -tomlkit==0.12.4 ; python_version >= "3.8" and python_version < "4.0" -tox==4.14.2 ; python_version >= "3.8" and python_version < "4.0" -traitlets==5.14.2 ; python_version >= "3.8" and python_version < "4.0" -trove-classifiers==2024.3.25 ; python_version >= "3.8" and python_version < "4.0" +tomlkit==0.12.5 ; python_version >= "3.8" and python_version < "4.0" +tox==4.15.0 ; python_version >= "3.8" and python_version < "4.0" +traitlets==5.14.3 ; python_version >= "3.8" and python_version < "4.0" +trove-classifiers==2024.4.10 ; python_version >= "3.8" and python_version < "4.0" twine==5.0.0 ; python_version >= "3.8" and python_version < "4.0" +types-cffi==1.16.0.20240331 ; python_version >= "3.8" and python_version < "4.0" types-httplib2==0.22.0.20240310 ; python_version >= "3.8" and python_version < "4.0" -types-pyopenssl==24.0.0.20240311 ; python_version >= "3.8" and python_version < "4.0" +types-pyopenssl==24.1.0.20240425 ; python_version >= "3.8" and python_version < "4.0" types-pyrfc3339==1.1.1.5 ; python_version >= "3.8" and python_version < "4.0" types-python-dateutil==2.9.0.20240316 ; python_version >= "3.8" and python_version < "4.0" -types-pytz==2024.1.0.20240203 ; python_version >= "3.8" and python_version < "4.0" -types-pywin32==306.0.0.20240319 ; python_version >= "3.8" and python_version < "4.0" +types-pytz==2024.1.0.20240417 ; python_version >= "3.8" and python_version < "4.0" +types-pywin32==306.0.0.20240408 ; python_version >= "3.8" and python_version < "4.0" types-requests==2.31.0.6 ; python_version >= "3.8" and python_version < "4.0" -types-setuptools==69.2.0.20240317 ; python_version >= "3.8" and python_version < "4.0" -types-six==1.16.21.20240311 ; python_version >= "3.8" and python_version < "4.0" +types-setuptools==69.5.0.20240423 ; python_version >= "3.8" and python_version < "4.0" +types-six==1.16.21.20240425 ; python_version >= "3.8" and python_version < "4.0" types-urllib3==1.26.25.14 ; python_version >= "3.8" and python_version < "4.0" -typing-extensions==4.10.0 ; python_version >= "3.8" and python_version < "4.0" +typing-extensions==4.11.0 ; python_version >= "3.8" and python_version < "4.0" uritemplate==4.1.1 ; python_version >= "3.8" and python_version < "4.0" -urllib3==1.26.18 ; python_version < "4.0" and python_version >= "3.8" -virtualenv==20.25.1 ; python_version >= "3.8" and python_version < "4.0" +urllib3==1.26.18 ; python_version >= "3.8" and python_version < "4.0" +virtualenv==20.26.1 ; python_version >= "3.8" and python_version < "4.0" wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "4.0" wheel==0.43.0 ; python_version >= "3.8" and python_version < "4.0" wrapt==1.16.0 ; python_version >= "3.8" and python_version < "4.0"