travis: Run eslint without tox on Travis

This commit is contained in:
Florian Bruhin 2017-09-10 13:17:21 +02:00
parent 1491f20201
commit e6864b6599
3 changed files with 10 additions and 40 deletions

View File

@ -109,43 +109,7 @@ elif [[ $TRAVIS_OS_NAME == osx ]]; then
exit 0
fi
pyqt_pkgs="python3-pyqt5 python3-pyqt5.qtquick python3-pyqt5.qtwebkit python3-pyqt5.qtsql libqt5sql5-sqlite"
pip_install pip
pip_install -r misc/requirements/requirements-tox.txt
pip --version
tox --version
case $TESTENV in
py3*-pyqt*)
#apt_install xvfb geoclue gdb apport
;;
pylint|vulture)
#apt_install $pyqt_pkgs libpython3.4-dev
#check_pyqt
;;
flake8)
#apt_install libpython3.4-dev
;;
docs)
#apt_install $pyqt_pkgs asciidoc libpython3.4-dev
asciidoc --version
check_pyqt
;;
misc)
#apt_install libpython3.4-dev
;;
pyroma|check-manifest)
;;
eslint)
echo "node: $(node --version)"
echo "npm: $(npm --version)"
npm_install eslint
echo "eslint: $(eslint --version)"
;;
*)
echo "Unknown testenv $TESTENV!" >&2
exit 1
;;
esac
if [[ $TESTENV != eslint ]]; then
pip_install pip
pip_install -r misc/requirements/requirements-tox.txt
fi

View File

@ -2,6 +2,10 @@
if [[ $DOCKER ]]; then
docker run --privileged -v $PWD:/outside -e QUTE_BDD_WEBENGINE=$QUTE_BDD_WEBENGINE -e DOCKER=$DOCKER qutebrowser/travis:$DOCKER
elif [[ $TESTENV == eslint ]]; then
# Can't run this via tox as we can't easily install tox in the javascript travis env
cd qutebrowser/javascript || exit 1
eslint --color .
else
args=()
[[ $TRAVIS_OS_NAME == osx ]] && args=('--qute-bdd-webengine' '--no-xvfb')

View File

@ -268,6 +268,8 @@ commands =
{envbindir}/pyinstaller --noconfirm misc/qutebrowser.spec
[testenv:eslint]
# This is duplicated in travis_run.sh for Travis CI because we can't get tox in
# the JavaScript environment easily.
deps =
whitelist_externals = eslint
changedir = {toxinidir}/qutebrowser/javascript