From 429b447238ad1155d99b7f2123a0f1e8cf018613 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 27 Dec 2017 10:20:01 -0800 Subject: [PATCH 1/3] Route53's NAPTR values should default to '' not None --- octodns/provider/route53.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/octodns/provider/route53.py b/octodns/provider/route53.py index 7623648..5bda074 100644 --- a/octodns/provider/route53.py +++ b/octodns/provider/route53.py @@ -385,10 +385,10 @@ class Route53Provider(BaseProvider): values.append({ 'order': order, 'preference': preference, - 'flags': flags if flags else None, - 'service': service if service else None, - 'regexp': regexp if regexp else None, - 'replacement': replacement if replacement else None, + 'flags': flags, + 'service': service, + 'regexp': regexp, + 'replacement': replacement, }) return { 'type': rrset['Type'], From 5c94407893099098144d0c1487158ccd964ac776 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Sat, 6 Jan 2018 08:58:28 -0800 Subject: [PATCH 2/3] All requirements are >=, not exact versions --- setup.cfg | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/setup.cfg b/setup.cfg index 31a0283..4686ecd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,12 +22,12 @@ classifiers = install_requires = PyYaml>=3.12 dnspython>=1.15.0 - futures==3.1.1 - incf.countryutils==1.0 - ipaddress==1.0.18 - natsort==5.0.3 - python-dateutil==2.6.1 - requests==2.13.0 + futures>=3.1.1 + incf.countryutils>=1.0 + ipaddress>=1.0.18 + natsort>=5.0.3 + python-dateutil>=2.6.1 + requests>=2.13.0 packages = find: include_package_data = True @@ -45,19 +45,19 @@ exclude = [options.extras_require] dev = - azure-mgmt-dns==1.0.1 - azure-common==1.1.6 - boto3==1.4.6 - botocore==1.6.8 - docutils==0.14 - dyn==1.8.0 - google-cloud==0.27.0 - jmespath==0.9.3 - msrestazure==0.4.10 - nsone==0.9.14 - ovh==0.4.7 - s3transfer==0.1.10 - six==1.10.0 + azure-mgmt-dns>=1.0.1 + azure-common>=1.1.6 + boto3>=1.4.6 + botocore>=1.6.8 + docutils>=0.14 + dyn>=1.8.0 + google-cloud>=0.27.0 + jmespath>=0.9.3 + msrestazure>=0.4.10 + nsone>=0.9.14 + ovh>=0.4.7 + s3transfer>=0.1.10 + six>=1.10.0 test = coverage mock From a7e32d2c87d82b342d85108ac9804727735b5e50 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Sat, 6 Jan 2018 10:13:23 -0800 Subject: [PATCH 3/3] Hard-ping azure lib versions, they have breaking changes --- setup.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 4686ecd..7f0ce13 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,15 +45,15 @@ exclude = [options.extras_require] dev = - azure-mgmt-dns>=1.0.1 - azure-common>=1.1.6 + azure-mgmt-dns==1.0.1 + azure-common==1.1.6 boto3>=1.4.6 botocore>=1.6.8 docutils>=0.14 dyn>=1.8.0 google-cloud>=0.27.0 jmespath>=0.9.3 - msrestazure>=0.4.10 + msrestazure==0.4.10 nsone>=0.9.14 ovh>=0.4.7 s3transfer>=0.1.10