Commit 381b9eec authored by Jason Madden's avatar Jason Madden

Install openssl on travis for 3.7b1 as a fix for ...

Install openssl on travis for 3.7b1 as a fix for  https://github.com/travis-ci/travis-ci/issues/9069

[skip appveyor]
parent c5d20b9e
......@@ -2,10 +2,6 @@
language: python
sudo: false
# Currently, pyenv cannot build 3.7b1 on Travis
# https://github.com/travis-ci/travis-ci/issues/9069
# But it looks like the backend process for Travis is updating the
# dev branch appropriately? Lets find out.
python:
- 3.7-dev
......
......@@ -114,7 +114,6 @@ travis_test_linters:
coverage_combine:
coverage combine . src/greentest/
-coveralls --rcfile=src/greentest/.coveragerc
......@@ -191,11 +190,8 @@ test-py35: $(PY35)
test-py36: $(PY36)
PYTHON=python3.6.4 PATH=$(BUILD_RUNTIMES)/versions/python3.6.4/bin:$(PATH) make develop allbackendtest
# test-py37: $(PY37)
# PYTHON=python3.7.0b1 PATH=$(BUILD_RUNTIMES)/versions/python3.7.0b1/bin:$(PATH) make develop allbackendtest
test-py37:
PYTHON=python make develop allbackendtest
test-py37: $(PY37)
LD_LIBRARY_PATH=$(BUILD_RUNTIMES)/versions/python3.7.0b1/openssl/lib PYTHON=python3.7.0b1 PATH=$(BUILD_RUNTIMES)/versions/python3.7.0b1/bin:$(PATH) make develop allbackendtest
test-pypy: $(PYPY)
PYTHON=$(PYPY) PATH=$(BUILD_RUNTIMES)/versions/pypy5100/bin:$(PATH) make develop cffibackendtest coverage_combine
......
......@@ -47,17 +47,23 @@ trap "rm -rf $LOCKFILE" EXIT
PYENV=$BASE/pyenv
# The file for 3.7b1 shipped with pyenv on Feb 6 2018
# won't compile on Travis. So we use a forked version that
# compiles openssl for us.
# https://github.com/travis-ci/travis-ci/issues/9069
if [ ! -d "$PYENV/.git" ]; then
rm -rf $PYENV
git clone https://github.com/yyuu/pyenv.git $BASE/pyenv
git clone https://github.com/gevent/pyenv.git $BASE/pyenv
else
back=$PWD
cd $PYENV
git fetch || echo "Update failed to complete. Ignoring"
git fetch || echo "Fetch failed to complete. Ignoring"
git reset --hard origin/master
cd $back
fi
SNAKEPIT=$BASE/snakepit
install () {
......@@ -66,15 +72,16 @@ install () {
ALIAS="$2"
mkdir -p $BASE/versions
SOURCE=$BASE/versions/$ALIAS
OPENSSL_PATH=$SOURCE/openssl/lib
if [ ! -e "$SOURCE" ]; then
mkdir -p $SNAKEPIT
mkdir -p $BASE/versions
$BASE/pyenv/plugins/python-build/bin/python-build $VERSION $SOURCE
LD_LIBRARY_PATH="$OPENSSL_PATH" $BASE/pyenv/plugins/python-build/bin/python-build $VERSION $SOURCE
fi
rm -f $SNAKEPIT/$ALIAS
mkdir -p $SNAKEPIT
$SOURCE/bin/python -m pip.__main__ install --upgrade pip wheel virtualenv
LD_LIBRARY_PATH="$OPENSSL_PATH" $SOURCE/bin/python -m pip.__main__ install --upgrade pip wheel virtualenv
ln -s $SOURCE/bin/python $SNAKEPIT/$ALIAS
}
......
......@@ -35,3 +35,8 @@ exclude_lines =
if sys.platform == 'win32':
if mswindows:
if is_windows:
omit =
# local.so sometimes gets included, and it can't be parsed
# as source, so it fails the whole process.
# coverage 4.5 needs this specified here, 4.4.2 needed it in [run]
*.so
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment