Skip to content

Commit

Permalink
Travis/tox: move checkqa to tox target
Browse files Browse the repository at this point in the history
  • Loading branch information
blueyed committed Dec 30, 2017
1 parent 936110a commit 5b92565
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
10 changes: 2 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
matrix:
include:
- python: 3.6
env: CI_TARGET=flake
env: CI_TARGET=checkqa TOXENV=checkqa
python:
# If the build matrix gets bigger, also update the number of runs
# at the bottom of .scrutinizer.yml.
Expand All @@ -25,17 +25,11 @@ before_install:
- if [ $CI_TARGET = tests ]; then
eval "$(curl -Ss https://github.com/raw/neovim/bot-ci/master/scripts/travis-setup.sh) nightly-x64";
pip install -q scrutinizer-ocular tox-travis;
else
pip install -q flake8 flake8-import-order flake8-docstrings pep8-naming;
fi
install:
- pip install .
script:
- if [ $CI_TARGET = tests ]; then
tox;
else
flake8 neovim;
fi
- tox
after_script:
- if [ $CI_TARGET = tests ]; then
ocular;
Expand Down
9 changes: 9 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
[tox]
envlist = py{27,33,34,35,36}-{asyncio,pyuv},pypy

[testenv]
deps=
nose
pyuv: pyuv
commands=nosetests

[testenv:checkqa]
deps =
flake8
flake8-import-order
flake8-docstrings
pep8-naming
commands = flake8 {posargs:neovim}

0 comments on commit 5b92565

Please sign in to comment.