diff --git a/.github/workflows/jlpkgbutler-ci-master-workflow.yml b/.github/workflows/jlpkgbutler-ci-master-workflow.yml index 32514f105..c906b2c90 100644 --- a/.github/workflows/jlpkgbutler-ci-master-workflow.yml +++ b/.github/workflows/jlpkgbutler-ci-master-workflow.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - julia-version: ['1.4', '1.5', '1.6', '1.7'] + julia-version: ['1.4', '1.5', '1.6', '1.7', '1.8'] julia-arch: [x64, x86] os: [ubuntu-latest, windows-latest, macOS-latest] exclude: diff --git a/.github/workflows/jlpkgbutler-ci-pr-workflow.yml b/.github/workflows/jlpkgbutler-ci-pr-workflow.yml index 8214864d7..3db9d63cc 100644 --- a/.github/workflows/jlpkgbutler-ci-pr-workflow.yml +++ b/.github/workflows/jlpkgbutler-ci-pr-workflow.yml @@ -9,7 +9,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - julia-version: ['1.4', '1.5', '1.6', '1.7'] + julia-version: ['1.4', '1.5', '1.6', '1.7', '1.8'] julia-arch: [x64, x86] os: [ubuntu-latest, windows-latest, macOS-latest] exclude: diff --git a/Project.toml b/Project.toml index cae7dc03d..be6dc9ad5 100644 --- a/Project.toml +++ b/Project.toml @@ -14,15 +14,12 @@ Electron = "a1bb12fb-d4d1-54b4-b10a-ee7951ef7ad3" FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" FilePaths = "8fc22ac5-c921-52a6-82fd-178b2807b824" GlobalSensitivityAnalysis = "1b10255b-6da3-57ce-9089-d24e8517b87e" -GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231" IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e" IteratorInterfaceExtensions = "82899510-4779-5014-852e-03e436cf321d" JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5" NamedArrays = "86f7a689-2022-50b4-a561-43c23ac3c673" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca" @@ -44,13 +41,10 @@ Electron = "3.1, 4" FileIO = "1" FilePaths = "0.8" GlobalSensitivityAnalysis = "1.0" -GraphPlot = "0.3, 0.4, 0.5" IterTools = "1.3" IteratorInterfaceExtensions = "0.1.1, 1" JSON = "0.21" -LightGraphs = "1.3" MacroTools = "0.5" -MetaGraphs = "0.6, 0.7" NamedArrays = "0.9" ProgressMeter = "1.2" StatsBase = "0.32, 0.33" diff --git a/README.md b/README.md index 4fac5e33a..14e9dc72b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -![](https://github.com/mimiframework/Mimi.jl/workflows/Run%20CI%20on%20master/badge.svg) -![](https://github.com/mimiframework/Mimi.jl/workflows/Run%20model%20tests/badge.svg) +![](https://github.com/mimiframework/Mimi.jl/actions/workflows/jlpkgbutler-ci-master-workflow.yml/badge.svg) +![](https://github.com/mimiframework/Mimi.jl/actions/workflows/dependencytest-workflow.yml/badge.svg) [![codecov](https://codecov.io/gh/mimiframework/Mimi.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/mimiframework/Mimi.jl) [![Stable documentation](https://img.shields.io/badge/docs-stable-blue.svg)](https://www.mimiframework.org/Mimi.jl/stable) diff --git a/docs/src/index.md b/docs/src/index.md index 5975c3ae8..78d1c18a7 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -38,17 +38,20 @@ Finally, when in doubt, ask your question on the [Mimi Framework forum](https:// * [MimiDICE2016R2.jl](https://github.com/anthofflab/MimiDICE2016R2.jl) * [MimiRICE2010.jl](https://github.com/anthofflab/MimiRICE2010.jl)* * [Mimi-SNEASY.jl](https://github.com/anthofflab/mimi-sneasy.jl)* -* [Mimi-FAIR.jl](https://github.com/anthofflab/mimi-fair.jl/)* +* [MimiFAIR.jl](https://github.com/anthofflab/mimi-fair.jl/)* +* [MimiFAIR13.jl](https://github.com/FrankErrickson/MimiFAIR13.jl) +* [MimiFAIRv1_6_2.jl](https://github.com/FrankErrickson/MimiFAIRv1_6_2.jl) (currently in closed BETA) +* [MimiFAIRv2.jl](https://github.com/FrankErrickson/MimiFAIRv2.jl) * [MimiPAGE2009.jl](https://github.com/anthofflab/MimiPAGE2009.jl/)* * [MimiPAGE2020.jl](https://github.com/openmodels/MimiPAGE2020.jl)* -* [Mimi-MAGICC.jl](https://github.com/anthofflab/mimi-magicc.jl)* -* [Mimi-HECTOR.jl](https://github.com/anthofflab/mimi-hector.jl)* -* [Mimi-CIAM.jl](https://github.com/anthofflab/mimi-ciam.jl) (currently in closed BETA) -* [Mimi-BRICK.jl](https://github.com/anthofflab/mimi-brick.jl) (currently in closed BETA) +* [MimiMAGICC.jl](https://github.com/anthofflab/mimi-magicc.jl)* +* [MimiHECTOR.jl](https://github.com/anthofflab/mimi-hector.jl)* +* [MimiCIAM.jl](https://github.com/anthofflab/mimi-ciam.jl) (currently in closed BETA) +* [MimiBRICK.jl](https://github.com/raddleverse/MimiBRICK.jl) * [mimi_NICE](https://github.com/fdennig/mimi_NICE) * [AWASH](http://awashmodel.org/) * [PAGE-ICE](https://github.com/openmodels/PAGE-ICE) * [RICE+AIR](https://github.com/Environment-Research/AIR) -* [Moore-Ag.jl](https://github.com/ckingdon95/MooreAg.jl)* +* [MooreAg.jl](https://github.com/ckingdon95/MooreAg.jl)* * [MimiIWG.jl](https://github.com/rffscghg/MimiIWG.jl)* * [MimiSSPs.jl](https://github.com/anthofflab/MimiSSPs.jl) diff --git a/src/core/connections.jl b/src/core/connections.jl index e492d638a..1cdcc9ba1 100644 --- a/src/core/connections.jl +++ b/src/core/connections.jl @@ -1,6 +1,3 @@ -using LightGraphs -using MetaGraphs - """ disconnect_param!(obj::AbstractCompositeComponentDef, comp_def::AbstractComponentDef, param_name::Symbol) diff --git a/test/runtests.jl b/test/runtests.jl index ab34a2f01..05d45374f 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="master")) -Pkg.add(PackageSpec(url="https://github.com/anthofflab/MimiDICE2010.jl", rev="master")) +# 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 @@ -128,8 +128,8 @@ Electron.prep_test_env() @info("mcs/runtests.jl") @time include("mcs/runtests.jl") - @info("doctests") - @time doctest(Mimi) + # @info("doctests") + # @time doctest(Mimi) for app in Electron.applications() close(app)