summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2019-04-17 17:39:45 -0700
committerGitHub <noreply@github.com>2019-04-17 17:39:45 -0700
commit5fccfc1d88cc70455d013fbf13f9a49a19cd7929 (patch)
tree4ec7cdc57d295668f5c5b66137336654ab7b32a9
parent5043f33c1cf172af081c71e1841a1ada44a4fa92 (diff)
parent36616742c40f9c111ff5e5531e0191d0a7386a59 (diff)
downloadsimplejson-5fccfc1d88cc70455d013fbf13f9a49a19cd7929.tar.gz
Merge pull request #247 from cclauss/patch-1
Travis CI: Simplify by upgrading to dist: xenial
-rw-r--r--.travis.yml41
1 files changed, 17 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml
index b044505..011d17d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,45 +1,38 @@
language: python
+dist: xenial # required for Python >= 3.7
cache:
directories:
- "$HOME/.cache/pip"
- "$HOME/.pyenv"
matrix:
include:
- - os: linux
+ - python: 2.6
dist: trusty
- python: '2.6'
- - os: linux
+ - python: 2.7
+ - python: 3.3
dist: trusty
- python: '2.7'
- - os: linux
+ - python: 3.4
+ - python: 3.5
+ - python: 3.6
+ - python: 3.7
+ - python: pypy
dist: trusty
- python: '3.3'
- - os: linux
+ - python: pypy3
dist: trusty
- python: '3.4'
- - os: linux
- dist: trusty
- python: '3.5'
- - os: linux
- dist: trusty
- python: '3.6'
- - os: linux
- dist: xenial
+ - python: 3.7
services:
- docker
- python: '3.7'
env: BUILD_SDIST=true
- - os: linux
- python: pypy
- - os: linux
- python: pypy3
- - os: osx
+ - name: Python 2.7.12 on macOS
+ os: osx
language: objective-c
env: PYENV_VERSION=2.7.12
- - os: osx
+ - name: Python 3.5.5 on macOS
+ os: osx
language: objective-c
env: PYENV_VERSION=3.5.5
- - os: osx
+ - name: Python 3.6.5 on macOS
+ os: osx
language: objective-c
env: PYENV_VERSION=3.6.5
install: