From f35889af74c8862774752cc68abaccac951c131a Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Fri, 11 Jun 2021 13:54:52 -0700 Subject: [PATCH] bump min dns-lexicon dependency --- certbot-dns-cloudxns/setup.py | 2 +- certbot-dns-dnsimple/setup.py | 15 +++------------ certbot-dns-dnsmadeeasy/setup.py | 2 +- certbot-dns-gehirn/setup.py | 2 +- certbot-dns-linode/setup.py | 2 +- certbot-dns-luadns/setup.py | 2 +- certbot-dns-nsone/setup.py | 2 +- certbot-dns-ovh/setup.py | 2 +- certbot-dns-sakuracloud/setup.py | 2 +- tools/pinning/oldest/pyproject.toml | 2 +- 10 files changed, 12 insertions(+), 21 deletions(-) diff --git a/certbot-dns-cloudxns/setup.py b/certbot-dns-cloudxns/setup.py index da667657a..bf9639c0a 100644 --- a/certbot-dns-cloudxns/setup.py +++ b/certbot-dns-cloudxns/setup.py @@ -7,7 +7,7 @@ from setuptools import setup version = '1.17.0.dev0' install_requires = [ - 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name + 'dns-lexicon>=3.2.1', 'setuptools>=39.0.1', 'zope.interface', ] diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py index 5a1b13f44..300e08715 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -7,6 +7,9 @@ from setuptools import setup version = '1.17.0.dev0' install_requires = [ + # This version of lexicon is required to address the problem described in + # https://github.com/AnalogJ/lexicon/issues/387. + 'dns-lexicon>=3.2.1', 'setuptools>=39.0.1', 'zope.interface', ] @@ -25,18 +28,6 @@ elif 'bdist_wheel' in sys.argv[1:]: if os.environ.get('SNAP_BUILD'): install_requires.append('packaging') -# This package normally depends on dns-lexicon>=3.2.1 to address the -# problem described in https://github.com/AnalogJ/lexicon/issues/387, -# however, the fix there has been backported to older versions of -# lexicon found in various Linux distros. This conditional helps us test -# that we've maintained compatibility with these versions of lexicon -# which allows us to potentially upgrade our packages in these distros -# as necessary. -if os.environ.get('CERTBOT_OLDEST') == '1': - install_requires.append('dns-lexicon>=3.1.0') # Changed parameter name -else: - install_requires.append('dns-lexicon>=3.2.1') - docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py index e0ff95a3b..2b38da442 100644 --- a/certbot-dns-dnsmadeeasy/setup.py +++ b/certbot-dns-dnsmadeeasy/setup.py @@ -7,7 +7,7 @@ from setuptools import setup version = '1.17.0.dev0' install_requires = [ - 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name + 'dns-lexicon>=3.2.1', 'setuptools>=39.0.1', 'zope.interface', ] diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py index 997cd4cca..a8bd89bfa 100644 --- a/certbot-dns-gehirn/setup.py +++ b/certbot-dns-gehirn/setup.py @@ -7,7 +7,7 @@ from setuptools import setup version = '1.17.0.dev0' install_requires = [ - 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name + 'dns-lexicon>=3.2.1', 'setuptools>=39.0.1', 'zope.interface', ] diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py index 2c21ceecb..4b0b8adc2 100644 --- a/certbot-dns-linode/setup.py +++ b/certbot-dns-linode/setup.py @@ -7,7 +7,7 @@ from setuptools import setup version = '1.17.0.dev0' install_requires = [ - 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name + 'dns-lexicon>=3.2.1', 'setuptools>=39.0.1', 'zope.interface', ] diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py index 024b1100b..1ad8c7fda 100644 --- a/certbot-dns-luadns/setup.py +++ b/certbot-dns-luadns/setup.py @@ -7,7 +7,7 @@ from setuptools import setup version = '1.17.0.dev0' install_requires = [ - 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name + 'dns-lexicon>=3.2.1', 'setuptools>=39.0.1', 'zope.interface', ] diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py index 959c3876d..a38858500 100644 --- a/certbot-dns-nsone/setup.py +++ b/certbot-dns-nsone/setup.py @@ -7,7 +7,7 @@ from setuptools import setup version = '1.17.0.dev0' install_requires = [ - 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name + 'dns-lexicon>=3.2.1', 'setuptools>=39.0.1', 'zope.interface', ] diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py index 52dca456b..91cb7df1d 100644 --- a/certbot-dns-ovh/setup.py +++ b/certbot-dns-ovh/setup.py @@ -7,7 +7,7 @@ from setuptools import setup version = '1.17.0.dev0' install_requires = [ - 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name + 'dns-lexicon>=3.2.1', 'setuptools>=39.0.1', 'zope.interface', ] diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py index 8f98058f0..fd2cb7d45 100644 --- a/certbot-dns-sakuracloud/setup.py +++ b/certbot-dns-sakuracloud/setup.py @@ -7,7 +7,7 @@ from setuptools import setup version = '1.17.0.dev0' install_requires = [ - 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name + 'dns-lexicon>=3.2.1', 'setuptools>=39.0.1', 'zope.interface', ] diff --git a/tools/pinning/oldest/pyproject.toml b/tools/pinning/oldest/pyproject.toml index 1845c47f8..7d43d03be 100644 --- a/tools/pinning/oldest/pyproject.toml +++ b/tools/pinning/oldest/pyproject.toml @@ -110,7 +110,7 @@ parsedatetime = "2.4" # Tracking at https://github.com/certbot/certbot/issues/6473 boto3 = "1.4.7" botocore = "1.7.41" -dns-lexicon = "3.1.0" +dns-lexicon = "3.2.1" # Other dependencies # We add any dependencies that must be specified in this file for any another