Skip to content

Commit

Permalink
Fix Travis CI (#113)
Browse files Browse the repository at this point in the history
  • Loading branch information
starforever committed Sep 5, 2018
1 parent 6e8744a commit 368845e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
23 changes: 10 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
language: python

python:
- "2.7"
- 2.7
- 3.4
- 3.5
- 3.6
- pypy
- "3.3"
- "3.4"
- "3.5"
- "3.6"
- pypy3

install:
- pip install tox-travis

matrix:
include:
# Workaround to enable Python 3.7: https://github.com/travis-ci/travis-ci/issues/9815
- python: 3.7
dist: xenial
sudo: true
# Add entries here to ignore failures on certain configurations that are not caused by our code.
allow_failures:
# PyPy 3k probably won't work until it acquires compatibility with
# >= 3.4
- python: pypy3

# Python 3.3 is causing some weird issues around setuptools.
# We'll turn this off for now and see if it persists over time.
# Since 3.3 has reached end of life, we may end up removing this from settings.
- python: "3.3"

script:
- tox
2 changes: 1 addition & 1 deletion test/test_python_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def _evaluate_namespace(self, ns):
return result

def _evaluate_namespace_with_auth_mode(self, ns, auth_mode):
# type: (ApiNamespace) -> typing.Text
# type: (ApiNamespace, str) -> typing.Text

# supply supported auth modes to the SDK generator using the new syntax
backend = PythonClientBackend(
Expand Down
19 changes: 11 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]

envlist = py{27,32,33,34,35,36,py,py3},check,lint,mypy
envlist = py{27,34,35,36,37,py,py3},check,lint,mypy
skip_missing_interpreters = true


Expand All @@ -10,14 +10,17 @@ ignore = E128,E301,E302,E305,E402,W503
max-line-length = 100


[tox:travis]
[travis]

2.7 = py27, lint
pypy = pypy, lint
3.4 = py34, lint, mypy
3.5 = py35, lint, mypy
3.6 = py36, lint, mypy
pypy3 = pypy3, lint, mypy
# Disabled lint for Python 3.x due to https://github.com/PyCQA/pylint/issues/2297.
python =
2.7: py27, lint, mypy
3.4: py34, mypy
3.5: py35, mypy
3.6: py36, mypy
3.7: py37, mypy
pypy: pypy, lint, mypy
pypy3: pypy3, mypy


[testenv]
Expand Down

0 comments on commit 368845e

Please sign in to comment.