Skip to content

This switches all of the dependency testing back to using the model versions on master #730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 14, 2020
Merged

This switches all of the dependency testing back to using the model versions on master #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3da5ec
Update versions in dependency tests
davidanthoff Jul 13, 2020
53810e1
Switch remaining dependency tests to use master versions of models
davidanthoff Jul 14, 2020
996c88c
Stay on PAGE2009 mimi-next
davidanthoff Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions contrib/test_all_models.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
4 changes: 2 additions & 2 deletions test/dependencies/run_dependency_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down