diff --git a/PKG-INFO b/PKG-INFO index 953d3cf..9179d39 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: certbot-dns-rfc2136 -Version: 0.31.0 +Version: 0.35.1 Summary: RFC 2136 DNS Authenticator plugin for Certbot Home-page: https://github.com/certbot/certbot Author: Certbot Project diff --git a/certbot_dns_rfc2136/dns_rfc2136.py b/certbot_dns_rfc2136/dns_rfc2136.py index b8c01cd..2061374 100644 --- a/certbot_dns_rfc2136/dns_rfc2136.py +++ b/certbot_dns_rfc2136/dns_rfc2136.py @@ -57,7 +57,7 @@ def _validate_algorithm(self, credentials): algorithm = credentials.conf('algorithm') if algorithm: - if not self.ALGORITHMS.get(algorithm): + if not self.ALGORITHMS.get(algorithm.upper()): raise errors.PluginError("Unknown algorithm: {0}.".format(algorithm)) def _setup_credentials(self): @@ -220,4 +220,3 @@ except Exception as e: raise errors.PluginError('Encountered error when making query: {0}' .format(e)) - diff --git a/certbot_dns_rfc2136/dns_rfc2136_test.py b/certbot_dns_rfc2136/dns_rfc2136_test.py index 89ce3d9..d800f1e 100644 --- a/certbot_dns_rfc2136/dns_rfc2136_test.py +++ b/certbot_dns_rfc2136/dns_rfc2136_test.py @@ -1,6 +1,5 @@ """Tests for certbot_dns_rfc2136.dns_rfc2136.""" -import os import unittest import dns.flags @@ -9,6 +8,7 @@ import mock from certbot import errors +from certbot.compat import os from certbot.plugins import dns_test_common from certbot.plugins.dns_test_common import DOMAIN from certbot.tests import util as test_util @@ -64,7 +64,7 @@ def test_valid_algorithm_passes(self): config = VALID_CONFIG.copy() - config["rfc2136_algorithm"] = "HMAC-SHA512" + config["rfc2136_algorithm"] = "HMAC-sha512" dns_test_common.write(config, self.config.rfc2136_credentials) self.auth.perform([self.achall]) @@ -171,7 +171,7 @@ result = self.rfc2136_client._query_soa(DOMAIN) query_mock.assert_called_with(mock.ANY, SERVER, port=PORT) - self.assertTrue(result == True) + self.assertTrue(result) @mock.patch("dns.query.udp") def test_query_soa_not_found(self, query_mock): @@ -181,7 +181,7 @@ result = self.rfc2136_client._query_soa(DOMAIN) query_mock.assert_called_with(mock.ANY, SERVER, port=PORT) - self.assertTrue(result == False) + self.assertFalse(result) @mock.patch("dns.query.udp") def test_query_soa_wraps_errors(self, query_mock): diff --git a/certbot_dns_rfc2136.egg-info/PKG-INFO b/certbot_dns_rfc2136.egg-info/PKG-INFO index 953d3cf..9179d39 100644 --- a/certbot_dns_rfc2136.egg-info/PKG-INFO +++ b/certbot_dns_rfc2136.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: certbot-dns-rfc2136 -Version: 0.31.0 +Version: 0.35.1 Summary: RFC 2136 DNS Authenticator plugin for Certbot Home-page: https://github.com/certbot/certbot Author: Certbot Project diff --git a/certbot_dns_rfc2136.egg-info/requires.txt b/certbot_dns_rfc2136.egg-info/requires.txt index c54cdcd..0c8dcb6 100644 --- a/certbot_dns_rfc2136.egg-info/requires.txt +++ b/certbot_dns_rfc2136.egg-info/requires.txt @@ -1,5 +1,5 @@ -acme>=0.21.1 -certbot>=0.21.1 +acme>=0.29.0 +certbot>=0.34.0 dnspython mock setuptools diff --git a/setup.py b/setup.py index 0faa2d4..cc406aa 100644 --- a/setup.py +++ b/setup.py @@ -2,13 +2,13 @@ from setuptools import find_packages -version = '0.31.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. install_requires = [ - 'acme>=0.21.1', - 'certbot>=0.21.1', + 'acme>=0.29.0', + 'certbot>=0.34.0', 'dnspython', 'mock', 'setuptools',