Merge pull request #59 from maxmind/greg/fix-travis

Fix Travis builds and add 3.7 to Travis

Author: rafl

.travis-pylint.sh

@@ -1,3 +1,6 @@
-#!/bin/sh
+#!/bin/bash
+
+set -eux
+
 python setup.py install
 pylint geoip2

.travis-yapf.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eux
+
 diff=$(yapf -rd geoip2 tests)
 
 if [[ $? != 0 ]]; then

.travis.yml

@@ -1,14 +1,23 @@
 ---
 language: python
-python:
-  - '2.7'
-  - '3.3'
-  - '3.4'
-  - '3.5'
-  - '3.6'
-  - nightly
-  - pypy
 matrix:
+  include:
+    - python: 2.7
+      dist: trusty
+    - python: 3.3
+      dist: trusty
+    - python: 3.4
+      dist: trusty
+    - python: 3.5
+      dist: trusty
+    - python: 3.6
+      dist: trusty
+    - python: 3.7
+      dist: xenial
+    - python: nightly
+      dist: xenial
+    - python: pypy
+      dist: trusty
   allow_failures:
     - python: nightly
 
@@ -25,12 +34,12 @@ before_install:
   - pip install -e git+https://github.com/maxmind/MaxMind-DB-Reader-python#egg=maxminddb
 install:
   - pip install -r requirements.txt
-  - pip install requests_mock pylint coveralls
+  - pip install requests_mock pylint coveralls yapf
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install ipaddr; fi"
 script:
   - coverage run --source=geoip2 setup.py test
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then ./.travis-pylint.sh; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then ./.travis-yapf.sh; fi"
+  - "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
 notifications:

geoip2/database.py

@@ -16,7 +16,7 @@
 import geoip2.errors
 
 
-class Reader(object):
+class Reader:
     """GeoIP2 database Reader object.
 
     Instances of this class provide a reader for the GeoIP2 database format.
@@ -182,9 +182,9 @@ def isp(self, ip_address):
     def _get(self, database_type, ip_address):
         if database_type not in self.metadata().database_type:
             caller = inspect.stack()[2][3]
-            raise TypeError("The %s method cannot be used with the "
-                            "%s database" % (caller,
-                                             self.metadata().database_type))
+            raise TypeError(
+                "The %s method cannot be used with the "
+                "%s database" % (caller, self.metadata().database_type))
         record = self._db_reader.get(ip_address)
         if record is None:
             raise geoip2.errors.AddressNotFoundError(

geoip2/mixins.py

@@ -3,7 +3,7 @@
 from abc import ABCMeta
 
 
-class SimpleEquality(object):
+class SimpleEquality:
     """Naive __dict__ equality mixin"""
 
     __metaclass__ = ABCMeta

geoip2/webservice.py

@@ -39,7 +39,7 @@
                      PermissionRequiredError)
 
 
-class Client(object):
+class Client:
     """Creates a new client object.
 
     It accepts the following required arguments:
@@ -176,10 +176,10 @@ def _handle_success(self, response, uri):
         try:
             return response.json()
         except ValueError as ex:
-            raise GeoIP2Error('Received a 200 response for %(uri)s'
-                              ' but could not decode the response as '
-                              'JSON: ' % locals() + ', '.join(ex.args), 200,
-                              uri)
+            raise GeoIP2Error(
+                'Received a 200 response for %(uri)s'
+                ' but could not decode the response as '
+                'JSON: ' % locals() + ', '.join(ex.args), 200, uri)
 
     def _exception_for_error(self, response, uri):
         status = response.status_code
@@ -192,25 +192,27 @@ def _exception_for_error(self, response, uri):
 
     def _exception_for_4xx_status(self, response, status, uri):
         if not response.content:
-            return HTTPError('Received a %(status)i error for %(uri)s '
-                             'with no body.' % locals(), status, uri)
+            return HTTPError(
+                'Received a %(status)i error for %(uri)s '
+                'with no body.' % locals(), status, uri)
         elif response.headers['Content-Type'].find('json') == -1:
-            return HTTPError('Received a %i for %s with the following '
-                             'body: %s' % (status, uri, response.content),
-                             status, uri)
+            return HTTPError(
+                'Received a %i for %s with the following '
+                'body: %s' % (status, uri, response.content), status, uri)
         try:
             body = response.json()
         except ValueError as ex:
             return HTTPError(
                 'Received a %(status)i error for %(uri)s but it did'
-                ' not include the expected JSON body: ' % locals() +
-                ', '.join(ex.args), status, uri)
+                ' not include the expected JSON body: ' % locals() + ', '.join(
+                    ex.args), status, uri)
         else:
             if 'code' in body and 'error' in body:
                 return self._exception_for_web_service_error(
                     body.get('error'), body.get('code'), status, uri)
