diff options
| author | a01200356 <a01200356@itesm.mx> | 2016-01-10 19:29:05 -0600 |
|---|---|---|
| committer | a01200356 <a01200356@itesm.mx> | 2016-01-10 19:29:05 -0600 |
| commit | 4130b3dfd640d4e4f88937e79648cfe7929dca43 (patch) | |
| tree | baeb2d7460e23f42d5899ca91fa45daf8f825771 /.travis.yml | |
| parent | 3bbdb23fd86a65d9c982aa34ee42326fa3dd9bc1 (diff) | |
| parent | 6a158ca2d2c5fdec597f1025c58fad90a57312dc (diff) | |
Merge branch 'master' of https://github.com/asciimoo/searx
Conflicts:
searx/tests/test_engines.py
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index be6683510..d0bc35094 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,16 +11,16 @@ before_install: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - npm install -g less grunt-cli - - ( cd searx/static/themes/oscar;npm install ) + - ( cd searx/static/themes/oscar;npm install; cd - ) install: - - "make" + - ./manage.sh update_dev_packages - pip install coveralls script: - - "make flake8" - - "make robot" - - "make styles" - - "make grunt" - - make coverage + - ./manage.sh pep8_check + - ./manage.sh styles + - ./manage.sh grunt_build + - ./manage.sh py_test_coverage + - ./manage.sh robot_tests after_success: coveralls notifications: |