Merge 88eaa75 into 83c1860

.travis.yml

@@ -40,13 +40,13 @@ matrix:
             - TEST_MODE='spectrum'
 
 #trouble with osx building due to segfault at cython (https://github.com/cython/cython/issues/2199)
-#        - os: osx
-#          language: generic
-#          env:
-#            - COMPILER=clang
-#            - SETUP_CMD='test --args="--tardis-refdata=$HOME/tardis-refdata/"'
-#            - TEST_MODE='spectrum'
-#            - MINICONDA_URL='http://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh'
+        - os: osx
+          language: generic
+          env:
+            - COMPILER=clang
+            - SETUP_CMD='test --args="--tardis-refdata=$HOME/tardis-refdata/"'
+            - TEST_MODE='spectrum'
+            - MINICONDA_URL='http://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh'
 
 
         - python: 2.7

tardis_env27.yml

@@ -8,19 +8,19 @@ channels:
 dependencies:
 - python=2.7
 - numpy=1.12
-- scipy=1
+- scipy=0.18
 - pandas=0.20
 - pytables
-- h5py=2
+- h5py=2.6
 - matplotlib=2.0
 - astropy=1.3
 - numexpr=2.6
-#- Cython=0.28
 - networkx=1.10
 - pytest=3.0
 - pyyaml=3.12
 - jsonschema=2.5.1
-- pyne=0.5
+- pyne=0.5.3
+- pyside=1.2
 - graphviz=2.38
 - pygraphviz
 
@@ -46,3 +46,4 @@ dependencies:
   - pytest-html==1.10.0
   - dokuwiki
   - dot2tex
+  - git+https://github.com/cython/cython