Merge pull request #3488 from hugovk/upgrade-pypy

Travis CI: Upgrade PyPy from 5.8.0 to 6.0
This commit is contained in:
Hugo 2018-12-13 21:14:03 +02:00 committed by GitHub
commit 73fc7a9f3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions

View File

@ -16,12 +16,12 @@ matrix:
- python: "3.6" - python: "3.6"
name: "Lint" name: "Lint"
env: LINT="true" env: LINT="true"
- python: "pypy" - python: "pypy2.7-6.0"
name: "PyPy Trusty" name: "PyPy2 Xenial"
dist: trusty dist: xenial
- python: "pypy3" - python: "pypy3.5-6.0"
name: "PyPy3 Trusty" name: "PyPy3 Xenial"
dist: trusty dist: xenial
- python: '3.7' - python: '3.7'
name: "3.7 Xenial" name: "3.7 Xenial"
- python: '2.7' - python: '2.7'

View File

@ -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 | | 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 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 |
| | PyPy, PyPy3 | | | | PyPy, PyPy3 | |
+----------------------------------+-------------------------------+-----------------------+
| Ubuntu Linux 14.04 LTS | 2.7, 3.4, 3.5, 3.6 |x86-64 |
| +-------------------------------+-----------------------+ | +-------------------------------+-----------------------+
| | 2.7 |x86 | | | 2.7 |x86 |
+----------------------------------+-------------------------------+-----------------------+ +----------------------------------+-------------------------------+-----------------------+