Merge pull request #63 from maxmind/andy/travis-runs-snyk

Travis runs snyk

Author: oschwald

.travis.yml

@@ -32,16 +32,18 @@ before_install:
   - sudo ldconfig
   - cd ..
   - pip install -e git+https://github.com/maxmind/MaxMind-DB-Reader-python#egg=maxminddb
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then sudo apt-get install -y nodejs; npm install -g snyk; fi"
 install:
   - pip install -r requirements.txt
   - pip install requests_mock pylint coveralls yapf
-  - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install ipaddr; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then snyk test --org=maxmind; fi"
 script:
   - coverage run --source=geoip2 setup.py test
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then ./.travis-pylint.sh; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then ./.travis-yapf.sh; fi"
 after_success:
   - coveralls
+  - "if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' && $TRAVIS_PYTHON_VERSION == '3.7' ]]; then snyk monitor --org=maxmind --project=maxmind/GeoIP2-python; fi"
 notifications:
   email:
     on_failure: always
@@ -51,3 +53,7 @@ notifications:
   slack:
     rooms:
       secure: "FZLn7HZnM6GOtIU7+W6tY6zd2y0K4C1ZgIOAiGscWvJydn+Xr63GCT21EPPe9QCulQHz88CWALMD7ZrDdsh6nV0gx0IeE+wq4w7NZYjLokvxs+UMYwuwl57MMrqd7e4byZDC4BLvTQTCvpOHOd8dCHwDXmuBcuyE8zB+Wkndn0I=\n"
+
+env:
+  global:
+    secure: "YUqALSGB89cWyKNiBKIZDxdWPl3xjYjkWx2OP1i53W5qcaKgOWco2jv+2iXTPAk3c5x3Py3J7B1SdiNcRWmjfKqrnE47fZYkiP8rk0c/pVMRw0zURpmtRzSReDF0Sh/1ZTODi2rsU52Ei1f++BTEB5m409RMnTEvQtH7XT2sVDk="

geoip2/records.py

@@ -50,8 +50,8 @@ def __init__(self, locales=None, **kwargs):
     def name(self):
         """Dict with locale codes as keys and localized name as value."""
         # pylint:disable=E1101
-        return next((self.names.get(x) for x in self._locales
-                     if x in self.names), None)
+        return next((self.names.get(x)
+                     for x in self._locales if x in self.names), None)
 
 
 class City(PlaceRecord):

tests/models_test.py

@@ -56,20 +56,23 @@ def test_insights_full(self):
                 'code': '55401',
                 'confidence': 33,
             },
-            'subdivisions': [{
-                'confidence': 88,
-                'geoname_id': 574635,
-                'iso_code': 'MN',
-                'names': {
-                    'en': 'Minnesota'
+            'subdivisions': [
+                {
+                    'confidence': 88,
+                    'geoname_id': 574635,
+                    'iso_code': 'MN',
+                    'names': {
+                        'en': 'Minnesota'
+                    },
                 },
-            }, {
-                'geoname_id': 123,
-                'iso_code': 'HP',
-                'names': {
-                    'en': 'Hennepin'
+                {
+                    'geoname_id': 123,
+                    'iso_code': 'HP',
+                    'names': {
+                        'en': 'Hennepin'
+                    },
                 },
-            }],
+            ],
             'registered_country': {
                 'geoname_id': 2,
                 'iso_code': 'CA',