Skip to content

Commit 26fbd15

Browse files
committed
Improve CI
- Bump CI to use Python 3.7 (and test against 3.7) Python 3.7 has been out for a while now, seems sensible to test against it and upgrade to it. - Remove the sudo part It has been deprecated https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration. - Be specific about the distribution This is required for 3.7 (not available in trusty) and is for clarity elsewhere.
1 parent 2a3d6c3 commit 26fbd15

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

.travis.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
sudo: false
21
language: python
32

43
branches:
@@ -15,28 +14,39 @@ matrix:
1514
include:
1615
# Main tests on supported Python versions.
1716
- python: "2.7"
17+
dist: trusty
1818
env: TOXENV=py27
1919
- python: "3.4"
20+
dist: trusty
2021
env: TOXENV=py34
2122
- python: "3.5"
23+
dist: trusty
2224
env: TOXENV=py35
2325
- python: "3.6"
26+
dist: trusty
2427
env: TOXENV=py36
28+
- python: "3.7"
29+
dist: xenial
30+
env: TOXENV=py37
2531
- python: "pypy-5.3.1"
32+
dist: trusty
2633
env: TOXENV=pypy
2734

2835
# Linting, docs, and other non-test stuff.
29-
- python: "3.4"
36+
- python: "3.7"
37+
dist: xenial
3038
env: TOXENV=lint
31-
- python: "3.5"
39+
- python: "3.7"
40+
dist: xenial
3241
env: TOXENV=docs
33-
- python: "2.7"
42+
- python: "3.7"
43+
dist: xenial
3444
env: TOXENV=packaging
3545

3646
# Test we haven't broken our major dependencies.
3747
- python: "2.7"
48+
dist: trusty
3849
env: TOXENV=py27-twistedMaster
39-
4050
install:
4151
- "pip install -U pip setuptools"
4252
- "pip install -U tox"

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27, py34, py35, py36, pypy, lint, packaging, docs
2+
envlist = py27, py34, py35, py36, py37, pypy, lint, packaging, docs
33

44
[testenv]
55
deps= -r{toxinidir}/test_requirements.txt
@@ -25,12 +25,12 @@ deps =
2525
commands = python -m twisted.trial --reporter=text twisted
2626

2727
[testenv:lint]
28-
basepython=python3.4
28+
basepython=python3.7
2929
deps = flake8==3.5.0
3030
commands = flake8 --max-complexity 10 h2 test
3131

3232
[testenv:docs]
33-
basepython=python3.5
33+
basepython=python3.7
3434
deps = sphinx==1.4.9
3535
changedir = {toxinidir}/docs
3636
whitelist_externals = rm
@@ -45,7 +45,7 @@ commands =
4545
python visualizer/visualize.py -i docs/source/_static
4646

4747
[testenv:packaging]
48-
basepython=python2.7
48+
basepython=python3.7
4949
deps =
5050
check-manifest==0.36
5151
readme-renderer==17.3

0 commit comments

Comments
 (0)