Travis CI changes

- Remove Python 2.6 and 3.2 builds because they don't work and aren't worth fixing
- Attempt at fixing pypy3 unit test that fails
- First attempt at building for Python 3 on Mac OS X

2 files changed, 17 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 55b1e6d4..2ae8ec69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,15 +3,9 @@ sudo: false  # enable container-based build for fast boot times on Linux
 matrix:
     include:
         - os: linux
-          python: 2.6
-          env: TOXENV=py26
-        - os: linux
           python: 2.7
           env: TOXENV=py27
         - os: linux
-          python: 3.2
-          env: TOXENV=py32
-        - os: linux
           python: 3.3
           env: TOXENV=py33
         - os: linux
@@ -36,7 +30,21 @@ matrix:
         - 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..cd764671 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("""