Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Travis reverting xcode to 8.x for mac osx
  • Loading branch information
dhoomakethu committed Sep 11, 2020
commit 85a04d6e87e72f38dafade7e690bc14189aa3c7c
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ matrix:
- os: linux
python: "3.8"
- os: osx
osx_image: xcode11.2
language: shell
osx_image: xcode8.3
language: generic
before_install:
- if [ $TRAVIS_OS_NAME = osx ]; then brew update; fi
- if [ $TRAVIS_OS_NAME = osx ]; then brew install openssl; fi
# - if [$TRAVIS_OS_NAME = osx ]; then python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"; fi

install:
# - scripts/travis.sh pip install pip-accel
- scripts/travis.sh pip install -U setuptools
- if [ $TRAVIS_OS_NAME = osx ]; then scripts/travis.sh pip install -U "\"setuptools<45"\"; else pip install -U setuptools --upgrade ; fi
- scripts/travis.sh pip install coveralls
- scripts/travis.sh pip install --requirement=requirements-checks.txt
- scripts/travis.sh pip install --requirement=requirements-tests.txt
Expand Down
11 changes: 5 additions & 6 deletions scripts/travis.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#!/bin/bash -e

set -x
if [ "$TRAVIS_OS_NAME" = osx ]; then
VIRTUAL_ENV="$HOME/.virtualenvs/pymodbus"
python3 -m venv $VIRTUAL_ENV
# if [ ! -x "$VIRTUAL_ENV/bin/python" ]; then
# virtualenv "$VIRTUAL_ENV"
# fi
VIRTUAL_ENV="$HOME/.virtualenvs/python2.7"
if [ ! -x "$VIRTUAL_ENV/bin/python" ]; then
virtualenv "$VIRTUAL_ENV"
fi
source "$VIRTUAL_ENV/bin/activate"
fi

Expand Down