Merge pull request #79 from hammerlab/dev

v0.1.2.6

.gitignore

@@ -2,6 +2,9 @@
 
 *.sublime-*
 
+# swp files
+*.swp
+
 # C extensions
 *.so
 

.travis.yml

@@ -1,13 +1,15 @@
 sudo: false  # Use container-based infrastructure
 language: python
-cache: 
+cache:
   pip: true
-  directories:    
+  directories:
     - $HOME/.cached_models
 python:
   - "2.7"
   - "3.4"
+  - "3.6"
 env:
+  - TEST=lint
   - TEST=test/test_exp_survival_model.py
   - TEST=test/test_exp_survival_model_sim.py
   - TEST=test/test_pem_survival_model.py
@@ -21,6 +23,8 @@ env:
   - TEST=test/test_byo-gamma_survival_model.py
   - TEST=test/test_byo-gamma_survival_model_sim.py
   - TEST=test/test_jointmodel_datasets.py
+  - TEST=test/test_formulas.py
+  - TEST=test/test_SurvivalStanData.py
 before_install:
   # Commands below copied from: http://conda.pydata.org/docs/travis.html
   # We do this conditionally because it saves us some downloading if the
@@ -38,7 +42,7 @@ before_install:
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
-  # borrow following from http://github.com/stan-dev/rstan 
+  # borrow following from http://github.com/stan-dev/rstan
   - echo -e "#\x21/bin/bash\n\$@ > wait4.out 2>&1 3>&1 &\nPROCESS=\"\$!\"\nfunction finish {\ncat wait4.out\n}\ntrap finish EXIT\nwhile :\ndo\n  RESULT=\`ps -p \${PROCESS} -o comm=\`" > wait4.sh
   - echo -e "  if [ -z \"\${RESULT}\" ]; then\n    wait \${PROCESS}; exit \$?\n  else\n    echo \"-\"; sleep 10\n  fi\ndone\nexit \$?" >> wait4.sh
   - more wait4.sh
@@ -57,8 +61,11 @@ install:
   - pip install .
   - pip install coveralls
 script:
-  - ./lint.sh
-  - ./wait4.sh nosetests $TEST --with-coverage --cover-package=survivalstan
+  - if [[ "$TEST" == "lint" ]]; then
+      ./lint.sh;
+    else
+      ./wait4.sh nosetests $TEST --with-coverage --cover-package=survivalstan;
+    fi
 after_success:
   coveralls
 deploy: