From 65d31f1ede0ab7bb4da41a5c7a3fcdf0a0a618eb Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Thu, 18 Apr 2019 07:04:47 +0200
Subject: [PATCH 1/7] Travis CI: Add Python 3.7 and remove 3.4

Python 3.4 is End of Life: https://devguide.python.org/devcycle/#end-of-life-branches

[Travis are now recommending removing the __sudo__ tag](https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration).

"_If you currently specify __sudo: false__ in your __.travis.yml__, we recommend removing that configuration_"
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a694dc70..7bc92928 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,13 @@
+dust: xenial  # required for Python >= 3.7
 language: python
 python:
   - "pypy"
+  - “pypy3”
+  - “3.7”
   - "3.6"
   - "3.5"
-  - "3.4"
   - "2.7"
 
-sudo: false
-
 cache: pip
 
 env:

From e9cb0e95966d0b7184d9ad729eb8f282c811389a Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Thu, 18 Apr 2019 07:06:04 +0200
Subject: [PATCH 2/7] Update .travis.yml

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

diff --git a/.travis.yml b/.travis.yml
index 7bc92928..175073eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dust: xenial  # required for Python >= 3.7
+dist: xenial  # required for Python >= 3.7
 language: python
 python:
   - "pypy"

From 731db3f78928fa09aecccb49041ec77e54007fa6 Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Thu, 18 Apr 2019 07:40:31 +0200
Subject: [PATCH 3/7] matrix * 2?

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

diff --git a/.travis.yml b/.travis.yml
index 175073eb..7dd7a045 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ dist: xenial  # required for Python >= 3.7
 language: python
 python:
   - "pypy"
-  - “pypy3”
-  - “3.7”
+  - "pypy3"
+  - "3.7"
   - "3.6"
   - "3.5"
   - "2.7"
@@ -18,6 +18,11 @@ env:
     - TOXENV=base
     - TOXENV=six19-optional
 
+matrix:
+  include:
+    - python: pypy
+      dist: trusty
+
 install:
   - pip install tox codecov
 

From 4acc25a2cee8e59b47228e44e266c2ad9ae8cbcd Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Thu, 18 Apr 2019 08:11:22 +0200
Subject: [PATCH 4/7] Put Python 3.7 in second matrix

---
 .travis.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7dd7a045..f08a160e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,7 @@
-dist: xenial  # required for Python >= 3.7
 language: python
 python:
-  - "pypy"
   - "pypy3"
-  - "3.7"
+  - "pypy"
   - "3.6"
   - "3.5"
   - "2.7"
@@ -20,8 +18,15 @@ env:
 
 matrix:
   include:
-    - python: pypy
-      dist: trusty
+    - python: "3.7"
+      dist: xenial  # required for Python >= 3.7
+      TOXENV=optional
+    - python: "3.7"
+      dist: xenial  # required for Python >= 3.7
+      TOXENV=base
+    - python: "3.7"
+      dist: xenial  # required for Python >= 3.7
+      TOXENV=six19-optional
 
 install:
   - pip install tox codecov

From e8a3efc393200078d9bf69b19e32282d2d0b8cef Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Thu, 18 Apr 2019 08:18:12 +0200
Subject: [PATCH 5/7] Install datrie only if on CPython > 3.7

https://github.com/pytries/datrie/issues/52 although ___closed___ is not yet released to https://pypi.org/project/datrie
---
 requirements-optional.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/requirements-optional.txt b/requirements-optional.txt
index c00fd242..d8be39ff 100644
--- a/requirements-optional.txt
+++ b/requirements-optional.txt
@@ -14,4 +14,6 @@ lxml ; platform_python_implementation == 'CPython'
 
 # DATrie can be used in place of our Python trie implementation for
 # slightly better parsing performance.
-datrie ; platform_python_implementation == 'CPython'
+# https://github.com/pytries/datrie/issues/52 although closed is not
+# yet released to https://pypi.org/project/datrie
+datrie ; platform_python_implementation == 'CPython' and python_version < '3.7'

From 8be54922a1fc4475dc8b045f1129f56e6d421309 Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Thu, 18 Apr 2019 08:21:44 +0200
Subject: [PATCH 6/7] env:

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f08a160e..3d87fe5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,13 +20,13 @@ matrix:
   include:
     - python: "3.7"
       dist: xenial  # required for Python >= 3.7
-      TOXENV=optional
+      env: TOXENV=optional
     - python: "3.7"
       dist: xenial  # required for Python >= 3.7
-      TOXENV=base
+      env: TOXENV=base
     - python: "3.7"
       dist: xenial  # required for Python >= 3.7
-      TOXENV=six19-optional
+      env: TOXENV=six19-optional
 
 install:
   - pip install tox codecov

From af919afd8cedef1a84763ec5aab593da8609f67c Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Thu, 18 Apr 2019 14:16:52 +0200
Subject: [PATCH 7/7] Reverting the removal of Python 3.4

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

diff --git a/.travis.yml b/.travis.yml
index 3d87fe5f..b1e04fad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - "pypy"
   - "3.6"
   - "3.5"
+  - "3.4"
   - "2.7"
 
 cache: pip