From 21113d17c75c4fa359658a91efa57385a269a4d8 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 6 Oct 2023 11:59:26 -0700 Subject: [PATCH] Prep for 2.7.1 (#9790) * Bump setup.py's ConfigArgParse version (#9784) I neglected to do this during #9678, so looks like some pip installs are failing to get the minimum required version. (cherry picked from commit 02efc8c5cae79ff272884d120caf95900cf35b3b) * Fix dnsimple typo (#9787) Fixes https://github.com/certbot/certbot/issues/9786. (cherry picked from commit 4e60a0d03a77296db35846acf7939801c2e27fa7) * update pinned dependencies (#9788) This fixes the security alerts those with access can see at https://github.com/certbot/certbot/security/dependabot. (cherry picked from commit 5849ff73fb40dfe8b733da33388faa4dfc9253e2) * update changelog for configargparse (#9789) I'd like to do a bug fix release for https://github.com/certbot/certbot/issues/9786. If we're doing one, I figure we may as well flag this change from https://github.com/certbot/certbot/pull/9784 too. (cherry picked from commit 61773be971edf6a291a0ba0f8e8ad10b57e46dc5) --------- Co-authored-by: Will Greenberg --- .../_internal/dns_dnsimple.py | 2 +- certbot/CHANGELOG.md | 11 ++++++ certbot/setup.py | 5 +-- tools/requirements.txt | 36 +++++++++---------- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/dns_dnsimple.py b/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/dns_dnsimple.py index 3d1017f0b..c9ef1cdd1 100644 --- a/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/dns_dnsimple.py +++ b/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/dns_dnsimple.py @@ -39,7 +39,7 @@ class Authenticator(dns_common_lexicon.LexiconDNSAuthenticator): @property def _provider_name(self) -> str: - return 'dnssimple' + return 'dnsimple' def _handle_http_error(self, e: HTTPError, domain_name: str) -> errors.PluginError: hint = None diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index 68467b5a9..4d3658b79 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -2,6 +2,17 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). +## 2.7.1 - master + +### Fixed + +* Fixed a bug that broke the DNS plugin for DNSimple that was introduced in + version 2.7.0 of the plugin. +* Correctly specified the new minimum version of the ConfigArgParse package + that Certbot requires which is 1.5.3. + +More details about these changes can be found on our GitHub repo. + ## 2.7.0 - 2023-10-03 ### Added diff --git a/certbot/setup.py b/certbot/setup.py index f607d558b..2c86a1446 100644 --- a/certbot/setup.py +++ b/certbot/setup.py @@ -28,10 +28,7 @@ install_requires = [ # simplicity. See https://github.com/certbot/certbot/issues/8761 for more # info. f'acme>={version}', - # We technically need ConfigArgParse 0.10.0 for Python 2.6 support, but - # saying so here causes a runtime error against our temporary fork of 0.9.3 - # in which we added 2.6 support (see #2243), so we relax the requirement. - 'ConfigArgParse>=0.9.3', + 'ConfigArgParse>=1.5.3', 'configobj>=5.0.6', 'cryptography>=3.2.1', 'distro>=1.0.1', diff --git a/tools/requirements.txt b/tools/requirements.txt index 2d134b272..be328117e 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -12,28 +12,28 @@ astroid==2.13.5 ; python_full_version >= "3.7.2" and python_version < "4.0" attrs==23.1.0 ; python_version >= "3.7" and python_version < "4.0" azure-core==1.29.4 ; python_version >= "3.7" and python_version < "4.0" azure-devops==7.1.0b3 ; python_version >= "3.7" and python_version < "4.0" -babel==2.12.1 ; python_version >= "3.7" and python_version < "4.0" +babel==2.13.0 ; python_version >= "3.7" and python_version < "4.0" backcall==0.2.0 ; python_version >= "3.7" and python_version < "4.0" backports-cached-property==1.0.2 ; python_version >= "3.7" and python_version < "3.8" bcrypt==4.0.1 ; python_version >= "3.7" and python_version < "4.0" beautifulsoup4==4.12.2 ; python_version >= "3.7" and python_version < "4.0" bleach==6.0.0 ; python_version >= "3.7" and python_version < "4.0" -boto3==1.28.45 ; python_version >= "3.7" and python_version < "4.0" -botocore==1.31.45 ; python_version >= "3.7" and python_version < "4.0" +boto3==1.28.60 ; python_version >= "3.7" and python_version < "4.0" +botocore==1.31.60 ; python_version >= "3.7" and python_version < "4.0" cachecontrol==0.12.14 ; python_version >= "3.7" and python_version < "4.0" cachetools==5.3.1 ; python_version >= "3.7" and python_version < "4.0" cachy==0.3.0 ; python_version >= "3.7" and python_version < "4.0" certifi==2023.7.22 ; python_version >= "3.7" and python_version < "4.0" cffi==1.15.1 ; python_version >= "3.7" and python_version < "4.0" -charset-normalizer==3.2.0 ; python_version >= "3.7" and python_version < "4.0" +charset-normalizer==3.3.0 ; python_version >= "3.7" and python_version < "4.0" cleo==1.0.0a5 ; python_version >= "3.7" and python_version < "4.0" -cloudflare==2.11.7 ; python_version >= "3.7" and python_version < "4.0" +cloudflare==2.12.4 ; python_version >= "3.7" and python_version < "4.0" colorama==0.4.6 ; python_version < "4.0" and sys_platform == "win32" and python_version >= "3.7" or python_version >= "3.7" and python_version < "4.0" and platform_system == "Windows" configargparse==1.7 ; python_version >= "3.7" and python_version < "4.0" configobj==5.0.8 ; python_version >= "3.7" and python_version < "4.0" coverage==7.2.7 ; python_version >= "3.7" and python_version < "4.0" crashtest==0.3.1 ; python_version >= "3.7" and python_version < "4.0" -cryptography==41.0.3 ; python_version >= "3.7" and python_version < "4.0" +cryptography==41.0.4 ; python_version >= "3.7" and python_version < "4.0" cython==0.29.36 ; python_version >= "3.7" and python_version < "4.0" decorator==5.1.1 ; python_version >= "3.7" and python_version < "4.0" deprecated==1.2.14 ; python_version >= "3.7" and python_version < "4.0" @@ -48,10 +48,10 @@ exceptiongroup==1.1.3 ; python_version >= "3.7" and python_version < "3.11" execnet==2.0.2 ; python_version >= "3.7" and python_version < "4.0" fabric==3.2.2 ; python_version >= "3.7" and python_version < "4.0" filelock==3.12.2 ; python_version >= "3.7" and python_version < "4.0" -google-api-core==2.11.1 ; python_version >= "3.7" and python_version < "4.0" -google-api-python-client==2.99.0 ; python_version >= "3.7" and python_version < "4.0" +google-api-core==2.12.0 ; python_version >= "3.7" and python_version < "4.0" +google-api-python-client==2.102.0 ; python_version >= "3.7" and python_version < "4.0" google-auth-httplib2==0.1.1 ; python_version >= "3.7" and python_version < "4.0" -google-auth==2.23.0 ; python_version >= "3.7" and python_version < "4.0" +google-auth==2.23.2 ; python_version >= "3.7" and python_version < "4.0" googleapis-common-protos==1.60.0 ; python_version >= "3.7" and python_version < "4.0" html5lib==1.1 ; python_version >= "3.7" and python_version < "4.0" httplib2==0.22.0 ; python_version >= "3.7" and python_version < "4.0" @@ -66,7 +66,7 @@ ipython==7.34.0 ; python_version >= "3.7" and python_version < "4.0" isodate==0.6.1 ; python_version >= "3.7" and python_version < "4.0" isort==5.11.5 ; python_full_version >= "3.7.2" and python_version < "4.0" jaraco-classes==3.2.3 ; python_version >= "3.7" and python_version < "4.0" -jedi==0.19.0 ; python_version >= "3.7" and python_version < "4.0" +jedi==0.19.1 ; python_version >= "3.7" and python_version < "4.0" jeepney==0.8.0 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "linux" jinja2==3.1.2 ; python_version >= "3.7" and python_version < "4.0" jmespath==1.0.1 ; python_version >= "3.7" and python_version < "4.0" @@ -88,7 +88,7 @@ msrest==0.7.1 ; python_version >= "3.7" and python_version < "4.0" mypy-extensions==1.0.0 ; python_version >= "3.7" and python_version < "4.0" mypy==1.4.1 ; python_version >= "3.7" and python_version < "4.0" oauthlib==3.2.2 ; python_version >= "3.7" and python_version < "4.0" -packaging==23.1 ; python_version >= "3.7" and python_version < "4.0" +packaging==23.2 ; python_version >= "3.7" and python_version < "4.0" paramiko==3.3.1 ; python_version >= "3.7" and python_version < "4.0" parsedatetime==2.6 ; python_version >= "3.7" and python_version < "4.0" parso==0.8.3 ; python_version >= "3.7" and python_version < "4.0" @@ -104,7 +104,7 @@ poetry-core==1.3.2 ; python_version >= "3.7" and python_version < "4.0" poetry-plugin-export==1.2.0 ; python_version >= "3.7" and python_version < "4.0" poetry==1.2.2 ; python_version >= "3.7" and python_version < "4.0" prompt-toolkit==3.0.39 ; python_version >= "3.7" and python_version < "4.0" -protobuf==4.24.3 ; python_version >= "3.7" and python_version < "4.0" +protobuf==4.24.4 ; python_version >= "3.7" and python_version < "4.0" ptyprocess==0.7.0 ; python_version >= "3.7" and python_version < "4.0" py==1.11.0 ; python_version >= "3.7" and python_version < "4.0" pyasn1-modules==0.3.0 ; python_version >= "3.7" and python_version < "4.0" @@ -136,9 +136,9 @@ requests-oauthlib==1.3.1 ; python_version >= "3.7" and python_version < "4.0" requests-toolbelt==0.9.1 ; python_version >= "3.7" and python_version < "4.0" requests==2.31.0 ; python_version >= "3.7" and python_version < "4.0" rfc3986==2.0.0 ; python_version >= "3.7" and python_version < "4.0" -rich==13.5.2 ; python_version >= "3.7" and python_version < "4.0" +rich==13.6.0 ; python_version >= "3.7" and python_version < "4.0" rsa==4.9 ; python_version >= "3.7" and python_version < "4" -s3transfer==0.6.2 ; python_version >= "3.7" and python_version < "4.0" +s3transfer==0.7.0 ; python_version >= "3.7" and python_version < "4.0" secretstorage==3.3.3 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "linux" semantic-version==2.10.0 ; python_version >= "3.7" and python_version < "4.0" setuptools-rust==1.7.0 ; python_version >= "3.7" and python_version < "4.0" @@ -156,7 +156,7 @@ sphinxcontrib-jquery==4.1 ; python_version >= "3.7" and python_version < "4.0" sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.7" and python_version < "4.0" sphinxcontrib-qthelp==1.0.3 ; python_version >= "3.7" and python_version < "4.0" sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.7" and python_version < "4.0" -tldextract==3.5.0 ; python_version >= "3.7" and python_version < "4.0" +tldextract==3.6.0 ; python_version >= "3.7" and python_version < "4.0" tomli==2.0.1 ; python_version >= "3.7" and python_full_version <= "3.11.0a6" tomlkit==0.12.1 ; python_version < "4.0" and python_version >= "3.7" tox==3.28.0 ; python_version >= "3.7" and python_version < "4.0" @@ -167,7 +167,7 @@ types-httplib2==0.22.0.2 ; python_version >= "3.7" and python_version < "4.0" types-pyopenssl==23.2.0.2 ; python_version >= "3.7" and python_version < "4.0" types-pyrfc3339==1.1.1.5 ; python_version >= "3.7" and python_version < "4.0" types-python-dateutil==2.8.19.14 ; python_version >= "3.7" and python_version < "4.0" -types-pytz==2023.3.0.1 ; python_version >= "3.7" and python_version < "4.0" +types-pytz==2023.3.1.1 ; python_version >= "3.7" and python_version < "4.0" types-pywin32==306.0.0.4 ; python_version >= "3.7" and python_version < "4.0" types-requests==2.31.0.2 ; python_version >= "3.7" and python_version < "4.0" types-setuptools==68.2.0.0 ; python_version >= "3.7" and python_version < "4.0" @@ -175,9 +175,9 @@ types-six==1.16.21.9 ; python_version >= "3.7" and python_version < "4.0" types-urllib3==1.26.25.14 ; python_version >= "3.7" and python_version < "4.0" typing-extensions==4.7.1 ; python_version >= "3.7" and python_version < "4.0" uritemplate==4.1.1 ; python_version >= "3.7" and python_version < "4.0" -urllib3==1.26.16 ; python_version >= "3.7" and python_version < "4.0" +urllib3==1.26.17 ; python_version >= "3.7" and python_version < "4.0" virtualenv==20.21.1 ; python_version >= "3.7" and python_version < "4.0" -wcwidth==0.2.6 ; python_version >= "3.7" and python_version < "4.0" +wcwidth==0.2.8 ; python_version >= "3.7" and python_version < "4.0" webencodings==0.5.1 ; python_version >= "3.7" and python_version < "4.0" wheel==0.41.2 ; python_version >= "3.7" and python_version < "4.0" wrapt==1.15.0 ; python_version < "4.0" and python_version >= "3.7"