diff options
author | Brad Warren <bmw@users.noreply.github.com> | 2022-03-02 04:17:43 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-02 04:17:43 +0300 |
commit | f734e7a81c0137a8a19bdb696420c9de6d55e4e4 (patch) | |
tree | cc2f8da6300e9329af12324310feb6a84c8c45e1 | |
parent | c1030c0d40716895f0220a5b236a7b93c223150e (diff) | |
parent | 9d312af32af5337ce34e0f8af2e15582a530a983 (diff) |
Merge pull request #9224 from certbot/candidate-1.24.0
Release 1.24.0
-rw-r--r-- | acme/docs/jws-help.txt | 2 | ||||
-rw-r--r-- | acme/setup.py | 2 | ||||
-rw-r--r-- | certbot-apache/setup.py | 2 | ||||
-rw-r--r-- | certbot-compatibility-test/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-cloudflare/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-cloudxns/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-digitalocean/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-dnsimple/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-dnsmadeeasy/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-gehirn/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-google/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-linode/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-luadns/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-nsone/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-ovh/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-rfc2136/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-route53/setup.py | 2 | ||||
-rw-r--r-- | certbot-dns-sakuracloud/setup.py | 2 | ||||
-rw-r--r-- | certbot-nginx/setup.py | 2 | ||||
-rw-r--r-- | certbot/CHANGELOG.md | 18 | ||||
-rw-r--r-- | certbot/certbot/__init__.py | 2 | ||||
-rw-r--r-- | certbot/docs/cli-help.txt | 8 |
22 files changed, 42 insertions, 24 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 6894d29a1..9462e700d 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'cryptography>=2.5.0', diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py index 4c677060c..ac6a01509 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.24.0.dev0' +version = '1.25.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 65357e494..541d73ccc 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'certbot', diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py index 49e9d3730..36066d097 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'cloudflare>=1.5.1', diff --git a/certbot-dns-cloudxns/setup.py b/certbot-dns-cloudxns/setup.py index 247a75056..84f8d15a7 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py index 694cc9302..49cd23195 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.24.0.dev0' +version = '1.25.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 b0ae5919f..33e9c9a02 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.24.0.dev0' +version = '1.25.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 2c0be6480..55a92c4ac 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py index 1bcfe5ad0..5c78bcd2c 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py index e91aa7585..63ca4b74c 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.24.0.dev0' +version = '1.25.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 f99e1354c..b23dab4e2 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py index aa0efe23e..17b30421b 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py index 70222212b..e88de2bc1 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py index 74cbdd24e..57d2975c3 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py index 421cfc001..48a8b4105 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'dnspython>=1.15.0', diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py index b84db2610..882e81952 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'boto3>=1.15.15', diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py index 841a3214f..b37b59f65 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ 'dns-lexicon>=3.2.1', diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py index 159723901..3471af0ca 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.24.0.dev0' +version = '1.25.0.dev0' install_requires = [ # We specify the minimum acme and certbot version as the current plugin diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index 4b39712bf..4d2ae2b70 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -2,7 +2,23 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). -## 1.24.0 - master +## 1.25.0 - master + +### Added + +* + +### Changed + +* + +### Fixed + +* + +More details about these changes can be found on our GitHub repo. + +## 1.24.0 - 2022-03-01 ### Added diff --git a/certbot/certbot/__init__.py b/certbot/certbot/__init__.py index d4fc6c8fb..6e3247f4e 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.24.0.dev0' +__version__ = '1.25.0.dev0' diff --git a/certbot/docs/cli-help.txt b/certbot/docs/cli-help.txt index 2c37daf8e..627c57091 100644 --- a/certbot/docs/cli-help.txt +++ b/certbot/docs/cli-help.txt @@ -35,7 +35,7 @@ manage your account: --agree-tos Agree to the ACME server's Subscriber Agreement -m EMAIL Email address for important account notifications -options: +optional arguments: -h, --help show this help message and exit -c CONFIG_FILE, --config CONFIG_FILE path to config file (default: /etc/letsencrypt/cli.ini @@ -97,7 +97,9 @@ options: necessary to accurately simulate renewal. --deploy- hook commands are not called. (default: False) --debug-challenges After setting up challenges, wait for user input - before submitting to CA (default: False) + before submitting to CA. When used in combination with + the `-v` option, the challenge URLs or FQDNs and their + expected return values are shown. (default: False) --preferred-chain PREFERRED_CHAIN Set the preferred certificate chain. If the CA offers multiple certificate chains, prefer the chain whose @@ -124,7 +126,7 @@ options: 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.23.0 (certbot; + "". (default: CertbotACMEClient/1.24.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, |