Skip to content

Commit 41d56fe

Browse files
authored
Merge branch 'master' into rm-eol
2 parents 8af820f + b2a3ba0 commit 41d56fe

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ python:
66
- '3.4'
77
- '3.5'
88
- '3.6'
9+
# Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
10+
matrix:
11+
include:
12+
- python: 3.7
13+
dist: xenial
14+
sudo: true
915
fail_fast: true
1016
before_install:
1117
- pip install pycodestyle

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM ubuntu:xenial
2-
ENV PYTHON_VERSIONS='python2.7 python3.4 python3.5 python3.6' \
2+
ENV PYTHON_VERSIONS='python2.7 python3.4 python3.5 python3.6 python3.7' \
33
OAI_SPEC_URL="https://raw.githubusercontent.com/sendgrid/sendgrid-oai/master/oai_stoplight.json"
44

55
# install testing versions of python, including old versions, from deadsnakes

tox.ini

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# and then run "tox" from this directory.
55

66
[tox]
7-
envlist = py27, py34, py35, py36
7+
envlist = py27, py34, py35, py36, py37
88

99
[testenv]
1010
commands = {envbindir}/python -m unittest discover -v []
@@ -29,3 +29,8 @@ basepython = python3.5
2929
commands = {envbindir}/python -m unittest discover -v []
3030
deps =
3131
basepython = python3.6
32+
33+
[testenv:py37]
34+
commands = {envbindir}/python -m unittest discover -v []
35+
deps =
36+
basepython = python3.7

0 commit comments

Comments
 (0)