Merge branch 'v1.3.0-release'

.gitignore

@@ -8,3 +8,6 @@ suffix.h
 *.pyc
 rs.cred
 *.h5
+*.dat
+tests/run_inputs.py
+cyclus.sqlite

.travis-install.sh

@@ -0,0 +1,17 @@
+#!/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 to use develop cyclus
+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

.travis.yml

@@ -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
+

CMakeLists.txt

@@ -104,11 +104,18 @@ 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)
     set(LIBS ${LIBS} ${COIN_LIBRARIES})
 
+    FIND_PACKAGE( Sqlite3 REQUIRED )
+    SET(LIBS ${LIBS} ${SQLITE3_LIBRARIES})
+
     # include the agent directories
     SET(CYCAMORE_INCLUDE_DIR ${CYCAMORE_INCLUDE_DIR} tests
         ${CYCLUS_CORE_INCLUDE_DIR}/..)