Skip to content

Commit

Permalink
Attempt to fix travis macOS and py26
Browse files Browse the repository at this point in the history
  • Loading branch information
henryiii committed Dec 6, 2017
1 parent 605d068 commit cb5d053
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .ci/travis.sh
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -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'

0 comments on commit cb5d053

Please sign in to comment.