diff --git a/contrib/test_all_models.jl b/contrib/test_all_models.jl index 407e6e416..0450ea2bd 100644 --- a/contrib/test_all_models.jl +++ b/contrib/test_all_models.jl @@ -12,12 +12,12 @@ packages_to_test = [ - "MimiDICE2010" => ("https://github.com/anthofflab/MimiDICE2010.jl", "mimi-next"), - "MimiDICE2013" => ("https://github.com/anthofflab/MimiDICE2013.jl", "mimi-next"), - "MimiRICE2010" => ("https://github.com/anthofflab/MimiRICE2010.jl", "mimi-next"), - "MimiFUND" => ("https://github.com/fund-model/MimiFUND.jl", "mimi-next"), + "MimiDICE2010" => ("https://github.com/anthofflab/MimiDICE2010.jl", "master"), + "MimiDICE2013" => ("https://github.com/anthofflab/MimiDICE2013.jl", "master"), + "MimiRICE2010" => ("https://github.com/anthofflab/MimiRICE2010.jl", "master"), + "MimiFUND" => ("https://github.com/fund-model/MimiFUND.jl", "master"), "MimiPAGE2009" => ("https://github.com/anthofflab/MimiPAGE2009.jl", "mimi-next"), - "MimiDICE2016" => ("https://github.com/lrennels/MimiDICE2016.jl", "mimi-next"), + "MimiDICE2016" => ("https://github.com/AlexandrePavlov/MimiDICE2016.jl", "master"), # "MimiSNEASY" => ("https://github.com/anthofflab/MimiSNEASY.jl", "master"), # "MimiFAIR" => ("https://github.com/anthofflab/MimiFAIR.jl", "master"), # "MimiMAGICC" => ("https://github.com/anthofflab/MimiMAGICC.jl", "master"), diff --git a/test/dependencies/run_dependency_tests.jl b/test/dependencies/run_dependency_tests.jl index e511115b9..7ac685579 100644 --- a/test/dependencies/run_dependency_tests.jl +++ b/test/dependencies/run_dependency_tests.jl @@ -1,8 +1,8 @@ using Pkg packages_to_test = [ - ("https://github.com/anthofflab/MimiRICE2010.jl.git", "mimi-next", "MimiRICE2010"), - ("https://github.com/fund-model/MimiFUND.jl.git", "mimi-next", "MimiFUND") + ("https://github.com/anthofflab/MimiRICE2010.jl.git", "master", "MimiRICE2010"), + ("https://github.com/fund-model/MimiFUND.jl.git", "master", "MimiFUND") ] for (pkg_url, pkg_rev, pkg_name) in packages_to_test diff --git a/test/runtests.jl b/test/runtests.jl index 327f196cc..3cbf79a21 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -2,8 +2,8 @@ using Pkg # We need these for the doctests. We install them before we load any # package so that we don't run into precompile problems -Pkg.add(PackageSpec(url="https://github.com/fund-model/MimiFUND.jl", rev="mimi-next")) -Pkg.add(PackageSpec(url="https://github.com/anthofflab/MimiDICE2010.jl", rev="mimi-next")) +Pkg.add(PackageSpec(url="https://github.com/fund-model/MimiFUND.jl", rev="master")) +Pkg.add(PackageSpec(url="https://github.com/anthofflab/MimiDICE2010.jl", rev="master")) using Mimi import Electron