Skip to content

Commit

Permalink
Merge pull request #168 from mistercrunch/travis_npm
Browse files Browse the repository at this point in the history
Getting travis to build the npm related stuff
  • Loading branch information
mistercrunch committed Mar 6, 2016
2 parents ee025b3 + b2d72fb commit a53dbfc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ install:
- pip wheel -w $HOME/.wheelhouse -f $HOME/.wheelhouse -r requirements.txt
- pip install --find-links=$HOME/.wheelhouse --no-index -rrequirements.txt
- python setup.py install

# command to run tests
- cd panoramix/assets
- npm install
- npm run prod
- cd $TRAVIS_BUILD_DIR
script: bash run_tests.sh
after_success: coveralls
after_success:
- coveralls
- cd panoramix/assets
- npm run lint
2 changes: 1 addition & 1 deletion panoramix/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def __get__(self, obj, objtype):
def list_minus(l, minus):
"""Returns l without what is in minus
>>> list_without([1, 2, 3], [2])
>>> list_minus([1, 2, 3], [2])
[1, 3]
"""
return [o for o in l if o not in minus]
Expand Down

0 comments on commit a53dbfc

Please sign in to comment.