diff --git a/.ci/travis.sh b/.ci/travis.sh index eee709c17..a9e7568f7 100755 --- a/.ci/travis.sh +++ b/.ci/travis.sh @@ -1,5 +1,7 @@ #!/bin/bash -e +echo $TRAVIS_PYTHON_VERSION + if [[ "$(uname -s)" == 'Darwin' ]]; then if brew ls --versions python$PY3 > /dev/null; then echo "Brew python is already installed" diff --git a/.travis.yml b/.travis.yml index 08c393a6c..fb4d56095 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,9 @@ matrix: # - python: nightly - python: pypy - language: generic - env: PYV=Mac2 + env: PY3=2 PYV=Mac2 os: osx + before_install: python2 -m ensurepip --upgrade - language: generic os: osx env: PY3=3 PYV=Mac3 diff --git a/dev-requirements.txt b/dev-requirements.txt index 62a857de4..db117b1a0 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,4 +1,5 @@ pytest pytest-cov +pycparser<2.18 ; python_version < '2.7' paramiko<2.4 ; python_version < '2.7' paramiko ; python_version >= '2.7'