From 454bb10f5a89a6b6dab462d191ec0487ebb7b33b Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Sat, 5 Mar 2016 22:22:36 -0500 Subject: [PATCH 1/3] Getting travis to build the npm related stuff --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ba88b3ef5..6d2538126 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,10 @@ 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 - + - cd panoramix/assets + - npm install + - npm run prod + - npm run lint # command to run tests script: bash run_tests.sh after_success: coveralls From 78e01ab0a15f3b30fb2094b587b46b027e8ec590 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Sat, 5 Mar 2016 22:32:20 -0500 Subject: [PATCH 2/3] Caching node_modules --- .travis.yml | 6 +++++- panoramix/utils.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d2538126..34d4c9339 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,13 @@ language: python python: - "2.7" - "3.4" +env: + global: + - NODE_PATH=$HOME/.node_modules/ cache: directories: - $HOME/.wheelhouse/ + - $NODE_PATH install: - pip wheel -w $HOME/.wheelhouse -f $HOME/.wheelhouse -r requirements.txt - pip install --find-links=$HOME/.wheelhouse --no-index -rrequirements.txt @@ -13,6 +17,6 @@ install: - npm install - npm run prod - npm run lint -# command to run tests + - cd $TRAVIS_BUILD_DIR script: bash run_tests.sh after_success: coveralls diff --git a/panoramix/utils.py b/panoramix/utils.py index 42765fbe1..bac0300b7 100644 --- a/panoramix/utils.py +++ b/panoramix/utils.py @@ -42,7 +42,7 @@ class memoized(object): 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] From b2d72fbfe120630a77a23b51c4a2a1bcab7eaca1 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Sat, 5 Mar 2016 23:15:45 -0500 Subject: [PATCH 3/3] Tweaks --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 34d4c9339..c216ff4a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,9 @@ language: python python: - "2.7" - "3.4" -env: - global: - - NODE_PATH=$HOME/.node_modules/ cache: directories: - $HOME/.wheelhouse/ - - $NODE_PATH install: - pip wheel -w $HOME/.wheelhouse -f $HOME/.wheelhouse -r requirements.txt - pip install --find-links=$HOME/.wheelhouse --no-index -rrequirements.txt @@ -16,7 +12,9 @@ install: - cd panoramix/assets - npm install - npm run prod - - npm run lint - cd $TRAVIS_BUILD_DIR script: bash run_tests.sh -after_success: coveralls +after_success: + - coveralls + - cd panoramix/assets + - npm run lint