Skip to content

BUG, TST: Fix python3-dbg bug in Travis script #8066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2016
+34 −26
Merged

BUG, TST: Fix python3-dbg bug in Travis script #8066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 1 addition & 21 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,27 +71,7 @@ matrix:
- PYTHONOPTIMIZE=2
- USE_ASV=1
before_install:
- uname -a
- free -m
- df -h
- ulimit -a
- mkdir builds
- pushd builds
# Build into own virtualenv
# We therefore control our own environment, avoid travis' numpy
#
# Some change in virtualenv 14.0.5 caused `test_f2py` to fail. So, we have
# pinned `virtualenv` to the last known working version to avoid this failure.
# Appears we had some issues with certificates on Travis. It looks like
# bumping to 14.0.6 will help.
- pip install -U 'virtualenv==14.0.6'
- virtualenv --python=python venv
- source venv/bin/activate
- python -V
- pip install --upgrade pip setuptools
- pip install nose pytz cython
- if [ -n "$USE_ASV" ]; then pip install asv; fi
- popd
- ./tools/travis-before-install.sh

script:
- ./tools/travis-test.sh
Expand Down
31 changes: 31 additions & 0 deletions tools/travis-before-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/bash

uname -a
free -m
df -h
ulimit -a
mkdir builds
pushd builds

# Build into own virtualenv
# We therefore control our own environment, avoid travis' numpy
#
# Some change in virtualenv 14.0.5 caused `test_f2py` to fail. So, we have
# pinned `virtualenv` to the last known working version to avoid this failure.
# Appears we had some issues with certificates on Travis. It looks like
# bumping to 14.0.6 will help.
pip install -U 'virtualenv==14.0.6'

if [ -n "$USE_DEBUG" ]
then
virtualenv --python=python3-dbg venv
else
virtualenv --python=python venv
fi

source venv/bin/activate
python -V
pip install --upgrade pip setuptools
pip install nose pytz cython
if [ -n "$USE_ASV" ]; then pip install asv; fi
popd
7 changes: 2 additions & 5 deletions tools/travis-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,12 @@ if [ -r /usr/lib/libeatmydata/libeatmydata.so ]; then
export LD_PRELOAD=/usr/lib/libeatmydata/libeatmydata.so
fi

source builds/venv/bin/activate

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's put this right next to where we create the venv.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

# travis venv tests override python
PYTHON=${PYTHON:-python}
PIP=${PIP:-pip}

# explicit python version needed here
if [ -n "$USE_DEBUG" ]; then
PYTHON="python3-dbg"
fi

if [ -n "$PYTHON_OO" ]; then
PYTHON="${PYTHON} -OO"
fi
Expand Down