From 58b45835208fe2210041d79fd8f52d14d21def0d Mon Sep 17 00:00:00 2001 From: Hugo Date: Thu, 6 Dec 2018 17:20:38 +0200 Subject: [PATCH 1/3] Upgrade PyPy from 5.8.0 to 6.0 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e8bb7b5f..166266cfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,10 @@ matrix: - python: "3.6" name: "Lint" env: LINT="true" - - python: "pypy" - name: "PyPy Trusty" + - python: "pypy2.7-6.0" + name: "PyPy2 Trusty" dist: trusty - - python: "pypy3" + - python: "pypy3.5-6.0" name: "PyPy3 Trusty" dist: trusty - python: '3.7' From fa14534e514d8467b93b0ae81e06e05c02bf3787 Mon Sep 17 00:00:00 2001 From: Hugo Date: Thu, 6 Dec 2018 17:27:15 +0200 Subject: [PATCH 2/3] PyPy 6.0 requires Xenial on Travis CI --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 166266cfa..d2615b1e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,11 @@ matrix: name: "Lint" env: LINT="true" - python: "pypy2.7-6.0" - name: "PyPy2 Trusty" - dist: trusty + name: "PyPy2 Xenial" + dist: xenial - python: "pypy3.5-6.0" - name: "PyPy3 Trusty" - dist: trusty + name: "PyPy3 Xenial" + dist: xenial - python: '3.7' name: "3.7 Xenial" - python: '2.7' From ae21462249ca2a8531bb2adc97015415605df054 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 8 Dec 2018 17:12:36 +0200 Subject: [PATCH 3/3] Docs: Update CI targets --- docs/installation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 669b81cfd..d5033aa3b 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -396,10 +396,10 @@ These platforms are built and tested for every change. +----------------------------------+-------------------------------+-----------------------+ | Mac OS X 10.10 Yosemite* | 2.7, 3.4, 3.5, 3.6, 3.7 |x86-64 | +----------------------------------+-------------------------------+-----------------------+ -| Ubuntu Linux 16.04 LTS | 2.7, 3.5, 3.6, 3.7 |x86-64 | -+----------------------------------+-------------------------------+-----------------------+ -| Ubuntu Linux 14.04 LTS | 2.7, 3.4, 3.5, 3.6, |x86-64 | +| Ubuntu Linux 16.04 LTS | 2.7, 3.5, 3.6, 3.7, |x86-64 | | | PyPy, PyPy3 | | ++----------------------------------+-------------------------------+-----------------------+ +| Ubuntu Linux 14.04 LTS | 2.7, 3.4, 3.5, 3.6 |x86-64 | | +-------------------------------+-----------------------+ | | 2.7 |x86 | +----------------------------------+-------------------------------+-----------------------+