Merge remote-tracking branch 'origin/master' into python3-start

README.md

@@ -182,7 +182,7 @@ The above command pulled the existing data out of Route53 and placed the results
 | [EtcHostsProvider](/octodns/provider/etc_hosts.py) | | A, AAAA, ALIAS, CNAME | No | |
 | [GoogleCloudProvider](/octodns/provider/googlecloud.py) | google-cloud-dns | A, AAAA, CAA, CNAME, MX, NAPTR, NS, PTR, SPF, SRV, TXT  | No | |
 | [MythicBeastsProvider](/octodns/provider/mythicbeasts.py) | Mythic Beasts | A, AAAA, ALIAS, CNAME, MX, NS, SRV, SSHFP, CAA, TXT | No | |
-| [Ns1Provider](/octodns/provider/ns1.py) | nsone | All | Partial Geo | No health checking for GeoDNS |
+| [Ns1Provider](/octodns/provider/ns1.py) | ns1-python | All | Partial Geo | No health checking for GeoDNS |
 | [OVH](/octodns/provider/ovh.py) | ovh | A, AAAA, CNAME, MX, NAPTR, NS, PTR, SPF, SRV, SSHFP, TXT, DKIM | No | |
 | [PowerDnsProvider](/octodns/provider/powerdns.py) | | All | No | |
 | [Rackspace](/octodns/provider/rackspace.py) | | A, AAAA, ALIAS, CNAME, MX, NS, PTR, SPF, TXT | No |  |

octodns/provider/ns1.py

@@ -8,8 +8,8 @@ from __future__ import absolute_import, division, print_function, \
 from logging import getLogger
 from itertools import chain
 from collections import OrderedDict, defaultdict
-from nsone import NSONE
-from nsone.rest.errors import RateLimitException, ResourceException
+from ns1 import NS1
+from ns1.rest.errors import RateLimitException, ResourceException
 from pycountry_convert import country_alpha2_to_continent_code
 from time import sleep
 
@@ -38,7 +38,7 @@ class Ns1Provider(BaseProvider):
         self.log = getLogger('Ns1Provider[{}]'.format(id))
         self.log.debug('__init__: id=%s, api_key=***', id)
         super(Ns1Provider, self).__init__(id, *args, **kwargs)
-        self._client = NSONE(apiKey=api_key)
+        self._client = NS1(apiKey=api_key)
 
     def _data_for_A(self, _type, record):
         # record meta (which would include geo information is only

requirements.txt

@@ -14,7 +14,7 @@ ipaddress==1.0.22
 jmespath==0.9.3
 msrestazure==0.6.2
 natsort==5.5.0
-nsone==0.9.100
+ns1-python==0.12.0
 ovh==0.4.8
 python-dateutil==2.6.1
 requests==2.22.0

tests/test_octodns_provider_ns1.py

@@ -7,7 +7,7 @@ from __future__ import absolute_import, division, print_function, \
 
 from collections import defaultdict
 from mock import Mock, call, patch
-from nsone.rest.errors import AuthException, RateLimitException, \
+from ns1.rest.errors import AuthException, RateLimitException, \
     ResourceException
 from unittest import TestCase
 
@@ -172,7 +172,7 @@ class TestNs1Provider(TestCase):
         'domain': 'unit.tests.',
     }]
 
-    @patch('nsone.NSONE.loadZone')
+    @patch('ns1.NS1.loadZone')
     def test_populate(self, load_mock):
         provider = Ns1Provider('test', 'api-key')
 
@@ -291,8 +291,8 @@ class TestNs1Provider(TestCase):
         self.assertEquals(self.expected, zone.records)
         self.assertEquals(('unit.tests',), load_mock.call_args[0])
 
-    @patch('nsone.NSONE.createZone')
-    @patch('nsone.NSONE.loadZone')
+    @patch('ns1.NS1.createZone')
+    @patch('ns1.NS1.loadZone')
     def test_sync(self, load_mock, create_mock):
         provider = Ns1Provider('test', 'api-key')