Skip to content

Commit

Permalink
Addressing @scopatz's comments
Browse files Browse the repository at this point in the history
  • Loading branch information
gidden committed Apr 24, 2015
1 parent facd65e commit 6717227
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
10 changes: 4 additions & 6 deletions .travis-install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -x

# log
msg=`git log --pretty=oneline -1`
echo "Building commit: $msg"
Expand All @@ -10,19 +12,15 @@ unzip -j ciclus.zip "*/cycamore/*" -d conda-recipe
sed -i "s/- cyclus/- cyclus 0.0/g" conda-recipe/meta.yaml

# build
cmd="conda build --no-test conda-recipe"
echo "cmd: $cmd"
$cmd
conda build --no-test conda-recipe
status=$?
echo "status: $status"
if [[ $status != 0 ]]; then
exit $status
fi

# install
cmd="conda install --use-local cycamore=0.0"
echo "cmd: $cmd"
$cmd
conda install --use-local cycamore=0.0
status=$?
echo "status: $status"
if [[ $status != 0 ]]; then
Expand Down
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ install:
script:
- export PATH="$HOME/miniconda/bin:$PATH"
- export LD_LIBRARY_PATH="$HOME/miniconda/lib:$LD_LIBRARY_PATH"
#- ls -l $HOME/miniconda/lib
#- ls -l $HOME/miniconda/envs/_build/lib
- cycamore_unit_tests
- conda install numpy pytables
- nosetests -w tests
Expand Down

0 comments on commit 6717227

Please sign in to comment.