From 1615185a142abbe6be4e05bf791a62cc435888c4 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Wed, 14 Dec 2022 16:31:56 -0800 Subject: [PATCH] Prepare for 2.1.1 (#9508) * Update dependencies (#9505) * upgrade dependencies * forbid old setuptools (cherry picked from commit 70a36fdf00b38e873e7551919a1b4aa4d949eb00) * prep changelog * also mention windows --- certbot/CHANGELOG.md | 10 ++++++ tools/oldest_constraints.txt | 26 +++++++------- tools/pinning/current/pyproject.toml | 12 +++++++ tools/requirements.txt | 52 ++++++++++++++-------------- 4 files changed, 61 insertions(+), 39 deletions(-) diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index ad8c3b378..7a601be5c 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -2,6 +2,16 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). +## 2.1.1 - master + +### Fixed + +* Our snaps, Docker images, and Windows installer were rebuilt to include updated versions of our dependencies. + +This release was not pushed to PyPI since those packages were unaffected. + +More details about these changes can be found on our GitHub repo. + ## 2.1.0 - 2022-12-07 ### Added diff --git a/tools/oldest_constraints.txt b/tools/oldest_constraints.txt index 1783b0d37..da361cb4d 100644 --- a/tools/oldest_constraints.txt +++ b/tools/oldest_constraints.txt @@ -2,11 +2,11 @@ # that script. apacheconfig==0.3.2 ; python_full_version < "3.8.0" and python_version >= "3.7" asn1crypto==0.24.0 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0" -astroid==2.12.12 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0" +astroid==2.12.13 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0" attrs==22.1.0 ; python_version >= "3.7" and python_full_version < "3.8.0" boto3==1.15.15 ; python_full_version < "3.8.0" and python_version >= "3.7" botocore==1.18.15 ; python_full_version < "3.8.0" and python_version >= "3.7" -certifi==2022.9.24 ; python_full_version < "3.8.0" and python_version >= "3.7" +certifi==2022.12.7 ; python_full_version < "3.8.0" and python_version >= "3.7" cffi==1.9.1 ; python_full_version < "3.8.0" and python_version >= "3.7" chardet==3.0.4 ; python_full_version < "3.8.0" and python_version >= "3.7" cloudflare==1.5.1 ; python_full_version < "3.8.0" and python_version >= "3.7" @@ -23,13 +23,13 @@ dns-lexicon==3.2.1 ; python_full_version < "3.8.0" and python_version >= "3.7" dnspython==1.15.0 ; python_full_version < "3.8.0" and python_version >= "3.7" exceptiongroup==1.0.4 ; python_version >= "3.7" and python_full_version < "3.8.0" execnet==1.9.0 ; python_version >= "3.7" and python_full_version < "3.8.0" -filelock==3.8.0 ; python_version >= "3.7" and python_full_version < "3.8.0" +filelock==3.8.2 ; python_version >= "3.7" and python_full_version < "3.8.0" funcsigs==0.4 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0" future==0.18.2 ; python_full_version < "3.8.0" and python_version >= "3.7" google-api-python-client==1.5.5 ; python_full_version < "3.8.0" and python_version >= "3.7" httplib2==0.9.2 ; python_full_version < "3.8.0" and python_version >= "3.7" idna==2.6 ; python_full_version < "3.8.0" and python_version >= "3.7" -importlib-metadata==5.0.0 ; python_version >= "3.7" and python_version < "3.8" +importlib-metadata==5.1.0 ; python_version >= "3.7" and python_version < "3.8" iniconfig==1.1.1 ; python_version >= "3.7" and python_full_version < "3.8.0" ipaddress==1.0.16 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0" isort==5.10.1 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0" @@ -42,23 +42,23 @@ mypy-extensions==0.4.3 ; python_version >= "3.7" and python_full_version < "3.8. mypy==0.991 ; python_version >= "3.7" and python_full_version < "3.8.0" ndg-httpsclient==0.3.2 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0" oauth2client==4.0.0 ; python_full_version < "3.8.0" and python_version >= "3.7" -packaging==21.3 ; python_version >= "3.7" and python_full_version < "3.8.0" +packaging==22.0 ; python_version >= "3.7" and python_full_version < "3.8.0" parsedatetime==2.4 ; python_full_version < "3.8.0" and python_version >= "3.7" pbr==1.8.0 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0" pip==22.3.1 ; python_version >= "3.7" and python_full_version < "3.8.0" -platformdirs==2.5.4 ; python_full_version < "3.8.0" and python_version >= "3.7" +platformdirs==2.6.0 ; python_full_version < "3.8.0" and python_version >= "3.7" pluggy==1.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0" ply==3.4 ; python_full_version < "3.8.0" and python_version >= "3.7" py==1.11.0 ; python_version >= "3.7" and python_full_version < "3.8.0" pyasn1-modules==0.0.10 ; python_full_version < "3.8.0" and python_version >= "3.7" pyasn1==0.1.9 ; python_full_version < "3.8.0" and python_version >= "3.7" pycparser==2.14 ; python_full_version < "3.8.0" and python_version >= "3.7" -pylint==2.15.5 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0" +pylint==2.15.8 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0" pyopenssl==17.5.0 ; python_full_version < "3.8.0" and python_version >= "3.7" pyparsing==2.2.1 ; python_full_version < "3.8.0" and python_version >= "3.7" pyrfc3339==1.0 ; python_full_version < "3.8.0" and python_version >= "3.7" pytest-cov==4.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0" -pytest-xdist==3.0.2 ; python_version >= "3.7" and python_full_version < "3.8.0" +pytest-xdist==3.1.0 ; python_version >= "3.7" and python_full_version < "3.8.0" pytest==7.2.0 ; python_version >= "3.7" and python_full_version < "3.8.0" python-augeas==0.5.0 ; python_full_version < "3.8.0" and python_version >= "3.7" python-dateutil==2.8.2 ; python_full_version < "3.8.0" and python_version >= "3.7" @@ -79,17 +79,17 @@ tox==1.9.2 ; python_version >= "3.7" and python_full_version < "3.8.0" typed-ast==1.5.4 ; python_version < "3.8" and python_version >= "3.7" types-cryptography==3.3.23.2 ; python_version >= "3.7" and python_full_version < "3.8.0" types-pyopenssl==22.1.0.2 ; python_version >= "3.7" and python_full_version < "3.8.0" -types-pyrfc3339==1.1.1 ; python_version >= "3.7" and python_full_version < "3.8.0" +types-pyrfc3339==1.1.1.1 ; python_version >= "3.7" and python_full_version < "3.8.0" types-python-dateutil==2.8.19.4 ; python_version >= "3.7" and python_full_version < "3.8.0" types-pytz==2022.6.0.1 ; python_version >= "3.7" and python_full_version < "3.8.0" types-requests==2.28.11.5 ; python_version >= "3.7" and python_full_version < "3.8.0" -types-setuptools==65.5.0.3 ; python_version >= "3.7" and python_full_version < "3.8.0" -types-six==1.16.21.3 ; python_version >= "3.7" and python_full_version < "3.8.0" +types-setuptools==65.6.0.2 ; python_version >= "3.7" and python_full_version < "3.8.0" +types-six==1.16.21.4 ; python_version >= "3.7" and python_full_version < "3.8.0" types-urllib3==1.26.25.4 ; python_version >= "3.7" and python_full_version < "3.8.0" typing-extensions==4.4.0 ; python_version >= "3.7" and python_version < "3.8" uritemplate==3.0.1 ; python_full_version < "3.8.0" and python_version >= "3.7" urllib3==1.24.2 ; python_full_version < "3.8.0" and python_version >= "3.7" -virtualenv==20.16.7 ; python_version >= "3.7" and python_full_version < "3.8.0" +virtualenv==20.17.1 ; python_version >= "3.7" and python_full_version < "3.8.0" wheel==0.33.6 ; python_full_version < "3.8.0" and python_version >= "3.7" wrapt==1.14.1 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0" -zipp==3.10.0 ; python_version >= "3.7" and python_version < "3.8" +zipp==3.11.0 ; python_version >= "3.7" and python_version < "3.8" diff --git a/tools/pinning/current/pyproject.toml b/tools/pinning/current/pyproject.toml index 7db80d7fa..9680fb2a1 100644 --- a/tools/pinning/current/pyproject.toml +++ b/tools/pinning/current/pyproject.toml @@ -61,6 +61,18 @@ pylint = { version="2.15.5", python = ">=3.7.2" } # Making sure that it would not get installed (Fixing https://github.com/certbot/certbot/issues/9336) cryptography = "!= 37.0.3" +# If poetry>=1.3.0 is selected, multiple versions of virtualenv are selected +# causing problems when exporting dependencies so let's pin poetry back until +# https://github.com/python-poetry/poetry-plugin-export/issues/168 is resolved. +poetry = "<1.3.0" + +# jsonpickle is currently pinning back setuptools which can cause some problems +# in newer versions of Python. Until +# https://github.com/jsonpickle/jsonpickle/issues/424 is resolved, let's +# require a newer version of setuptools ourselves so a solution other than +# downgrading setuptools is found. +setuptools = ">=62.3.0" + [tool.poetry.dev-dependencies] [build-system] diff --git a/tools/requirements.txt b/tools/requirements.txt index 905d96cc7..fd28956fb 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -17,23 +17,23 @@ backports-cached-property==1.0.2 ; python_version >= "3.7" and python_version < bcrypt==4.0.1 ; python_version >= "3.7" and python_version < "4.0" beautifulsoup4==4.11.1 ; python_version >= "3.7" and python_version < "4.0" bleach==5.0.1 ; python_version >= "3.7" and python_version < "4.0" -boto3==1.26.13 ; python_version >= "3.7" and python_version < "4.0" -botocore==1.29.13 ; python_version >= "3.7" and python_version < "4.0" +boto3==1.26.27 ; python_version >= "3.7" and python_version < "4.0" +botocore==1.29.27 ; python_version >= "3.7" and python_version < "4.0" cachecontrol==0.12.11 ; python_version >= "3.7" and python_version < "4.0" cachetools==5.2.0 ; python_version >= "3.7" and python_version < "4.0" cachy==0.3.0 ; python_version >= "3.7" and python_version < "4.0" -certifi==2022.9.24 ; python_version >= "3.7" and python_version < "4" +certifi==2022.12.7 ; python_version >= "3.7" and python_version < "4" cffi==1.15.1 ; python_version >= "3.7" and python_version < "4.0" charset-normalizer==2.1.1 ; python_version >= "3.7" and python_version < "4" cleo==1.0.0a5 ; python_version >= "3.7" and python_version < "4.0" -cloudflare==2.10.5 ; python_version >= "3.7" and python_version < "4.0" +cloudflare==2.11.1 ; 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" commonmark==0.9.1 ; python_version >= "3.7" and python_version < "4.0" configargparse==1.5.3 ; python_version >= "3.7" and python_version < "4.0" configobj==5.0.6 ; python_version >= "3.7" and python_version < "4.0" coverage==6.5.0 ; python_version >= "3.7" and python_version < "4.0" crashtest==0.3.1 ; python_version >= "3.7" and python_version < "4.0" -cryptography==38.0.3 ; python_version >= "3.7" and python_version < "4.0" +cryptography==38.0.4 ; python_version >= "3.7" and python_version < "4.0" cython==0.29.32 ; python_version >= "3.7" and python_version < "4.0" decorator==5.1.1 ; python_version >= "3.7" and python_version < "4.0" dill==0.3.6 ; python_full_version >= "3.7.2" and python_version < "4.0" @@ -46,33 +46,33 @@ dulwich==0.20.50 ; python_version >= "3.7" and python_version < "4.0" exceptiongroup==1.0.4 ; python_version >= "3.7" and python_version < "3.11" execnet==1.9.0 ; python_version >= "3.7" and python_version < "4.0" fabric==2.7.1 ; python_version >= "3.7" and python_version < "4.0" -filelock==3.8.0 ; python_version >= "3.7" and python_version < "4.0" -google-api-core==2.10.2 ; python_version >= "3.7" and python_version < "4.0" -google-api-python-client==2.66.0 ; python_version >= "3.7" and python_version < "4.0" +filelock==3.8.2 ; python_version >= "3.7" and python_version < "4.0" +google-api-core==2.11.0 ; python_version >= "3.7" and python_version < "4.0" +google-api-python-client==2.69.0 ; python_version >= "3.7" and python_version < "4.0" google-auth-httplib2==0.1.0 ; python_version >= "3.7" and python_version < "4.0" -google-auth==2.14.1 ; python_version >= "3.7" and python_version < "4.0" +google-auth==2.15.0 ; python_version >= "3.7" and python_version < "4.0" googleapis-common-protos==1.57.0 ; python_version >= "3.7" and python_version < "4.0" html5lib==1.1 ; python_version >= "3.7" and python_version < "4.0" httplib2==0.21.0 ; python_version >= "3.7" and python_version < "4.0" idna==3.4 ; python_version >= "3.7" and python_version < "4" imagesize==1.4.1 ; python_version >= "3.7" and python_version < "4.0" importlib-metadata==4.13.0 ; python_version >= "3.7" and python_version < "4.0" -importlib-resources==5.10.0 ; python_version >= "3.7" and python_version < "3.9" +importlib-resources==5.10.1 ; python_version >= "3.7" and python_version < "3.9" iniconfig==1.1.1 ; python_version >= "3.7" and python_version < "4.0" invoke==1.7.3 ; python_version >= "3.7" and python_version < "4.0" ipdb==0.13.9 ; python_version >= "3.7" and python_version < "4.0" 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.10.1 ; python_full_version >= "3.7.2" and python_version < "4.0" +isort==5.11.0 ; 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.18.1 ; python_version >= "3.7" and python_version < "4.0" +jedi==0.18.2 ; 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" josepy==1.13.0 ; python_version >= "3.7" and python_version < "4.0" jsonlines==3.1.0 ; python_version >= "3.7" and python_version < "4.0" jsonpickle==2.2.0 ; python_version >= "3.7" and python_version < "4.0" -jsonschema==4.17.0 ; python_version >= "3.7" and python_version < "4.0" +jsonschema==4.17.3 ; python_version >= "3.7" and python_version < "4.0" keyring==23.11.0 ; python_version >= "3.7" and python_version < "4.0" lazy-object-proxy==1.8.0 ; python_full_version >= "3.7.2" and python_version < "4.0" lockfile==0.12.2 ; python_version >= "3.7" and python_version < "4.0" @@ -86,7 +86,7 @@ mypy-extensions==0.4.3 ; python_version >= "3.7" and python_version < "4.0" mypy==0.991 ; python_version >= "3.7" and python_version < "4.0" oauth2client==4.1.3 ; python_version >= "3.7" and python_version < "4.0" oauthlib==3.2.2 ; python_version >= "3.7" and python_version < "4.0" -packaging==21.3 ; python_version >= "3.7" and python_version < "4.0" +packaging==22.0 ; python_version >= "3.7" and python_version < "4.0" paramiko==2.12.0 ; 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" @@ -94,16 +94,16 @@ pathlib2==2.3.7.post1 ; python_version >= "3.7" and python_version < "4.0" pexpect==4.8.0 ; python_version >= "3.7" and python_version < "4.0" pickleshare==0.7.5 ; python_version >= "3.7" and python_version < "4.0" pip==22.3.1 ; python_version >= "3.7" and python_version < "4.0" -pkginfo==1.8.3 ; python_version >= "3.7" and python_version < "4.0" +pkginfo==1.9.2 ; python_version >= "3.7" and python_version < "4.0" pkgutil-resolve-name==1.3.10 ; python_version >= "3.7" and python_version < "3.9" -platformdirs==2.5.4 ; python_version < "4.0" and python_version >= "3.7" +platformdirs==2.6.0 ; python_version < "4.0" and python_version >= "3.7" pluggy==1.0.0 ; python_version >= "3.7" and python_version < "4.0" ply==3.11 ; python_version >= "3.7" and python_version < "4.0" 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.33 ; python_version >= "3.7" and python_version < "4.0" -protobuf==4.21.9 ; python_version >= "3.7" and python_version < "4.0" +prompt-toolkit==3.0.36 ; python_version >= "3.7" and python_version < "4.0" +protobuf==4.21.11 ; 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.2.8 ; python_version >= "3.7" and python_version < "4.0" @@ -119,7 +119,7 @@ pyparsing==3.0.9 ; python_version >= "3.7" and python_version < "4.0" pyrfc3339==1.1 ; python_version >= "3.7" and python_version < "4.0" pyrsistent==0.19.2 ; python_version >= "3.7" and python_version < "4.0" pytest-cov==4.0.0 ; python_version >= "3.7" and python_version < "4.0" -pytest-xdist==3.0.2 ; python_version >= "3.7" and python_version < "4.0" +pytest-xdist==3.1.0 ; python_version >= "3.7" and python_version < "4.0" pytest==7.2.0 ; python_version >= "3.7" and python_version < "4.0" python-augeas==1.1.0 ; python_version >= "3.7" and python_version < "4.0" python-dateutil==2.8.2 ; python_version >= "3.7" and python_version < "4.0" @@ -141,7 +141,7 @@ s3transfer==0.6.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.5.2 ; python_version >= "3.7" and python_version < "4.0" -setuptools==65.6.0 ; python_version >= "3.7" and python_version < "4.0" +setuptools==65.6.3 ; python_version >= "3.7" and python_version < "4.0" shellingham==1.5.0 ; python_version >= "3.7" and python_version < "4.0" six==1.16.0 ; python_version >= "3.7" and python_version < "4.0" snowballstemmer==2.2.0 ; python_version >= "3.7" and python_version < "4.0" @@ -159,8 +159,8 @@ toml==0.10.2 ; 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.11.6 ; python_version < "4.0" and python_version >= "3.7" tox==3.27.1 ; python_version >= "3.7" and python_version < "4.0" -traitlets==5.5.0 ; python_version >= "3.7" and python_version < "4.0" -twine==4.0.1 ; python_version >= "3.7" and python_version < "4.0" +traitlets==5.7.1 ; python_version >= "3.7" and python_version < "4.0" +twine==4.0.2 ; python_version >= "3.7" and python_version < "4.0" typed-ast==1.5.4 ; python_version < "3.8" and python_version >= "3.7" types-cryptography==3.3.23.2 ; python_version >= "3.7" and python_version < "4.0" types-pyopenssl==22.1.0.2 ; python_version >= "3.7" and python_version < "4.0" @@ -168,17 +168,17 @@ types-pyrfc3339==1.1.1.1 ; python_version >= "3.7" and python_version < "4.0" types-python-dateutil==2.8.19.4 ; python_version >= "3.7" and python_version < "4.0" types-pytz==2022.6.0.1 ; python_version >= "3.7" and python_version < "4.0" types-requests==2.28.11.5 ; python_version >= "3.7" and python_version < "4.0" -types-setuptools==65.6.0.0 ; python_version >= "3.7" and python_version < "4.0" +types-setuptools==65.6.0.2 ; python_version >= "3.7" and python_version < "4.0" types-six==1.16.21.4 ; python_version >= "3.7" and python_version < "4.0" types-urllib3==1.26.25.4 ; python_version >= "3.7" and python_version < "4.0" typing-extensions==4.4.0 ; 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.12 ; python_version >= "3.7" and python_version < "4" -virtualenv==20.16.7 ; python_version >= "3.7" and python_version < "4.0" +urllib3==1.26.13 ; python_version >= "3.7" and python_version < "4.0" +virtualenv==20.17.1 ; python_version >= "3.7" and python_version < "4.0" wcwidth==0.2.5 ; python_version >= "3.7" and python_version < "4.0" webencodings==0.5.1 ; python_version >= "3.7" and python_version < "4.0" wheel==0.38.4 ; python_version >= "3.7" and python_version < "4.0" wrapt==1.14.1 ; python_full_version >= "3.7.2" and python_version < "4.0" xattr==0.9.9 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "darwin" yarg==0.1.9 ; python_version >= "3.7" and python_version < "4.0" -zipp==3.10.0 ; python_version >= "3.7" and python_version < "4.0" +zipp==3.11.0 ; python_version >= "3.7" and python_version < "4.0"