Merge branch 'master' into dependabot/pip/jmespath-0.10.0

CONTRIBUTING.md

@@ -11,12 +11,13 @@ If you have questions, or you'd like to check with us before embarking on a majo
 This project uses the [GitHub Flow](https://guides.github.com/introduction/flow/). That means that the `master` branch is stable and new development is done in feature branches. Feature branches are merged into the `master` branch via a Pull Request.
 
 0. Fork and clone the repository
-0. Configure and install the dependencies: `script/bootstrap`
-0. Make sure the tests pass on your machine: `script/test`
+0. Configure and install the dependencies: `./script/bootstrap`
+0. Activate virtual environment: `source env/bin/activate`
+0. Make sure the tests pass on your machine: `./script/test`
 0. Create a new branch: `git checkout -b my-branch-name`
 0. Make your change, add tests, and make sure the tests still pass
 0. Make sure that `./script/lint` passes without any warnings
-0. Make sure that coverage is at :100:% `script/coverage` and open `htmlcov/index.html`
+0. Make sure that coverage is at :100:% `./script/coverage` and open `htmlcov/index.html`
    * You can open PRs for :eyes: & discussion prior to this
 0. Push to your fork and submit a pull request
 

octodns/record/geo.py

@@ -63,9 +63,15 @@ class GeoCodes(object):
 
     @classmethod
     def province_to_code(cls, province):
-        # We get to cheat on this one since we only support provinces in NA-US
-        if province not in geo_data['NA']['US']['provinces']:
+        # We cheat on this one a little since we only support provinces in
+        # NA-US, NA-CA
+        if (province not in geo_data['NA']['US']['provinces'] and
+                province not in geo_data['NA']['CA']['provinces']):
             cls.log.warn('country_to_code: unrecognized province "%s"',
                          province)
             return
-        return 'NA-US-{}'.format(province)
+        if province in geo_data['NA']['US']['provinces']:
+            country = 'US'
+        if province in geo_data['NA']['CA']['provinces']:
+            country = 'CA'
+        return 'NA-{}-{}'.format(country, province)

octodns/record/geo_data.py

@@ -55,7 +55,7 @@ geo_data = \
             'SO': {'name': 'Somalia'},
             'SS': {'name': 'South Sudan'},
             'ST': {'name': 'Sao Tome and Principe'},
-            'SZ': {'name': 'Swaziland'},
+            'SZ': {'name': 'Eswatini'},
             'TD': {'name': 'Chad'},
             'TG': {'name': 'Togo'},
             'TN': {'name': 'Tunisia'},
@@ -157,7 +157,7 @@ geo_data = \
             'MC': {'name': 'Monaco'},
             'MD': {'name': 'Moldova, Republic of'},
             'ME': {'name': 'Montenegro'},
-            'MK': {'name': 'Macedonia, Republic of'},
+            'MK': {'name': 'North Macedonia'},
             'MT': {'name': 'Malta'},
             'NL': {'name': 'Netherlands'},
             'NO': {'name': 'Norway'},
@@ -183,7 +183,20 @@ geo_data = \
             'BQ': {'name': 'Bonaire, Sint Eustatius and Saba'},
             'BS': {'name': 'Bahamas'},
             'BZ': {'name': 'Belize'},
-            'CA': {'name': 'Canada'},
+            'CA': {'name': 'Canada',
+                   'provinces': {'AB': {'name': 'Alberta'},
+                                 'BC': {'name': 'British Columbia'},
+                                 'MB': {'name': 'Manitoba'},
+                                 'NB': {'name': 'New Brunswick'},
+                                 'NL': {'name': 'Newfoundland and Labrador'},
+                                 'NS': {'name': 'Nova Scotia'},
+                                 'NT': {'name': 'Northwest Territories'},
+                                 'NU': {'name': 'Nunavut'},
+                                 'ON': {'name': 'Ontario'},
+                                 'PE': {'name': 'Prince Edward Island'},
+                                 'QC': {'name': 'Quebec'},
+                                 'SK': {'name': 'Saskatchewan'},
+                                 'YT': {'name': 'Yukon Territory'}}},
             'CR': {'name': 'Costa Rica'},
             'CU': {'name': 'Cuba'},
             'CW': {'name': 'Curaçao'},

script/generate-geo-data

@@ -8,8 +8,8 @@ from pycountry_convert import country_alpha2_to_continent_code
 
 subs = defaultdict(dict)
 for subdivision in subdivisions:
-    # Route53 only supports US states, Dyn supports US states and CA provinces, but for now we'll just do US
-    if subdivision.country_code not in ('US'):
+    # Route53 only supports US states, Dyn (and others) support US states and CA provinces
+    if subdivision.country_code not in ('US', 'CA'):
         continue
     subs[subdivision.country_code][subdivision.code[3:]] = {
         'name': subdivision.name

tests/test_octodns_record_geo.py

@@ -77,4 +77,6 @@ class TestRecordGeoCodes(TestCase):
     def test_province_to_code(self):
         self.assertEquals('NA-US-OR', GeoCodes.province_to_code('OR'))
         self.assertEquals('NA-US-KY', GeoCodes.province_to_code('KY'))
+        self.assertEquals('NA-CA-AB', GeoCodes.province_to_code('AB'))
+        self.assertEquals('NA-CA-BC', GeoCodes.province_to_code('BC'))
         self.assertFalse(GeoCodes.province_to_code('XX'))