From da5381de1b546f9575770c536a37d3c75306dade Mon Sep 17 00:00:00 2001
From: Gregory Oschwald <goschwald@maxmind.com>
Date: Thu, 12 Dec 2019 07:16:03 -0800
Subject: [PATCH 1/2] Require older yapf

With 0.29.0, we ran into https://github.com/google/yapf/issues/781,
which made pylint unhappy and makes the arg list harder to read.
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 81df5e00..6a64943b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,9 @@ before_install:
   - "if [[ $RUN_SNYK && $SNYK_TOKEN ]]; 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
+  # We require yapf 0.28.0 to work around https://github.com/google/yapf/issues/781
+  # If that issue is resolved, we should remove the version constraint.
+  - pip install requests_mock pylint coveralls yapf==0.28.0
   - "if [[ $RUN_SNYK && $SNYK_TOKEN ]]; then snyk test --org=maxmind; fi"
 script:
   - coverage run --source=geoip2 setup.py test

From 84f0e30046dcaba7af0ee858055c774b346fd0fe Mon Sep 17 00:00:00 2001
From: Gregory Oschwald <goschwald@maxmind.com>
Date: Thu, 12 Dec 2019 07:17:52 -0800
Subject: [PATCH 2/2] Test on Python 3.8

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6a64943b..fc60124b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ matrix:
       dist: trusty
     - python: 3.7
       dist: xenial
+    - python: 3.8
+      dist: xenial
       env:
         - RUN_SNYK=1
         - RUN_LINTER=1