From b8b759f1d28479deaef18cd347170ff61bf67b6e Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 7 Feb 2024 17:55:30 -0800 Subject: [PATCH] update dependencies (#9893) Fixes https://github.com/certbot/certbot/issues/9892 and https://github.com/certbot/certbot/security/dependabot Upgrading the base docker image has been done in previous PRs like https://github.com/certbot/certbot/pull/9415. Doing this was needed because the [newer versions of `cryptography` need a newer version of rust](https://dev.azure.com/certbot/certbot/_build/results?buildId=7451&view=logs&j=fdd3565a-f3c6-5154-eca9-9ae03666f7bd&t=5dbd9851-46a4-524f-73a8-4028241afcde&l=475). I ran the full test suite on this branch which you can see in the GitHub status checks below. The boulder tests should fail as they're to be fixed by https://github.com/certbot/certbot/pull/9889 but everything else should pass. --- tools/docker/Dockerfile | 6 +-- tools/requirements.txt | 106 ++++++++++++++++++++-------------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 029640ab8..55ab8f502 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -1,5 +1,5 @@ -#base image -FROM python:3.10-alpine3.16 as certbot +#base image +FROM python:3.12-alpine3.18 as certbot ENTRYPOINT [ "certbot" ] EXPOSE 80 443 @@ -46,4 +46,4 @@ RUN apk add --no-cache --virtual .build-deps \ #extensive use of the cache. FROM certbot as certbot-plugin COPY --from=plugin-src . /opt/certbot/src/plugin -RUN python tools/pip_install.py --no-cache-dir --editable /opt/certbot/src/plugin \ No newline at end of file +RUN python tools/pip_install.py --no-cache-dir --editable /opt/certbot/src/plugin diff --git a/tools/requirements.txt b/tools/requirements.txt index 292771ae2..6012addb8 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -7,40 +7,40 @@ # for more info. alabaster==0.7.13 ; python_version >= "3.8" and python_version < "4.0" apacheconfig==0.3.2 ; python_version >= "3.8" and python_version < "4.0" -appnope==0.1.3 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "darwin" -astroid==3.0.1 ; python_version >= "3.8" and python_version < "4.0" +appnope==0.1.4 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "darwin" +astroid==3.0.3 ; python_version >= "3.8" and python_version < "4.0" asttokens==2.4.1 ; python_version >= "3.8" and python_version < "4.0" -attrs==23.1.0 ; python_version >= "3.8" and python_version < "4.0" -azure-core==1.29.5 ; 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.0 ; 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.13.1 ; python_version >= "3.8" and python_version < "4.0" +babel==2.14.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.1 ; python_version >= "3.8" and python_version < "4.0" -beautifulsoup4==4.12.2 ; python_version >= "3.8" and python_version < "4.0" -boto3==1.33.6 ; python_version >= "3.8" and python_version < "4.0" -botocore==1.33.6 ; python_version >= "3.8" and python_version < "4.0" +bcrypt==4.1.2 ; 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.36 ; python_version >= "3.8" and python_version < "4.0" +botocore==1.34.36 ; python_version >= "3.8" and python_version < "4.0" cachecontrol==0.12.14 ; python_version >= "3.8" and python_version < "4.0" cachetools==5.3.2 ; python_version >= "3.8" and python_version < "4.0" cachy==0.3.0 ; python_version >= "3.8" and python_version < "4.0" -certifi==2023.11.17 ; python_version >= "3.8" and python_version < "4.0" +certifi==2024.2.2 ; python_version >= "3.8" and python_version < "4.0" cffi==1.16.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==1.0.0a5 ; python_version >= "3.8" and python_version < "4.0" -cloudflare==2.14.2 ; python_version >= "3.8" and python_version < "4.0" +cloudflare==2.17.0 ; python_version >= "3.8" and python_version < "4.0" colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows" 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.3.2 ; python_version >= "3.8" and python_version < "4.0" +coverage==7.4.1 ; python_version >= "3.8" and python_version < "4.0" crashtest==0.3.1 ; python_version >= "3.8" and python_version < "4.0" -cryptography==41.0.7 ; python_version >= "3.8" and python_version < "4.0" -cython==0.29.36 ; python_version >= "3.8" and python_version < "4.0" +cryptography==42.0.2 ; 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.7 ; python_version < "4.0" and python_version >= "3.8" -distlib==0.3.7 ; python_version >= "3.8" and python_version < "4.0" -distro==1.8.0 ; python_version >= "3.8" and python_version < "4.0" +dill==0.3.8 ; python_version < "4.0" and python_version >= "3.8" +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.4.2 ; python_version >= "3.8" and python_version < "4.0" +dnspython==2.5.0 ; python_version >= "3.8" and python_version < "4.0" docutils==0.20.1 ; python_version >= "3.8" and python_version < "4.0" dulwich==0.20.50 ; python_version >= "3.8" and python_version < "4.0" exceptiongroup==1.2.0 ; python_version >= "3.8" and python_version < "3.11" @@ -48,11 +48,11 @@ execnet==2.0.2 ; 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" filelock==3.13.1 ; python_version >= "3.8" and python_version < "4.0" -google-api-core==2.14.0 ; python_version >= "3.8" and python_version < "4.0" -google-api-python-client==2.109.0 ; python_version >= "3.8" and python_version < "4.0" -google-auth-httplib2==0.1.1 ; python_version >= "3.8" and python_version < "4.0" -google-auth==2.24.0 ; python_version >= "3.8" and python_version < "4.0" -googleapis-common-protos==1.61.0 ; python_version >= "3.8" and python_version < "4.0" +google-api-core==2.16.2 ; python_version >= "3.8" and python_version < "4.0" +google-api-python-client==2.116.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.27.0 ; python_version >= "3.8" and python_version < "4.0" +googleapis-common-protos==1.62.0 ; python_version >= "3.8" and python_version < "4.0" html5lib==1.1 ; 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" @@ -64,48 +64,48 @@ invoke==2.2.0 ; python_version >= "3.8" and python_version < "4.0" 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.12.0 ; 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.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.2 ; python_version >= "3.8" and python_version < "4.0" +jinja2==3.1.3 ; 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.2 ; python_version >= "3.8" and python_version < "4.0" -jsonschema-specifications==2023.11.2 ; python_version >= "3.8" and python_version < "4.0" -jsonschema==4.20.0 ; python_version >= "3.8" and python_version < "4.0" +jsonschema-specifications==2023.12.1 ; python_version >= "3.8" and python_version < "4.0" +jsonschema==4.21.1 ; python_version >= "3.8" and python_version < "4.0" keyring==24.3.0 ; python_version >= "3.8" and python_version < "4.0" lockfile==0.12.2 ; 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.3 ; 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" 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.1.0 ; python_version >= "3.8" and python_version < "4.0" +more-itertools==10.2.0 ; python_version >= "3.8" and python_version < "4.0" msgpack==1.0.7 ; python_version >= "3.8" and python_version < "4.0" msrest==0.7.1 ; python_version >= "3.8" and python_version < "4.0" mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "4.0" -mypy==1.7.1 ; python_version >= "3.8" and python_version < "4.0" -nh3==0.2.14 ; python_version >= "3.8" and python_version < "4.0" +mypy==1.8.0 ; python_version >= "3.8" and python_version < "4.0" +nh3==0.2.15 ; python_version >= "3.8" and python_version < "4.0" oauthlib==3.2.2 ; python_version >= "3.8" and python_version < "4.0" packaging==23.2 ; python_version >= "3.8" and python_version < "4.0" -paramiko==3.3.1 ; 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" 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==23.3.1 ; python_version >= "3.8" and python_version < "4.0" +pip==24.0 ; python_version >= "3.8" and python_version < "4.0" pkginfo==1.9.6 ; python_version >= "3.8" and python_version < "4.0" pkgutil-resolve-name==1.3.10 ; python_version >= "3.8" and python_version < "3.9" platformdirs==2.6.2 ; python_version >= "3.8" and python_version < "4.0" -pluggy==1.3.0 ; python_version >= "3.8" and python_version < "4.0" +pluggy==1.4.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.3.2 ; python_version >= "3.8" and python_version < "4.0" poetry-plugin-export==1.2.0 ; python_version >= "3.8" and python_version < "4.0" poetry==1.2.2 ; python_version >= "3.8" and python_version < "4.0" -prompt-toolkit==3.0.41 ; python_version >= "3.8" and python_version < "4.0" -protobuf==4.25.1 ; python_version >= "3.8" and python_version < "4.0" +prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "4.0" +protobuf==4.25.2 ; python_version >= "3.8" and python_version < "4.0" 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" py==1.11.0 ; python_version >= "3.8" and python_version < "4.0" @@ -117,36 +117,36 @@ pylev==1.4.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" -pyopenssl==23.3.0 ; python_version >= "3.8" and python_version < "4.0" +pyopenssl==24.0.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.1 ; python_version >= "3.8" and python_version < "4.0" pyrfc3339==1.1 ; python_version >= "3.8" and python_version < "4.0" pytest-cov==4.1.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==7.4.3 ; python_version >= "3.8" and python_version < "4.0" +pytest==8.0.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.8.2 ; python_version >= "3.8" and python_version < "4.0" python-digitalocean==1.17.0 ; python_version >= "3.8" and python_version < "4.0" -pytz==2023.3.post1 ; python_version >= "3.8" and python_version < "4.0" +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" readme-renderer==42.0 ; python_version >= "3.8" and python_version < "4.0" -referencing==0.31.1 ; python_version >= "3.8" and python_version < "4.0" +referencing==0.33.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==1.5.1 ; python_version >= "3.8" and python_version < "4.0" +requests-file==2.0.0 ; python_version >= "3.8" and python_version < "4.0" requests-oauthlib==1.3.1 ; python_version >= "3.8" and python_version < "4.0" requests-toolbelt==0.9.1 ; python_version >= "3.8" and python_version < "4.0" requests==2.31.0 ; python_version >= "3.8" and python_version < "4.0" rfc3986==2.0.0 ; python_version >= "3.8" and python_version < "4.0" rich==13.7.0 ; python_version >= "3.8" and python_version < "4.0" -rpds-py==0.13.2 ; python_version >= "3.8" and python_version < "4.0" +rpds-py==0.17.1 ; python_version >= "3.8" and python_version < "4.0" rsa==4.9 ; python_version >= "3.8" and python_version < "4" -s3transfer==0.8.2 ; python_version >= "3.8" and python_version < "4.0" +s3transfer==0.10.0 ; 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.8.1 ; python_version >= "3.8" and python_version < "4.0" -setuptools==69.0.2 ; python_version < "4.0" and python_version >= "3.8" +setuptools==69.0.3 ; 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" @@ -165,23 +165,23 @@ tldextract==5.1.1 ; 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.3 ; python_version >= "3.8" and python_version < "4.0" tox==3.28.0 ; python_version >= "3.8" and python_version < "4.0" -traitlets==5.14.0 ; python_version >= "3.8" and python_version < "4.0" +traitlets==5.14.1 ; python_version >= "3.8" and python_version < "4.0" twine==4.0.2 ; python_version >= "3.8" and python_version < "4.0" types-httplib2==0.22.0.2 ; python_version >= "3.8" and python_version < "4.0" -types-pyopenssl==23.3.0.0 ; python_version >= "3.8" and python_version < "4.0" +types-pyopenssl==24.0.0.20240130 ; 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.8.19.14 ; python_version >= "3.8" and python_version < "4.0" -types-pytz==2023.3.1.1 ; python_version >= "3.8" and python_version < "4.0" -types-pywin32==306.0.0.6 ; python_version >= "3.8" and python_version < "4.0" +types-python-dateutil==2.8.19.20240106 ; 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.20240130 ; 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.0.0.0 ; python_version >= "3.8" and python_version < "4.0" -types-six==1.16.21.9 ; python_version >= "3.8" and python_version < "4.0" +types-setuptools==69.0.0.20240125 ; python_version >= "3.8" and python_version < "4.0" +types-six==1.16.21.20240106 ; 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.8.0 ; python_version >= "3.8" and python_version < "4.0" +typing-extensions==4.9.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.21.1 ; python_version >= "3.8" and python_version < "4.0" -wcwidth==0.2.12 ; python_version >= "3.8" and python_version < "4.0" +wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "4.0" webencodings==0.5.1 ; python_version >= "3.8" and python_version < "4.0" wheel==0.42.0 ; python_version >= "3.8" and python_version < "4.0" wrapt==1.16.0 ; python_version >= "3.8" and python_version < "4.0"