From 036527d8c4a29b29dda1a1587fc3bcf7e85c6e49 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Fri, 11 Sep 2020 00:30:24 +0200 Subject: [PATCH] Version 3.7.0 --- CHANGELOG.md | 2 ++ pyproject.toml | 2 +- src/dnsrobocert/core/hooks.py | 8 ++++++-- src/dnsrobocert/core/legacy.py | 12 +++--------- utils/create_release.py | 4 +++- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dde92725..8cf0a07a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## master - CURRENT + +## 3.7.0 - 11/09/2020 ## Modified * Upgrade Lexicon to 3.4.3 (add Njalla provider) * Upgrade Certbot to 1.8.0 diff --git a/pyproject.toml b/pyproject.toml index 77465065..ace1b42f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "poetry.masonry.api" [tool.poetry] name = "dnsrobocert" -version = "3.6.0" +version = "3.7.0" description = "A tool to manage your DNS-challenged TLS certificates" license = "MIT" keywords = [ diff --git a/src/dnsrobocert/core/hooks.py b/src/dnsrobocert/core/hooks.py index 0c4c0fe9..d9f856ed 100644 --- a/src/dnsrobocert/core/hooks.py +++ b/src/dnsrobocert/core/hooks.py @@ -42,7 +42,8 @@ def main(args: List[str] = None) -> int: globals()[parsed_args.type](dnsrobocert_config, parsed_args.lineage) except BaseException as e: print( - f"Error while executing the `{parsed_args.type}` hook:", file=sys.stderr, + f"Error while executing the `{parsed_args.type}` hook:", + file=sys.stderr, ) print(e, file=sys.stderr) traceback.print_exc(file=sys.stderr) @@ -163,7 +164,10 @@ def deploy(dnsrobocert_config: Dict[str, Any], _no_lineage: Any): def _txt_challenge( - profile: Dict[str, Any], token: str, domain: str, action: str = "create", + profile: Dict[str, Any], + token: str, + domain: str, + action: str = "create", ): profile_name = profile["name"] provider_name = profile["provider"] diff --git a/src/dnsrobocert/core/legacy.py b/src/dnsrobocert/core/legacy.py index 8ede9397..1b682b95 100644 --- a/src/dnsrobocert/core/legacy.py +++ b/src/dnsrobocert/core/legacy.py @@ -40,25 +40,19 @@ def migrate(config_path): } for key, value in configs.get(provider, {}).items(): - provider_config.setdefault("provider_options", {})[ # type: ignore - key - ] = value + provider_config.setdefault("provider_options", {})[key] = value # type: ignore env_key_prefix = "LEXICON_{0}_".format(provider.upper()) for key, value in envs.items(): if key.startswith(env_key_prefix): - provider_config.setdefault( - "provider_options", {} # type: ignore - )[ + provider_config.setdefault("provider_options", {})[ # type: ignore key.replace(env_key_prefix, "").lower() ] = value _handle_specific_envs_variables(envs, migrated_config) for key, value in args.get(provider, {}).items(): - provider_config.setdefault("provider_options", {})[ # type: ignore - key - ] = value + provider_config.setdefault("provider_options", {})[key] = value # type: ignore if args.get("delegated"): provider_config["delegated_subdomain"] = args.get("delegated") diff --git a/utils/create_release.py b/utils/create_release.py index a84382b5..3b677515 100755 --- a/utils/create_release.py +++ b/utils/create_release.py @@ -6,7 +6,9 @@ def main(): git_clean = subprocess.check_output( - "git status --porcelain", shell=True, universal_newlines=True, + "git status --porcelain", + shell=True, + universal_newlines=True, ).strip() if git_clean: raise RuntimeError("Error, git workspace is not clean: \n{0}".format(git_clean))