diff options
| author | Todd Leonhardt <todd.leonhardt@gmail.com> | 2017-03-13 01:03:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 01:03:02 -0400 |
| commit | 8b0505c5ccdc7516572afe1426d82666f97232af (patch) | |
| tree | c794b2b01ca77eaf42c04faec334fdb806ce22ae | |
| parent | 2e02245201fd4f042a0fb1bccae0c92c135b73d9 (diff) | |
| parent | 4770cababcfd66351787b4668e127b14959e1040 (diff) | |
| download | cmd2-git-8b0505c5ccdc7516572afe1426d82666f97232af.tar.gz | |
Merge pull request #76 from python-cmd2/travis_ci
Added additional builds to Travis CI config
| -rw-r--r-- | .travis.yml | 29 | ||||
| -rw-r--r-- | tests/test_cmd2.py | 3 |
2 files changed, 27 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 3280af8d..2ae8ec69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,33 @@ matrix: python: 3.6 env: TOXENV=py36 - os: linux + python: 3.7-dev + env: TOXENV=py37 + - os: linux python: pypy env: TOXENV=pypy -# - os: osx -# language: generic -# env: TOXENV=py27 + - os: linux + python: pypy3 + env: TOXENV=pypy3 + # Stock OSX Python + - os: osx + language: generic + env: TOXENV=py27 + # Latest Python 3.x from Homebrew + - os: osx + language: generic + env: + - TOXENV=py36 + - BREW_INSTALL=python3 install: - - pip install tox + - | + if [[ $TRAVIS_OS_NAME == 'osx' ]]; then + if [[ -n "$BREW_INSTALL" ]]; then + brew update + brew install "$BREW_INSTALL" + fi + fi + pip install tox + script: - tox diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py index 71757971..0f1328f3 100644 --- a/tests/test_cmd2.py +++ b/tests/test_cmd2.py @@ -446,7 +446,8 @@ def test_base_colorize(base_app): def _expected_no_editor_error(): expected_exception = 'OSError' - if six.PY2: + # If using Python 2 or PyPy (either 2 or 3), expect a differen excpetion than with Python 3 + if six.PY2 or hasattr(sys, "pypy_translation_info"): expected_exception = 'EnvironmentError' expected_text = normalize(""" |