Skip to content
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.

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

Sort out dependencies in travis/tox #4186

Merged
merged 2 commits into from Jan 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions .travis.yml
Expand Up @@ -10,7 +10,6 @@ cache:
env:
global:
- TRAVIS_CACHE=$HOME/.travis_cache/
- TRAVIS_NODE_VERSION="8.8.1"
matrix:
- TOX_ENV=flake8
- TOX_ENV=javascript
Expand All @@ -19,8 +18,6 @@ env:
- TOX_ENV=py34-sqlite
- TOX_ENV=py27-mysql
- TOX_ENV=py27-sqlite
before_install:
- npm install -g npm@'>=5.4.1'
before_script:
- mysql -u root -e "DROP DATABASE IF EXISTS superset; CREATE DATABASE superset DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"
- mysql -u root -e "CREATE USER 'mysqluser'@'localhost' IDENTIFIED BY 'mysqluserpassword';"
Expand All @@ -31,6 +28,4 @@ before_script:
install:
- pip install --upgrade pip
- pip install tox tox-travis
- pip install --upgrade flake8
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
script: tox -e $TOX_ENV
8 changes: 7 additions & 1 deletion tox.ini
Expand Up @@ -29,6 +29,9 @@ find_links =
deps =
wheel
coveralls
whitelist_externals =
pip
npm
passenv =
HOME
TRAVIS
Expand All @@ -48,6 +51,7 @@ commands =

[testenv:flake8]
commands =
pip install --upgrade flake8
flake8
deps =
flake8
Expand All @@ -56,7 +60,9 @@ deps =
flake8-quotes

[testenv:javascript]
commands = {toxinidir}/superset/assets/js_build.sh
commands =
npm install -g npm@'>=5.6.0'
{toxinidir}/superset/assets/js_build.sh

[testenv:pylint]
commands =
Expand Down