Merge pull request #835 from mimiframework/contrib

Update contrib testing branches
mimiframework · Jul 27, 2021 · e817f26 · e817f26
2 parents da905dc + 1975979
commit e817f26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 88 deletions.
diff --git a/contrib/test_all_models.jl b/contrib/test_all_models.jl
@@ -15,18 +15,18 @@ pkg_that_errored = []
 
 # first set of packages to test
 packages_to_test = [
-    "MimiDICE2010" => ("https://github.com/anthofflab/MimiDICE2010.jl", "df"), # note here we use the df branch 
-    "MimiDICE2013" => ("https://github.com/anthofflab/MimiDICE2013.jl", "df"), # note here we use the df branch 
+    "MimiDICE2010" => ("https://github.com/anthofflab/MimiDICE2010.jl", "master")
+    "MimiDICE2013" => ("https://github.com/anthofflab/MimiDICE2013.jl", "master"), 
     "MimiDICE2016" => ("https://github.com/AlexandrePavlov/MimiDICE2016.jl", "master"),
     "MimiDICE2016R2" => ("https://github.com/anthofflab/MimiDICE2016R2.jl", "master"),
     "MimiRICE2010" => ("https://github.com/anthofflab/MimiRICE2010.jl", "master"), 
-    "MimiFUND" => ("https://github.com/fund-model/MimiFUND.jl", "mcs"), # note here we use the mcs branch 
-    "MimiPAGE2009" => ("https://github.com/anthofflab/MimiPAGE2009.jl", "mcs"), # note here we use the mcs branch 
-    "MimiPAGE2020" => ("https://github.com/lrennels/MimiPAGE2020.jl", "mcs"), # note using lrennels fork mcs branch, and testing this takes a LONG time :) 
+    "MimiFUND" => ("https://github.com/fund-model/MimiFUND.jl", "master"),
+    "MimiPAGE2009" => ("https://github.com/anthofflab/MimiPAGE2009.jl", "master"),
+    "MimiPAGE2020" => ("https://github.com/lrennels/MimiPAGE2020.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"),
-    "MimiHector" => ("https://github.com/anthofflab/MimiHector.jl", "master"),
+    "MimiHector" => ("https://github.com/anthofflab/MimiHector.jl", "master")
 ]
 
 mktempdir() do folder_name
@@ -61,7 +61,7 @@ end
 
 # test separately because needs MimiFUND 3.8.6
 packages_to_test = [
-   "MimiIWG" => ("https://github.com/rffscghg/MimiIWG.jl", "mcs") # note here we use the mcs branch
+   "MimiIWG" => ("https://github.com/rffscghg/MimiIWG.jl", "master")
 ]
 
 mktempdir() do folder_name

diff --git a/test/test_dependencies.jl b/test/test_dependencies.jl