Skip to content

Commit

Permalink
Merge pull request #324 from gidden/travis-merge
Browse files Browse the repository at this point in the history
Travis merge
  • Loading branch information
gidden committed Apr 25, 2015
2 parents a3c1f02 + c72c48e commit 0d563ca
Show file tree
Hide file tree
Showing 5 changed files with 315 additions and 215 deletions.
19 changes: 19 additions & 0 deletions .travis-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash

set -x # print cmds
set -e # exit as soon as an error occurs

# log
msg=`git log --pretty=oneline -1`
echo "Building commit: $msg"

# setup conda recipe
wget https://github.com/cyclus/ciclus/archive/master.zip -O ciclus.zip
unzip -j ciclus.zip "*/cycamore/*" -d conda-recipe
sed -i "s/- cyclus/- cyclus 0.0/g" conda-recipe/meta.yaml

# build
conda build --no-test conda-recipe

# install
conda install --use-local cycamore=0.0
44 changes: 44 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
language: python
python:
# We don't actually use the Travis Python, but this keeps it organized.
- "2.7"
- "3.4"
before_install:
- sudo apt-get update -qq
install:
# You may want to periodically update this, although the conda update
# conda line below will keep everything up-to-date. We do this
# conditionally because it saves us some downloading if the version is
# the same.
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
else
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
fi
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH="$HOME/miniconda/bin:$PATH"
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda config --add channels pyne
- conda config --add channels cyclus
- conda update -q conda
- conda install conda-build jinja2 setuptools binstar patchelf nose
# Useful for debugging any issues with conda
- conda info -a

# install cyclus
- git clone https://github.com/cyclus/cyclus ../cyclus
- cd ../cyclus
- ./.travis-install.sh
- cd ../cycamore

# install cycamore
- ./.travis-install.sh

script:
- export PATH="$HOME/miniconda/bin:$PATH"
- export LD_LIBRARY_PATH="$HOME/miniconda/lib:$LD_LIBRARY_PATH"
- cycamore_unit_tests
- conda install numpy pytables
- nosetests -w tests

4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ IF(NOT CYCLUS_DOC_ONLY)
FIND_PACKAGE(HDF5 REQUIRED)
ADD_DEFINITIONS(${HDF5_DEFINITIONS})
set(LIBS ${LIBS} ${HDF5_LIBRARIES})
MESSAGE("-- HDF5 Root: ${HDF5_ROOT}")
MESSAGE("-- HDF5 Include directory: ${HDF5_INCLUDE_DIR}")
MESSAGE("-- HDF5 Library directories: ${HDF5_LIBRARY_DIRS}")
MESSAGE("-- HDF5 Libraries: ${HDF5_LIBRARIES}")

# find coin and link to it
FIND_PACKAGE(COIN REQUIRED)
Expand Down
Loading

0 comments on commit 0d563ca

Please sign in to comment.