Merge branch 'v3.0.1'

StanJulia · Jan 5, 2018 · 076736f · 076736f
2 parents 387cd61 + da25fe9
commit 076736f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ notifications:
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
   - cd $HOME; if [[ ! -d cmdstan ]]; then git clone https://github.com/stan-dev/cmdstan.git; fi
-  - cd $HOME/cmdstan; git checkout v2.16.0; make stan-update; make build
+  - cd $HOME/cmdstan; git checkout v2.17.1; make stan-update; make build
   - export CMDSTAN_HOME=$HOME/cmdstan
   - cd $TRAVIS_BUILD_DIR
   - julia -e 'Pkg.clone(pwd()); Pkg.build("Stan"); Pkg.test("Stan"; coverage=true)'

diff --git a/Examples/OtherExamples/DiffEqBayes/stan_inference.jl b/Examples/OtherExamples/DiffEqBayes/stan_inference.jl
@@ -1,3 +1,5 @@
+# Usually identical to stan_inference in DiffEqBayes. Included here for testing.
+
 struct StanModel{R,C}
   return_code::R
   chain_results::C

diff --git a/README.md b/README.md
@@ -4,7 +4,6 @@
 [![Coverage Status](https://coveralls.io/repos/goedman/Stan.jl/badge.svg?branch=master&service=github)](https://coveralls.io/github/goedman/Stan.jl?branch=master)
 [![codecov](https://codecov.io/gh/goedman/Stan.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/goedman/Stan.jl?branch=master)
 
-[![Stan](http://pkg.julialang.org/badges/Stan_0.5.svg)](http://pkg.julialang.org/?pkg=Stan&ver=0.5)
 [![Stan](http://pkg.julialang.org/badges/Stan_0.6.svg)](http://pkg.julialang.org/?pkg=Stan&ver=0.6)
 
 Documentation:

diff --git a/docs/src/VERSIONS.md b/docs/src/VERSIONS.md
@@ -14,14 +14,23 @@ Updates for new releases of Julia and CmdStan bump the appropriate level.
 
 ## Testing
 
-This version of the package has primarily been tested on Mac OSX 10.12&13, Julia 0.6 and 0.7, CmdStan 2.17.0, Mamba 0.11.1 and Gadfly 0.6.3.
+This version of the package has primarily been tested on Mac OSX 10.12&13, Julia 0.6 and 0.7, CmdStan 2.17.1, Mamba 0.11.1 and Gadfly 0.6.4.
 
 A limited amount of testing has taken place on other platforms by other users of the package.
 
+## Version 3.0.1 
+
+1. Added ODE examples from DiffEqBayes.jl
+
 ## Version 3.0.0 
 
 1. Julia 0.7- compatible
 
+## Version 2.0.2
+
+1. Julia 0.6 only
+2. Added ODE examples from DiffEqBayes.jl
+
 ## Version 2.0.1
 
 1. Mainly package updates

diff --git a/src/Stan.jl b/src/Stan.jl
@@ -7,7 +7,7 @@ The directory which contains the CmdStan executables such as `bin/stanc` and
 `bin/stansummary`. Inferred from `Main.CMDSTAN_HOME` or `ENV["CMDSTAN_HOME"]`
 when available. Use `set_cmdstan_home!` to modify.
 """
-CMDSTAN_HOME=""
+global CMDSTAN_HOME=""
 
 function __init__()
     global CMDSTAN_HOME = if isdefined(Main, :CMDSTAN_HOME)