Skip to content

Commit

Permalink
Speedup Travis CI builds - get rid of most of Tox runs
Browse files Browse the repository at this point in the history
  • Loading branch information
chovanecm committed Dec 31, 2017
1 parent 5eab185 commit 48e2699
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 47 deletions.
19 changes: 3 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,17 @@ matrix:
- language: python
python: "3.5"
env:
- INFO=PythonStyleCheck
- INFO=PythonCodeCheck
before_script: make pydependencies
script:
- make flake8
- language: python
python: "3.5"
env:
- INFO=PythonDocStringCheck
script:
- make pydocstyle
- language: node_js
env:
- INFO=JavaScriptTests
- INFO=JavaScriptTestAndCheck
node_js: "7"
script:
- make qunit
- language: node_js
env:
- INFO=JavaScriptStyleCheck
node_js: "7"
script:
- make eslint

language: python
Expand All @@ -36,14 +27,10 @@ cache:
before_script:
- pip install tox
env:
- TOX_ENV=py34
- TOX_ENV=py35
- TOX_ENV=py36
- TOX_ENV=coverage
script:
- tox -e $TOX_ENV


# safelist
branches:
only:
Expand Down
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
default:
@echo make test run all tests
@echo make pydependencies Install Python dependencies
@echo make test run all tests
@echo make pytest run Python tests only. Python3.5 or higher must be installed.
@echo make flake8 run Python code style checker
@echo make pydocstyle run Python documentation style checker
Expand All @@ -24,4 +25,9 @@ qunit: node_modules
eslint: node_modules
npm run lint -s

test: pytest qunit flake8 pydocstyle eslint
pydependencies: pytest-requirements.txt dev-requirements.txt requirements.txt
pip install -r requirements.txt
pip install -r pytest-requirements.txt
pip install -r dev-requirements.txt

test: pytest qunit flake8 pydocstyle eslint
31 changes: 2 additions & 29 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,11 @@
# and then run "tox" from this directory.

[tox]
envlist = py34, py35, flake8, pydocstyle, qunit, eslint
envlist = py35, py36

[testenv]
commands = {envpython} setup.py test --addopts -v

[testenv:flake8]
deps =
flake8
commands =
flake8 sacredboard

[testenv:pydocstyle]
deps =
pydocstyle
commands =
pydocstyle sacredboard

# pydocstyle ignores some warnings because of the sacredboard command line help docstring
# and because some are mutually exclusive

Expand All @@ -30,19 +18,4 @@ deps =
coveralls
commands =
coverage run --source=sacredboard setup.py test
coveralls

[testenv:qunit]
whitelist_externals=
qunit
npm
commands =
npm install
npm test

[testenv:eslint]
whitelist_externals=
npm
commands =
npm install
npm run lint -s
coveralls

0 comments on commit 48e2699

Please sign in to comment.