Skip to content

Commit

Permalink
Merge pull request #404 from javabrett/tox-py36
Browse files Browse the repository at this point in the history
Updated tox and Travis to use py36.
  • Loading branch information
sigmavirus24 authored Nov 27, 2017
2 parents 194df2e + d2ca5e0 commit 5b9bb95
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
dist: trusty
language: python

sudo: false
env:
- TOXENV=py27
- TOXENV=py34
matrix:
include:
- python: 2.7
env: TOXENV=py27
- python: 3.6
env: TOXENV=py36

install:
- travis_retry pip install tox
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27,py34
envlist = py27,py36

[testenv]
commands=python test_httpbin.py
Expand Down

0 comments on commit 5b9bb95

Please sign in to comment.