From 3f553ab176cd96d6cf294d0ac9ba5f7a785c5196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sta=C5=9B=20Ma=C5=82olepszy?= <stas@mozilla.com>
Date: Mon, 28 Jan 2019 17:54:19 +0100
Subject: [PATCH 1/4] Run CI on Python 3.7, too

---
 .travis.yml            | 2 ++
 fluent.runtime/tox.ini | 2 +-
 fluent.syntax/tox.ini  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5f1d4957..7af1ad4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,11 @@
 sudo: false
+dist: xenial
 language: python
 python:
   - "2.7"
   - "3.5"
   - "3.6"
+  - "3.7"
   - "pypy"
   - "pypy3"
   - "nightly"
diff --git a/fluent.runtime/tox.ini b/fluent.runtime/tox.ini
index 960d76d9..db54f7a1 100644
--- a/fluent.runtime/tox.ini
+++ b/fluent.runtime/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, py36, pypy, pypy3
+envlist = py27, py35, py36, py37, pypy, pypy3
 skipsdist=True
 
 [testenv]
diff --git a/fluent.syntax/tox.ini b/fluent.syntax/tox.ini
index 08e5a27f..4ee7a4bf 100644
--- a/fluent.syntax/tox.ini
+++ b/fluent.syntax/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, py36, pypy, pypy3
+envlist = py27, py35, py36, py37, pypy, pypy3
 skipsdist=True
 
 [testenv]

From 55adeb1eb7dc60ded78bbf65b2943349e7b92921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sta=C5=9B=20Ma=C5=82olepszy?= <stas@mozilla.com>
Date: Mon, 28 Jan 2019 18:44:01 +0100
Subject: [PATCH 2/4] Use pypy3.5 as per
 https://docs.travis-ci.com/user/languages/python/#pypy-support

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

diff --git a/.travis.yml b/.travis.yml
index 7af1ad4f..7496939e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,7 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
-  - "pypy"
-  - "pypy3"
+  - "pypy3.5"
   - "nightly"
 env:
   - PACKAGE=fluent.syntax

From 2b417ee0c550778134a31c05ccee3657affe0bc6 Mon Sep 17 00:00:00 2001
From: Axel Hecht <axel@pike.org>
Date: Mon, 28 Jan 2019 19:38:40 +0100
Subject: [PATCH 3/4] Let's specify 6.0 of pypy

Seems that xenial defaults to a buggy version of pypy. Let's try 6.0, which is the latest release.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7496939e..f79d56dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
-  - "pypy3.5"
+  - "pypy3.5-6.0"
   - "nightly"
 env:
   - PACKAGE=fluent.syntax

From e2c75b0aa50176c2fb32de938e76c30665de9896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sta=C5=9B=20Ma=C5=82olepszy?= <stas@mozilla.com>
Date: Wed, 30 Jan 2019 15:02:02 +0100
Subject: [PATCH 4/4] Add pypy2.7-6.0

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

diff --git a/.travis.yml b/.travis.yml
index f79d56dc..d5e9f8da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
+  - "pypy2.7-6.0"
   - "pypy3.5-6.0"
   - "nightly"
 env: