From 023bb494b59c16ae0d830588d9b8e2d6663529ee Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 5 Dec 2022 08:05:50 -0800 Subject: [PATCH 1/6] undo help text changes --- certbot/docs/cli-help.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/certbot/docs/cli-help.txt b/certbot/docs/cli-help.txt index 7daf8641e..3c0538b72 100644 --- a/certbot/docs/cli-help.txt +++ b/certbot/docs/cli-help.txt @@ -126,7 +126,7 @@ optional arguments: case, and to know when to deprecate support for past Python versions and flags. If you wish to hide this information from the Let's Encrypt server, set this to - "". (default: CertbotACMEClient/2.0.0 (certbot; + "". (default: CertbotACMEClient/1.32.0 (certbot; OS_NAME OS_VERSION) Authenticator/XXX Installer/YYY (SUBCOMMAND; flags: FLAGS) Py/major.minor.patchlevel). The flags encoded in the user agent are: --duplicate, @@ -196,7 +196,7 @@ security: --key-type {rsa,ecdsa} Type of generated private key. Only *ONE* per invocation can be provided at this time. (default: - ecdsa) + rsa) --elliptic-curve N The SECG elliptic curve name to use. Please see RFC 8446 for supported values. (default: secp256r1) --must-staple Adds the OCSP Must-Staple extension to the @@ -460,6 +460,8 @@ plugins: directory. (default: False) --dns-cloudflare Obtain certificates using a DNS TXT record (if you are using Cloudflare for DNS). (default: False) + --dns-cloudxns Obtain certificates using a DNS TXT record (if you are + using CloudXNS for DNS). (default: False) --dns-digitalocean Obtain certificates using a DNS TXT record (if you are using DigitalOcean for DNS). (default: False) --dns-dnsimple Obtain certificates using a DNS TXT record (if you are From 746631351f5465b453c8c58d2ac3a22ce4e98fca Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 16 Dec 2022 12:43:17 -0800 Subject: [PATCH 2/6] Prep for 1.32.2 (#9514) * Update dependencies (#9505) * upgrade dependencies * forbid old setuptools (cherry picked from commit 70a36fdf00b38e873e7551919a1b4aa4d949eb00) * fix help output (#9509) (cherry picked from commit 27af7b5d152ef89f1eb78e60972ee644a3238fdb) * add reminder to repin.sh * write changelog entry * pin back mypy --- certbot/CHANGELOG.md | 10 +++ tools/_release.sh | 10 ++- tools/oldest_constraints.txt | 54 +++++++-------- tools/pinning/current/pyproject.toml | 16 +++++ tools/pinning/current/repin.sh | 3 + tools/requirements.txt | 99 ++++++++++++++-------------- 6 files changed, 114 insertions(+), 78 deletions(-) diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index 581e5358f..568cbefff 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -2,6 +2,16 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). +## 1.32.2 - master + +### Fixed + +* Our snaps and Docker images 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. + ## 1.32.1 - 2022-12-05 ### Fixed diff --git a/tools/_release.sh b/tools/_release.sh index a9ed017a7..f0cb9397a 100755 --- a/tools/_release.sh +++ b/tools/_release.sh @@ -169,6 +169,14 @@ VIRTUALENV_NO_DOWNLOAD=1 virtualenv ../venv . ../venv/bin/activate pip install -U setuptools pip install -U pip + +# This creates a string like "acme==a.b.c certbot==a.b.c ..." which can be used +# with pip to ensure the correct versions of our packages installed. +subpkgs_with_version="" +for pkg in $SUBPKGS; do + subpkgs_with_version="$subpkgs_with_version $pkg==$version" +done + # Now, use our local archives. Disable cache so we get the correct packages even if # we (or our dependencies) have conditional dependencies implemented with if # statements in setup.py and we have cached wheels lying around that would cause @@ -176,7 +184,7 @@ pip install -U pip python ../tools/pip_install.py \ --no-cache-dir \ --find-links . \ - $SUBPKGS + $subpkgs_with_version cd ~- # get a snapshot of the CLI help for the docs diff --git a/tools/oldest_constraints.txt b/tools/oldest_constraints.txt index 75fc47aba..2f18d57b8 100644 --- a/tools/oldest_constraints.txt +++ b/tools/oldest_constraints.txt @@ -6,47 +6,48 @@ astroid==2.11.7 ; python_full_version < "3.8.0" and python_version >= "3.7" 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" -colorama==0.4.5 ; python_full_version < "3.8.0" and sys_platform == "win32" and python_version >= "3.7" +colorama==0.4.6 ; python_full_version < "3.8.0" and sys_platform == "win32" and python_version >= "3.7" configargparse==0.10.0 ; python_full_version < "3.8.0" and python_version >= "3.7" configobj==5.0.6 ; python_full_version < "3.8.0" and python_version >= "3.7" coverage==6.5.0 ; python_version >= "3.7" and python_full_version < "3.8.0" cryptography==3.2.1 ; python_full_version < "3.8.0" and python_version >= "3.7" cython==0.29.32 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0" -dill==0.3.5.1 ; python_full_version < "3.8.0" and python_version >= "3.7" +dill==0.3.6 ; python_version >= "3.7" and python_full_version < "3.8.0" distlib==0.3.6 ; python_version >= "3.7" and python_full_version < "3.8.0" distro==1.0.1 ; python_full_version < "3.8.0" and python_version >= "3.7" 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.8.0" and python_version >= "3.7" +isort==5.11.2 ; python_full_version < "3.8.0" and python_version >= "3.7" jmespath==0.10.0 ; python_full_version < "3.8.0" and python_version >= "3.7" josepy==1.13.0 ; python_version >= "3.7" and python_full_version < "3.8.0" -lazy-object-proxy==1.7.1 ; python_full_version < "3.8.0" and python_version >= "3.7" +lazy-object-proxy==1.8.0 ; python_version >= "3.7" and python_full_version < "3.8.0" logger==1.4 ; python_full_version < "3.8.0" and python_version >= "3.7" mccabe==0.7.0 ; python_full_version < "3.8.0" and python_version >= "3.7" mock==1.0.1 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0" mypy-extensions==0.4.3 ; python_version >= "3.7" and python_full_version < "3.8.0" -mypy==0.982 ; python_version >= "3.7" and python_full_version < "3.8.0" +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 ; python_version >= "3.7" and python_full_version < "3.8.0" -platformdirs==2.5.2 ; python_version >= "3.7" and python_full_version < "3.8.0" +pip==22.3.1 ; python_version >= "3.7" and python_full_version < "3.8.0" +platformdirs==2.6.0 ; python_version >= "3.7" and python_full_version < "3.8.0" 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" @@ -58,17 +59,16 @@ 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-forked==1.4.0 ; python_version >= "3.7" and python_full_version < "3.8.0" -pytest-xdist==2.5.0 ; python_version >= "3.7" and python_full_version < "3.8.0" -pytest==7.1.3 ; 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" python-digitalocean==1.11 ; python_full_version < "3.8.0" and python_version >= "3.7" pytz==2019.3 ; python_full_version < "3.8.0" and python_version >= "3.7" -pywin32==304 ; python_version >= "3.7" and python_full_version < "3.8.0" and sys_platform == "win32" +pywin32==305 ; python_version >= "3.7" and python_full_version < "3.8.0" and sys_platform == "win32" pyyaml==6.0 ; python_full_version < "3.8.0" and python_version >= "3.7" requests-file==1.5.1 ; python_version >= "3.7" and python_full_version < "3.8.0" -requests-toolbelt==0.10.0 ; python_version >= "3.7" and python_full_version < "3.8.0" +requests-toolbelt==0.10.1 ; python_version >= "3.7" and python_full_version < "3.8.0" requests==2.20.0 ; python_full_version < "3.8.0" and python_version >= "3.7" rsa==4.9 ; python_full_version < "3.8.0" and python_version >= "3.7" s3transfer==0.3.7 ; python_full_version < "3.8.0" and python_version >= "3.7" @@ -78,23 +78,23 @@ tldextract==3.4.0 ; python_version >= "3.7" and python_full_version < "3.8.0" tomli==2.0.1 ; python_version >= "3.7" and python_full_version < "3.8.0" 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.1 ; python_version >= "3.7" and python_full_version < "3.8.0" +types-cryptography==3.3.23.2 ; python_version >= "3.7" and python_full_version < "3.8.0" types-mock==4.0.15.2 ; python_version >= "3.7" and python_full_version < "3.8.0" -types-pyopenssl==22.1.0.1 ; 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-python-dateutil==2.8.19.2 ; python_version >= "3.7" and python_full_version < "3.8.0" -types-pytz==2022.5.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0" -types-requests==2.28.11.2 ; python_version >= "3.7" and python_full_version < "3.8.0" -types-setuptools==65.5.0.1 ; python_version >= "3.7" and python_full_version < "3.8.0" -types-six==1.16.21 ; python_version >= "3.7" and python_full_version < "3.8.0" -types-urllib3==1.26.25.1 ; 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.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.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.5 ; 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.8.0" and python_version >= "3.7" -zipp==3.9.0 ; python_version >= "3.7" and python_version < "3.8" +zipp==3.11.0 ; python_version >= "3.7" and python_version < "3.8" zope-component==4.1.0 ; python_full_version < "3.8.0" and python_version >= "3.7" zope-event==4.0.3 ; python_full_version < "3.8.0" and python_version >= "3.7" zope-hookable==4.0.4 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0" diff --git a/tools/pinning/current/pyproject.toml b/tools/pinning/current/pyproject.toml index ae3df1a01..9e3d10b75 100644 --- a/tools/pinning/current/pyproject.toml +++ b/tools/pinning/current/pyproject.toml @@ -77,6 +77,22 @@ pylint = "2.13.9" # 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" + +# Rather than spending time fixing mypy problems on a point release branch, +# let's pin it to the last version we successfully used it. +mypy = "0.982" + [tool.poetry.dev-dependencies] [build-system] diff --git a/tools/pinning/current/repin.sh b/tools/pinning/current/repin.sh index c8ec8e87f..67677a622 100755 --- a/tools/pinning/current/repin.sh +++ b/tools/pinning/current/repin.sh @@ -22,3 +22,6 @@ cat << EOF > "$REQUIREMENTS_FILE" # for more info. EOF echo "${PINNINGS}" >> "${REQUIREMENTS_FILE}" +echo "You should copy the changes made to tools/requirements.txt to" +echo "tools/1.32.x/requirements.txt on the master branch. See" +echo "https://github.com/certbot/certbot/pull/9506 for more info." diff --git a/tools/requirements.txt b/tools/requirements.txt index cbfe6f865..2975c084d 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -10,7 +10,7 @@ apacheconfig==0.3.2 ; python_version >= "3.7" and python_version < "4.0" appnope==0.1.3 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "darwin" astroid==2.11.7 ; python_version >= "3.7" and python_version < "4.0" attrs==22.1.0 ; python_version >= "3.7" and python_version < "4.0" -awscli==1.27.0 ; python_version >= "3.7" and python_version < "4.0" +awscli==1.27.30 ; python_version >= "3.7" and python_version < "4.0" azure-devops==6.0.0b4 ; python_version >= "3.7" and python_version < "4.0" babel==2.11.0 ; python_version >= "3.7" and python_version < "4.0" backcall==0.2.0 ; python_version >= "3.7" and python_version < "4.0" @@ -18,23 +18,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.0 ; python_version >= "3.7" and python_version < "4.0" -botocore==1.29.0 ; python_version >= "3.7" and python_version < "4.0" +boto3==1.26.30 ; python_version >= "3.7" and python_version < "4.0" +botocore==1.29.30 ; 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.2 ; 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.4 ; python_version >= "3.7" and python_version < "4.0" 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_version >= "3.7" and python_version < "4.0" @@ -44,37 +44,37 @@ dns-lexicon==3.11.7 ; python_version >= "3.7" and python_version < "4.0" dnspython==2.2.1 ; python_version >= "3.7" and python_version < "4.0" docutils==0.16 ; python_version >= "3.7" and python_version < "4.0" dulwich==0.20.50 ; python_version >= "3.7" and python_version < "4.0" -exceptiongroup==1.0.0 ; python_version >= "3.7" and python_version < "3.11" +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.65.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.70.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.0 ; python_version >= "3.7" and python_version < "4.0" -googleapis-common-protos==1.56.4 ; 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" +ipdb==0.13.11 ; 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_version >= "3.7" and python_version < "4.0" +isort==5.11.2 ; python_version >= "3.7" 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" -keyring==23.9.3 ; 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_version >= "3.7" and python_version < "4.0" lockfile==0.12.2 ; python_version >= "3.7" and python_version < "4.0" markupsafe==2.1.1 ; python_version >= "3.7" and python_version < "4.0" @@ -88,24 +88,24 @@ mypy-extensions==0.4.3 ; python_version >= "3.7" and python_version < "4.0" mypy==0.982 ; 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" -paramiko==2.11.0 ; 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" 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 ; python_version >= "3.7" and python_version < "4.0" -pkginfo==1.8.3 ; python_version >= "3.7" and python_version < "4.0" +pip==22.3.1 ; 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.2 ; python_version >= "3.7" and python_version < "4.0" +platformdirs==2.6.0 ; python_version >= "3.7" and python_version < "4.0" 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.1.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.31 ; 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.12 ; 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,16 +119,16 @@ pynsist==2.7 ; python_version >= "3.7" and python_version < "4.0" pyopenssl==22.1.0 ; python_version >= "3.7" and python_version < "4.0" 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.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" python-digitalocean==1.17.0 ; python_version >= "3.7" and python_version < "4.0" pytz==2022.6 ; python_version >= "3.7" and python_version < "4.0" pywin32-ctypes==0.2.0 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32" -pywin32==304 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32" +pywin32==305 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32" pyyaml==5.4.1 ; python_version >= "3.7" and python_version < "4.0" readme-renderer==37.3 ; python_version >= "3.7" and python_version < "4.0" requests-download==0.1.2 ; python_version >= "3.7" and python_version < "4.0" @@ -143,12 +143,12 @@ 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.5.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" soupsieve==2.3.2.post1 ; python_version >= "3.7" and python_version < "4.0" -sphinx-rtd-theme==1.1.0 ; python_version >= "3.7" and python_version < "4.0" +sphinx-rtd-theme==1.1.1 ; python_version >= "3.7" and python_version < "4.0" sphinx==5.1.1 ; python_version >= "3.7" and python_version < "4.0" sphinxcontrib-applehelp==1.0.2 ; python_version >= "3.7" and python_version < "4.0" sphinxcontrib-devhelp==1.0.2 ; python_version >= "3.7" and python_version < "4.0" @@ -157,35 +157,34 @@ 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.4.0 ; python_version >= "3.7" and python_version < "4.0" -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 >= "3.7" and python_version < "4.0" -tox==3.27.0 ; 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" +tox==3.27.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.7" and python_version < "3.8" -types-cryptography==3.3.23.1 ; python_version >= "3.7" and python_version < "4.0" +types-cryptography==3.3.23.2 ; python_version >= "3.7" and python_version < "4.0" types-mock==4.0.15.2 ; python_version >= "3.7" and python_version < "4.0" -types-pyopenssl==22.1.0.1 ; python_version >= "3.7" and python_version < "4.0" -types-pyrfc3339==1.1.1 ; python_version >= "3.7" and python_version < "4.0" -types-python-dateutil==2.8.19.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" +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.2 ; python_version >= "3.7" and python_version < "4.0" -types-setuptools==65.5.0.2 ; python_version >= "3.7" and python_version < "4.0" -types-six==1.16.21 ; python_version >= "3.7" and python_version < "4.0" -types-urllib3==1.26.25.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.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.6 ; 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.37.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_version >= "3.7" 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" zope-component==5.0.1 ; python_version >= "3.7" and python_version < "4.0" -zope-event==4.5.0 ; python_version >= "3.7" and python_version < "4.0" -zope-hookable==5.2 ; python_version >= "3.7" and python_version < "4.0" -zope-interface==5.5.0 ; python_version >= "3.7" and python_version < "4.0" +zope-event==4.6 ; python_version >= "3.7" and python_version < "4.0" +zope-hookable==5.4 ; python_version >= "3.7" and python_version < "4.0" +zope-interface==5.5.2 ; python_version >= "3.7" and python_version < "4.0" From 118fce34d3808c6149cfb3a0b8d88017effbb1b5 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 16 Dec 2022 12:45:28 -0800 Subject: [PATCH 3/6] Update changelog for 1.32.2 release --- certbot/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index 568cbefff..b8196c726 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -2,7 +2,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). -## 1.32.2 - master +## 1.32.2 - 2022-12-16 ### Fixed From 06bba7167d5dc558dbc5a994cb5b21a0552a21c8 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 16 Dec 2022 12:46:34 -0800 Subject: [PATCH 4/6] Release 1.32.2 --- acme/setup.py | 2 +- certbot-apache/setup.py | 2 +- certbot-compatibility-test/setup.py | 2 +- certbot-dns-cloudflare/setup.py | 2 +- certbot-dns-cloudxns/setup.py | 2 +- certbot-dns-digitalocean/setup.py | 2 +- certbot-dns-dnsimple/setup.py | 2 +- certbot-dns-dnsmadeeasy/setup.py | 2 +- certbot-dns-gehirn/setup.py | 2 +- certbot-dns-google/setup.py | 2 +- certbot-dns-linode/setup.py | 2 +- certbot-dns-luadns/setup.py | 2 +- certbot-dns-nsone/setup.py | 2 +- certbot-dns-ovh/setup.py | 2 +- certbot-dns-rfc2136/setup.py | 2 +- certbot-dns-route53/setup.py | 2 +- certbot-dns-sakuracloud/setup.py | 2 +- certbot-nginx/setup.py | 2 +- certbot/certbot/__init__.py | 2 +- certbot/docs/cli-help.txt | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/acme/setup.py b/acme/setup.py index 42cada545..5af6e5a14 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -3,7 +3,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'cryptography>=2.5.0', diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py index eea22bddf..eb378ac95 100644 --- a/certbot-apache/setup.py +++ b/certbot-apache/setup.py @@ -1,7 +1,7 @@ from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ # We specify the minimum acme and certbot version as the current plugin diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py index 261dd212b..ee1eef947 100644 --- a/certbot-compatibility-test/setup.py +++ b/certbot-compatibility-test/setup.py @@ -1,7 +1,7 @@ from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'certbot', diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py index f4a62662b..d065a65f0 100644 --- a/certbot-dns-cloudflare/setup.py +++ b/certbot-dns-cloudflare/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'cloudflare>=1.5.1', diff --git a/certbot-dns-cloudxns/setup.py b/certbot-dns-cloudxns/setup.py index ec5c3ba10..fea6a30d2 100644 --- a/certbot-dns-cloudxns/setup.py +++ b/certbot-dns-cloudxns/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py index 5c1e78b97..1b2c52d5f 100644 --- a/certbot-dns-digitalocean/setup.py +++ b/certbot-dns-digitalocean/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'python-digitalocean>=1.11', # 1.15.0 or newer is recommended for TTL support diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py index 3703cbf61..b0d1e9479 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ # This version of lexicon is required to address the problem described in diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py index 1804ca428..1371377b6 100644 --- a/certbot-dns-dnsmadeeasy/setup.py +++ b/certbot-dns-dnsmadeeasy/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py index ac4af5d60..f885f44f2 100644 --- a/certbot-dns-gehirn/setup.py +++ b/certbot-dns-gehirn/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py index b9f35534f..ecc64023d 100644 --- a/certbot-dns-google/setup.py +++ b/certbot-dns-google/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'google-api-python-client>=1.5.5', diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py index d42d97d20..7ea9877f8 100644 --- a/certbot-dns-linode/setup.py +++ b/certbot-dns-linode/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py index 304aba31d..77f8446a7 100644 --- a/certbot-dns-luadns/setup.py +++ b/certbot-dns-luadns/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py index 77300edbe..a5d7dcb26 100644 --- a/certbot-dns-nsone/setup.py +++ b/certbot-dns-nsone/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py index 1f1eb889a..dee6a53f2 100644 --- a/certbot-dns-ovh/setup.py +++ b/certbot-dns-ovh/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py index 9f239e8a4..1fb7effdd 100644 --- a/certbot-dns-rfc2136/setup.py +++ b/certbot-dns-rfc2136/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'dnspython>=1.15.0', diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py index d49671e28..ea238baee 100644 --- a/certbot-dns-route53/setup.py +++ b/certbot-dns-route53/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'boto3>=1.15.15', diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py index 8294093f4..9e1164686 100644 --- a/certbot-dns-sakuracloud/setup.py +++ b/certbot-dns-sakuracloud/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py index 199df17ce..3ce0dcce6 100644 --- a/certbot-nginx/setup.py +++ b/certbot-nginx/setup.py @@ -1,7 +1,7 @@ from setuptools import find_packages from setuptools import setup -version = '1.32.1' +version = '1.32.2' install_requires = [ # We specify the minimum acme and certbot version as the current plugin diff --git a/certbot/certbot/__init__.py b/certbot/certbot/__init__.py index bcac26e1b..d50263fe4 100644 --- a/certbot/certbot/__init__.py +++ b/certbot/certbot/__init__.py @@ -1,3 +1,3 @@ """Certbot client.""" # version number like 1.2.3a0, must have at least 2 parts, like 1.2 -__version__ = '1.32.1' +__version__ = '1.32.2' diff --git a/certbot/docs/cli-help.txt b/certbot/docs/cli-help.txt index 3c0538b72..fcdd8cfda 100644 --- a/certbot/docs/cli-help.txt +++ b/certbot/docs/cli-help.txt @@ -126,7 +126,7 @@ optional arguments: case, and to know when to deprecate support for past Python versions and flags. If you wish to hide this information from the Let's Encrypt server, set this to - "". (default: CertbotACMEClient/1.32.0 (certbot; + "". (default: CertbotACMEClient/1.32.2 (certbot; OS_NAME OS_VERSION) Authenticator/XXX Installer/YYY (SUBCOMMAND; flags: FLAGS) Py/major.minor.patchlevel). The flags encoded in the user agent are: --duplicate, From 8e30f13e572ed13b0920308eb5c262ffb3dcc49f Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 16 Dec 2022 12:46:36 -0800 Subject: [PATCH 5/6] Add contents to certbot/CHANGELOG.md for next version --- certbot/CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index b8196c726..e2506cd0f 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -2,6 +2,22 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). +## 2.2.0 - master + +### Added + +* + +### Changed + +* + +### Fixed + +* + +More details about these changes can be found on our GitHub repo. + ## 1.32.2 - 2022-12-16 ### Fixed From c3e1d7e5602344bf66fe2f1a83f8e970449f9818 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 16 Dec 2022 12:46:36 -0800 Subject: [PATCH 6/6] Bump version to 2.2.0 --- acme/docs/jws-help.txt | 2 +- acme/setup.py | 2 +- certbot-apache/setup.py | 2 +- certbot-compatibility-test/setup.py | 2 +- certbot-dns-cloudflare/setup.py | 2 +- certbot-dns-cloudxns/setup.py | 2 +- certbot-dns-digitalocean/setup.py | 2 +- certbot-dns-dnsimple/setup.py | 2 +- certbot-dns-dnsmadeeasy/setup.py | 2 +- certbot-dns-gehirn/setup.py | 2 +- certbot-dns-google/setup.py | 2 +- certbot-dns-linode/setup.py | 2 +- certbot-dns-luadns/setup.py | 2 +- certbot-dns-nsone/setup.py | 2 +- certbot-dns-ovh/setup.py | 2 +- certbot-dns-rfc2136/setup.py | 2 +- certbot-dns-route53/setup.py | 2 +- certbot-dns-sakuracloud/setup.py | 2 +- certbot-nginx/setup.py | 2 +- certbot/certbot/__init__.py | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/acme/docs/jws-help.txt b/acme/docs/jws-help.txt index bfd16dff4..34cf5ce23 100644 --- a/acme/docs/jws-help.txt +++ b/acme/docs/jws-help.txt @@ -3,6 +3,6 @@ usage: jws [-h] [--compact] {sign,verify} ... positional arguments: {sign,verify} -options: +optional arguments: -h, --help show this help message and exit --compact diff --git a/acme/setup.py b/acme/setup.py index 5af6e5a14..b004b2348 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -3,7 +3,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'cryptography>=2.5.0', diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py index eb378ac95..285406b9d 100644 --- a/certbot-apache/setup.py +++ b/certbot-apache/setup.py @@ -1,7 +1,7 @@ from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ # We specify the minimum acme and certbot version as the current plugin diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py index ee1eef947..293ca99c9 100644 --- a/certbot-compatibility-test/setup.py +++ b/certbot-compatibility-test/setup.py @@ -1,7 +1,7 @@ from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'certbot', diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py index d065a65f0..09d7be615 100644 --- a/certbot-dns-cloudflare/setup.py +++ b/certbot-dns-cloudflare/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'cloudflare>=1.5.1', diff --git a/certbot-dns-cloudxns/setup.py b/certbot-dns-cloudxns/setup.py index fea6a30d2..c8b996bc2 100644 --- a/certbot-dns-cloudxns/setup.py +++ b/certbot-dns-cloudxns/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py index 1b2c52d5f..a2b303d57 100644 --- a/certbot-dns-digitalocean/setup.py +++ b/certbot-dns-digitalocean/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'python-digitalocean>=1.11', # 1.15.0 or newer is recommended for TTL support diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py index b0d1e9479..84a13d84a 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ # This version of lexicon is required to address the problem described in diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py index 1371377b6..1cdaf5fae 100644 --- a/certbot-dns-dnsmadeeasy/setup.py +++ b/certbot-dns-dnsmadeeasy/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py index f885f44f2..9689fcf26 100644 --- a/certbot-dns-gehirn/setup.py +++ b/certbot-dns-gehirn/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py index ecc64023d..7ce100142 100644 --- a/certbot-dns-google/setup.py +++ b/certbot-dns-google/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'google-api-python-client>=1.5.5', diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py index 7ea9877f8..eda6b173d 100644 --- a/certbot-dns-linode/setup.py +++ b/certbot-dns-linode/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py index 77f8446a7..6738e8fb0 100644 --- a/certbot-dns-luadns/setup.py +++ b/certbot-dns-luadns/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py index a5d7dcb26..ab8cdf89b 100644 --- a/certbot-dns-nsone/setup.py +++ b/certbot-dns-nsone/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py index dee6a53f2..d875f145a 100644 --- a/certbot-dns-ovh/setup.py +++ b/certbot-dns-ovh/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py index 1fb7effdd..c52b0e02d 100644 --- a/certbot-dns-rfc2136/setup.py +++ b/certbot-dns-rfc2136/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'dnspython>=1.15.0', diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py index ea238baee..5396fcef2 100644 --- a/certbot-dns-route53/setup.py +++ b/certbot-dns-route53/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'boto3>=1.15.15', diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py index 9e1164686..5f76cec0f 100644 --- a/certbot-dns-sakuracloud/setup.py +++ b/certbot-dns-sakuracloud/setup.py @@ -4,7 +4,7 @@ import sys from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py index 3ce0dcce6..b9a3cbdfc 100644 --- a/certbot-nginx/setup.py +++ b/certbot-nginx/setup.py @@ -1,7 +1,7 @@ from setuptools import find_packages from setuptools import setup -version = '1.32.2' +version = '2.2.0.dev0' install_requires = [ # We specify the minimum acme and certbot version as the current plugin diff --git a/certbot/certbot/__init__.py b/certbot/certbot/__init__.py index d50263fe4..5ff735866 100644 --- a/certbot/certbot/__init__.py +++ b/certbot/certbot/__init__.py @@ -1,3 +1,3 @@ """Certbot client.""" # version number like 1.2.3a0, must have at least 2 parts, like 1.2 -__version__ = '1.32.2' +__version__ = '2.2.0.dev0'