travis: remove pytest-xdist not used, and ensure pytest binaries are accessible from PATH

This commit is contained in:
Mathieu Virbel 2019-02-25 09:40:32 +01:00 committed by Mathieu Virbel
parent c50858d7dc
commit 707d0e275f
1 changed files with 6 additions and 4 deletions

View File

@ -70,7 +70,7 @@ install:
sudo apt-get -y install python-dev libsmpeg-dev libswscale-dev libavformat-dev libavcodec-dev libjpeg-dev libtiff4-dev libX11-dev libmtdev-dev;
sudo apt-get -y install python-setuptools build-essential libgl1-mesa-dev libgles2-mesa-dev;
sudo apt-get -y install xvfb pulseaudio xsel;
pip install --upgrade cython pillow pytest pytest-xdist coveralls docutils PyInstaller;
pip install --upgrade cython pillow pytest coveralls docutils PyInstaller;
fi;
if [ "${RUN}" == "docs" ]; then
pip install --upgrade sphinxcontrib-blockdiag sphinxcontrib-seqdiag sphinxcontrib-actdiag sphinxcontrib-nwdiag;
@ -111,13 +111,15 @@ install:
fi;
if [ "${RUN}" == "unit" ]; then
if [ "${PY}" == "3" ]; then
export PATH=$PATH:$HOME/Library/Python/3.5/bin
curl -O -L https://www.python.org/ftp/python/3.5.2/python-3.5.2-macosx10.6.pkg;
sudo installer -package python-3.5.2-macosx10.6.pkg -target /;
python3 get-pip.py --user;
python3 -m pip install --upgrade --user cython pillow pytest pytest-xdist mock docutils PyInstaller;
python3 -m pip install --upgrade --user cython pillow pytest mock docutils PyInstaller;
else
export PATH=$PATH:$HOME/Library/Python/2.7/bin
python get-pip.py --user;
python -m pip install --upgrade --user cython pillow pytest pytest-xdist mock docutils PyInstaller;
python -m pip install --upgrade --user cython pillow pytest mock docutils PyInstaller;
fi;
fi;
fi;
@ -226,7 +228,7 @@ script:
python$pyver_short -m pip install git+http://github.com/tito/osxrelocator --user;
python$pyver_short -m pip install --upgrade --user pip;
python$pyver_short -m pip install --upgrade --user cython pytest pytest-xdist wheel pillow mock docutils PyInstaller;
python$pyver_short -m pip install --upgrade --user cython pytest wheel pillow mock docutils PyInstaller;
python$pyver_short -m pip install --upgrade delocate;
USE_SDL2=1 USE_GSTREAMER=1 python$pyver_short setup.py build_ext --inplace>output.txt;