-            return HTTPError('Response contains JSON but it does not specify '
-                             'code or error keys', status, uri)
+            return HTTPError(
+                'Response contains JSON but it does not specify '
+                'code or error keys', status, uri)
 
     def _exception_for_web_service_error(self, message, code, status, uri):
         if code in ('IP_ADDRESS_NOT_FOUND', 'IP_ADDRESS_RESERVED'):
@@ -227,9 +229,11 @@ def _exception_for_web_service_error(self, message, code, status, uri):
         return InvalidRequestError(message, code, status, uri)
 
     def _exception_for_5xx_status(self, status, uri):
-        return HTTPError('Received a server error (%(status)i) for '
-                         '%(uri)s' % locals(), status, uri)
+        return HTTPError(
+            'Received a server error (%(status)i) for '
+            '%(uri)s' % locals(), status, uri)
 
     def _exception_for_non_200_status(self, status, uri):
-        return HTTPError('Received a very surprising HTTP status '
-                         '(%(status)i) for %(uri)s' % locals(), status, uri)
+        return HTTPError(
+            'Received a very surprising HTTP status '
+            '(%(status)i) for %(uri)s' % locals(), status, uri)

pylintrc

@@ -1,5 +1,5 @@
 [MESSAGES CONTROL]
-disable=R0201,W0105
+disable=R0201,R1705,W0105
 
 [BASIC]
 

tests/database_test.py

@@ -37,27 +37,28 @@ def test_language_list(self):
     def test_unknown_address(self):
         reader = geoip2.database.Reader(
             'tests/data/test-data/GeoIP2-City-Test.mmdb')
-        with self.assertRaisesRegex(geoip2.errors.AddressNotFoundError,
-                                    'The address 10.10.10.10 is not in the '
-                                    'database.'):
+        with self.assertRaisesRegex(
+                geoip2.errors.AddressNotFoundError,
+                'The address 10.10.10.10 is not in the '
+                'database.'):
             reader.city('10.10.10.10')
         reader.close()
 
     def test_wrong_database(self):
         reader = geoip2.database.Reader(
             'tests/data/test-data/GeoIP2-City-Test.mmdb')
-        with self.assertRaisesRegex(TypeError,
-                                    'The country method cannot be used with '
-                                    'the GeoIP2-City database'):
+        with self.assertRaisesRegex(
+                TypeError, 'The country method cannot be used with '
+                'the GeoIP2-City database'):
             reader.country('1.1.1.1')
         reader.close()
 
     def test_invalid_address(self):
         reader = geoip2.database.Reader(
             'tests/data/test-data/GeoIP2-City-Test.mmdb')
-        with self.assertRaisesRegex(ValueError,
-                                    "u?'invalid' does not appear to be an "
-                                    "IPv4 or IPv6 address"):
+        with self.assertRaisesRegex(
+                ValueError, "u?'invalid' does not appear to be an "
+                "IPv4 or IPv6 address"):
             reader.city('invalid')
         reader.close()
 

tests/models_test.py

@@ -366,9 +366,10 @@ def test_three_locales(self):
 
     def test_two_locales(self):
         model = geoip2.models.Country(self.raw, locales=['ak', 'fr'])
-        self.assertEqual(model.continent.name, None,
-                         'continent name is undef (no Akan or French '
-                         'available)')
+        self.assertEqual(
+            model.continent.name, None,
+            'continent name is undef (no Akan or French '
+            'available)')
         self.assertEqual(model.country.name, 'États-Unis',
                          'country name is in French')
 

tests/webservice_test.py

@@ -120,9 +120,9 @@ def test_200_error(self, mock):
             self.client.country('1.1.1.1')
 
     def test_bad_ip_address(self):
-        with self.assertRaisesRegex(ValueError,
-                                    "'1.2.3' does not appear to be an IPv4 "
-                                    "or IPv6 address"):
+        with self.assertRaisesRegex(
+                ValueError, "'1.2.3' does not appear to be an IPv4 "
+                "or IPv6 address"):
             self.client.country('1.2.3')
 
     @requests_mock.mock()
@@ -143,9 +143,9 @@ def test_weird_body_error(self, mock):
             text='{"wierd": 42}',
             status_code=400,
             headers={'Content-Type': self._content_type('country')})
-        with self.assertRaisesRegex(HTTPError,
-                                    'Response contains JSON but it does not '
-                                    'specify code or error keys'):
+        with self.assertRaisesRegex(
+                HTTPError, 'Response contains JSON but it does not '
+                'specify code or error keys'):
             self.client.country('1.2.3.8')
 
     @requests_mock.mock()
@@ -172,9 +172,9 @@ def test_300_error(self, mock):
             self.base_uri + 'country/' + '1.2.3.11',
             status_code=300,
             headers={'Content-Type': self._content_type('country')})
-        with self.assertRaisesRegex(HTTPError,
-                                    'Received a very surprising HTTP status '
-                                    '\(300\) for'):
+        with self.assertRaisesRegex(
+                HTTPError, 'Received a very surprising HTTP status '
+                '\(300\) for'):
 
             self.client.country('1.2.3.11')