From b3da5ecc55fdeadba2e68f29e171437fc816e61e Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Mon, 13 Jul 2020 16:04:30 -0700 Subject: [PATCH 1/3] Update versions in dependency tests --- contrib/test_all_models.jl | 6 +++--- test/dependencies/run_dependency_tests.jl | 2 +- test/runtests.jl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/test_all_models.jl b/contrib/test_all_models.jl index 407e6e416..469977428 100644 --- a/contrib/test_all_models.jl +++ b/contrib/test_all_models.jl @@ -12,10 +12,10 @@ packages_to_test = [ - "MimiDICE2010" => ("https://github.com/anthofflab/MimiDICE2010.jl", "mimi-next"), - "MimiDICE2013" => ("https://github.com/anthofflab/MimiDICE2013.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", "mimi-next"), - "MimiFUND" => ("https://github.com/fund-model/MimiFUND.jl", "mimi-next"), + "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"), # "MimiSNEASY" => ("https://github.com/anthofflab/MimiSNEASY.jl", "master"), diff --git a/test/dependencies/run_dependency_tests.jl b/test/dependencies/run_dependency_tests.jl index e511115b9..9024e6e55 100644 --- a/test/dependencies/run_dependency_tests.jl +++ b/test/dependencies/run_dependency_tests.jl @@ -2,7 +2,7 @@ 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/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 From 53810e127f8e1261b6da62462940d1f109a5c665 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Mon, 13 Jul 2020 17:31:21 -0700 Subject: [PATCH 2/3] Switch remaining dependency tests to use master versions of models --- contrib/test_all_models.jl | 6 +++--- test/dependencies/run_dependency_tests.jl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/test_all_models.jl b/contrib/test_all_models.jl index 469977428..9e6e353b7 100644 --- a/contrib/test_all_models.jl +++ b/contrib/test_all_models.jl @@ -14,10 +14,10 @@ packages_to_test = [ "MimiDICE2010" => ("https://github.com/anthofflab/MimiDICE2010.jl", "master"), "MimiDICE2013" => ("https://github.com/anthofflab/MimiDICE2013.jl", "master"), - "MimiRICE2010" => ("https://github.com/anthofflab/MimiRICE2010.jl", "mimi-next"), + "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"), + "MimiPAGE2009" => ("https://github.com/anthofflab/MimiPAGE2009.jl", "master"), + "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 9024e6e55..7ac685579 100644 --- a/test/dependencies/run_dependency_tests.jl +++ b/test/dependencies/run_dependency_tests.jl @@ -1,7 +1,7 @@ using Pkg packages_to_test = [ - ("https://github.com/anthofflab/MimiRICE2010.jl.git", "mimi-next", "MimiRICE2010"), + ("https://github.com/anthofflab/MimiRICE2010.jl.git", "master", "MimiRICE2010"), ("https://github.com/fund-model/MimiFUND.jl.git", "master", "MimiFUND") ] From 996c88c13441990eee3b754ce4c07bddaa6d5f0b Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Mon, 13 Jul 2020 17:36:00 -0700 Subject: [PATCH 3/3] Stay on PAGE2009 mimi-next --- contrib/test_all_models.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/test_all_models.jl b/contrib/test_all_models.jl index 9e6e353b7..0450ea2bd 100644 --- a/contrib/test_all_models.jl +++ b/contrib/test_all_models.jl @@ -16,7 +16,7 @@ packages_to_test = [ "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", "master"), + "MimiPAGE2009" => ("https://github.com/anthofflab/MimiPAGE2009.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"),