From 8632064ee7e11e1c5579d967605d827a3553f23c Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Thu, 18 Jun 2020 14:12:30 -0700 Subject: [PATCH] Temporarily modify dns_common so certbot-dns-dnsimple relies on the latest version --- .../certbot_dns_dnsimple/_internal/dns_dnsimple.py | 2 +- certbot-dns-dnsimple/local-oldest-requirements.txt | 2 +- certbot-dns-dnsimple/setup.py | 2 +- certbot/certbot/plugins/dns_common.py | 4 ++-- certbot/tests/plugins/dns_common_test.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/dns_dnsimple.py b/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/dns_dnsimple.py index 9f7f100d7..92c47cf85 100644 --- a/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/dns_dnsimple.py +++ b/certbot-dns-dnsimple/certbot_dns_dnsimple/_internal/dns_dnsimple.py @@ -16,7 +16,7 @@ ACCOUNT_URL = 'https://dnsimple.com/user' @zope.interface.implementer(interfaces.IAuthenticator) @zope.interface.provider(interfaces.IPluginFactory) -class Authenticator(dns_common.DNSAuthenticator): +class Authenticator(dns_common.DNSAuthenticator2): """DNS Authenticator for DNSimple This Authenticator uses the DNSimple v2 API to fulfill a dns-01 challenge. diff --git a/certbot-dns-dnsimple/local-oldest-requirements.txt b/certbot-dns-dnsimple/local-oldest-requirements.txt index 1307698d4..67d4cc53b 100644 --- a/certbot-dns-dnsimple/local-oldest-requirements.txt +++ b/certbot-dns-dnsimple/local-oldest-requirements.txt @@ -1,3 +1,3 @@ # Remember to update setup.py to match the package versions below. acme[dev]==0.31.0 -certbot[dev]==1.1.0 +-e certbot[dev] diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py index 6efebcd41..b41f163f1 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -19,7 +19,7 @@ install_requires = [ if not os.environ.get('EXCLUDE_CERTBOT_DEPS'): install_requires.extend([ 'acme>=0.31.0', - 'certbot>=1.1.0', + 'certbot>=1.6.0.dev0', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset EXCLUDE_CERTBOT_DEPS when building wheels ' diff --git a/certbot/certbot/plugins/dns_common.py b/certbot/certbot/plugins/dns_common.py index 245b7dc05..77db787aa 100644 --- a/certbot/certbot/plugins/dns_common.py +++ b/certbot/certbot/plugins/dns_common.py @@ -21,11 +21,11 @@ logger = logging.getLogger(__name__) @zope.interface.implementer(interfaces.IAuthenticator) @zope.interface.provider(interfaces.IPluginFactory) -class DNSAuthenticator(common.Plugin): +class DNSAuthenticator2(common.Plugin): """Base class for DNS Authenticators""" def __init__(self, config, name): - super(DNSAuthenticator, self).__init__(config, name) + super(DNSAuthenticator2, self).__init__(config, name) self._attempt_cleanup = False diff --git a/certbot/tests/plugins/dns_common_test.py b/certbot/tests/plugins/dns_common_test.py index 993f3b461..83a6a3ab8 100644 --- a/certbot/tests/plugins/dns_common_test.py +++ b/certbot/tests/plugins/dns_common_test.py @@ -21,7 +21,7 @@ from certbot.tests import util as test_util class DNSAuthenticatorTest(test_util.TempDirTestCase, dns_test_common.BaseAuthenticatorTest): # pylint: disable=protected-access - class _FakeDNSAuthenticator(dns_common.DNSAuthenticator): + class _FakeDNSAuthenticator(dns_common.DNSAuthenticator2): _setup_credentials = mock.MagicMock() _perform = mock.MagicMock() _cleanup = mock.MagicMock()