From efdb83aa8c2be60169491f3faff920205c628ea5 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 2 Mar 2018 14:42:18 -0800 Subject: [PATCH] break lockstep between packages --- certbot-apache/setup.py | 4 ++-- certbot-dns-cloudflare/setup.py | 4 ++-- certbot-dns-cloudxns/setup.py | 4 ++-- certbot-dns-digitalocean/setup.py | 4 ++-- certbot-dns-dnsimple/setup.py | 4 ++-- certbot-dns-dnsmadeeasy/setup.py | 4 ++-- certbot-dns-google/setup.py | 4 ++-- certbot-dns-luadns/setup.py | 4 ++-- certbot-dns-nsone/setup.py | 4 ++-- certbot-dns-rfc2136/setup.py | 4 ++-- certbot-dns-route53/setup.py | 4 ++-- certbot-nginx/setup.py | 7 +++++-- setup.py | 2 +- 13 files changed, 28 insertions(+), 25 deletions(-) diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py index 336233bd4..99555a753 100644 --- a/certbot-apache/setup.py +++ b/certbot-apache/setup.py @@ -8,8 +8,8 @@ version = '0.22.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + 'acme>=0.21.1', + 'certbot>=0.21.1', 'mock', 'python-augeas', 'setuptools', diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py index e5687a9f5..2ad4d357c 100644 --- a/certbot-dns-cloudflare/setup.py +++ b/certbot-dns-cloudflare/setup.py @@ -8,8 +8,8 @@ version = '0.22.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + 'acme>=0.21.1', + 'certbot>=0.21.1', 'cloudflare>=1.5.1', 'mock', 'setuptools', diff --git a/certbot-dns-cloudxns/setup.py b/certbot-dns-cloudxns/setup.py index 0ef31a90c..39c992edb 100644 --- a/certbot-dns-cloudxns/setup.py +++ b/certbot-dns-cloudxns/setup.py @@ -8,8 +8,8 @@ version = '0.22.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + 'acme>=0.21.1', + 'certbot>=0.21.1', 'dns-lexicon', 'mock', 'setuptools', diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py index 11c2aea24..42327aa88 100644 --- a/certbot-dns-digitalocean/setup.py +++ b/certbot-dns-digitalocean/setup.py @@ -8,8 +8,8 @@ version = '0.22.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + 'acme>=0.21.1', + 'certbot>=0.21.1', 'mock', 'python-digitalocean>=1.11', 'setuptools', diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py index 414a058fa..dad3a1f07 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -8,8 +8,8 @@ version = '0.22.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + 'acme>=0.21.1', + 'certbot>=0.21.1', 'dns-lexicon', 'mock', 'setuptools', diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py index 18d773347..e02439c4a 100644 --- a/certbot-dns-dnsmadeeasy/setup.py +++ b/certbot-dns-dnsmadeeasy/setup.py @@ -8,8 +8,8 @@ version = '0.22.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + 'acme>=0.21.1', + 'certbot>=0.21.1', 'dns-lexicon', 'mock', 'setuptools', diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py index d5def1bf9..7bacf64e6 100644 --- a/certbot-dns-google/setup.py +++ b/certbot-dns-google/setup.py @@ -8,8 +8,8 @@ version = '0.22.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + 'acme>=0.21.1', + 'certbot>=0.21.1', # 1.5 is the first version that supports oauth2client>=2.0 'google-api-python-client>=1.5', 'mock', diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py index 13fa742d5..a1b64bb84 100644 --- a/certbot-dns-luadns/setup.py +++ b/certbot-dns-luadns/setup.py @@ -8,8 +8,8 @@ version = '0.22.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + 'acme>=0.21.1', + 'certbot>=0.21.1', 'dns-lexicon', 'mock', 'setuptools', diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py index 01c9579c1..d48169d40 100644 --- a/certbot-dns-nsone/setup.py +++ b/certbot-dns-nsone/setup.py @@ -8,8 +8,8 @@ version = '0.22.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + 'acme>=0.21.1', + 'certbot>=0.21.1', 'dns-lexicon', 'mock', 'setuptools', diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py index 64b126595..2655d82be 100644 --- a/certbot-dns-rfc2136/setup.py +++ b/certbot-dns-rfc2136/setup.py @@ -8,8 +8,8 @@ version = '0.22.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + 'acme>=0.21.1', + 'certbot>=0.21.1', 'dnspython', 'mock', 'setuptools', diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py index e45343f79..5ebd16929 100644 --- a/certbot-dns-route53/setup.py +++ b/certbot-dns-route53/setup.py @@ -6,8 +6,8 @@ from setuptools import find_packages version = '0.22.0.dev0' install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + 'acme>=0.21.1', + 'certbot>=0.21.1', 'boto3', 'mock', 'setuptools', diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py index 96f8b834d..af44a017a 100644 --- a/certbot-nginx/setup.py +++ b/certbot-nginx/setup.py @@ -8,8 +8,11 @@ version = '0.22.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ - 'acme=={0}'.format(version), - 'certbot=={0}'.format(version), + # This plugin works with an older version of acme, but Certbot does not. + # 0.22.0 is specified here to work around + # https://github.com/pypa/pip/issues/988. + 'acme>=0.22.0', + 'certbot>=0.22.0', 'mock', 'PyOpenSSL', 'pyparsing>=1.5.5', # Python3 support; perhaps unnecessary? diff --git a/setup.py b/setup.py index 9ac1a7ee7..56eebbe75 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ version = meta['version'] # specified here to avoid masking the more specific request requirements in # acme. See https://github.com/pypa/pip/issues/988 for more info. install_requires = [ - 'acme=={0}'.format(version), + 'acme>=0.22.0', # We technically need ConfigArgParse 0.10.0 for Python 2.6 support, but # saying so here causes a runtime error against our temporary fork of 0.9.3 # in which we added 2.6 support (see #2243), so we relax the requirement.