Skip to content

Adjust to new min Julia version of 1.4 #729

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 1 commit into from
Jul 3, 2020
Merged

Adjust to new min Julia version of 1.4 #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/dependencytest-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
julia-version: [1.2, 1.3]
julia-version: [1.4]
julia-arch: [x64, x86]
os: [ubuntu-latest, windows-latest, macOS-latest]
exclude:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/tutorials/tutorial_2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This tutorial walks through the steps to download, run, and view the output of a

Working through the following tutorial will require:

- [Julia v1.2.0](https://julialang.org/downloads/) or higher
- [Julia v1.4.0](https://julialang.org/downloads/) or higher
- [Mimi v0.10.0](https://github.com/mimiframework/Mimi.jl) or higher
- connection of your julia installation with the central Mimi registry of Mimi models

Expand Down
2 changes: 1 addition & 1 deletion docs/src/tutorials/tutorial_3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This tutorial walks through the steps to modify an existing model. There are se

Working through the following tutorial will require:

- [Julia v1.2.0](https://julialang.org/downloads/) or higher
- [Julia v1.4.0](https://julialang.org/downloads/) or higher
- [Mimi v0.10.0](https://github.com/mimiframework/Mimi.jl) or higher
- connection of your julia installation with the central Mimi registry of Mimi models

Expand Down
2 changes: 1 addition & 1 deletion docs/src/tutorials/tutorial_4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ While we will walk through the code step by step below, the full code for implem

Working through the following tutorial will require:

- [Julia v1.2.0](https://julialang.org/downloads/) or higher
- [Julia v1.4.0](https://julialang.org/downloads/) or higher
- [Mimi v0.10.0](https://github.com/mimiframework/Mimi.jl) or higher

If you have not yet prepared these, go back to the main tutorial page and follow the instructions for their download.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/tutorials/tutorial_5.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This tutorial walks through the sensitivity analysis (SA) functionality of Mimi,

Working through the following tutorial will require:

- [Julia v1.2.0](https://julialang.org/downloads/) or higher
- [Julia v1.4.0](https://julialang.org/downloads/) or higher
- [Mimi v0.10.0](https://github.com/mimiframework/Mimi.jl) or higher

If you have not yet prepared these, go back to the main tutorial page and follow the instructions for their download.
Expand Down
7 changes: 1 addition & 6 deletions test/test_components.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,7 @@ add_comp!(my_model, testcomp1)
# Testing to catch if before or after does not exist
@test_throws ErrorException add_comp!(my_model, testcomp2, before=:testcomp3)

# ArgumentError in v1.0-v1.2, ErrorException in v1.3
if(VERSION < v"1.3.0")
@test_throws ArgumentError add_comp!(my_model, testcomp2, after=:testcomp3)
else
@test_throws ErrorException add_comp!(my_model, testcomp2, after=:testcomp3)
end
@test_throws ErrorException add_comp!(my_model, testcomp2, after=:testcomp3)

# Add more components to model
add_comp!(my_model, testcomp2)
Expand Down
7 changes: 1 addition & 6 deletions test/test_model_structure_variabletimestep.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,7 @@ last_A = 2150
m = Model()
set_dimension!(m, :time, years)

# ArgumentError in v1.0-v1.2, ErrorException in v1.3
if(VERSION < v"1.3.0")
@test_throws ArgumentError add_comp!(m, A, after=:B)
else
@test_throws ErrorException add_comp!(m, A, after=:B)
end
@test_throws ErrorException add_comp!(m, A, after=:B)

add_comp!(m, A)

Expand Down
15 changes: 6 additions & 9 deletions test/test_timesteparrays.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,15 +611,12 @@ y_mat = TimestepMatrix{VariableTimestep{y_years}, Int, 1}(time_dim_val[:,:,2])

@test eltype(x_vec) == eltype(y_vec) == eltype(y_vec) == eltype(y_mat) == eltype(time_dim_val)

# TODO begin syntax is depreacated v1.0.0 - v1.3.0, so enable the tests after
# after we disable Julia versions below v1.4.0

# @test x_vec[begin] == time_dim_val[:,1,1][begin]
# @test x_mat[begin,1] == time_dim_val[:,:,1][begin,1]
# @test x_mat[begin,2] == time_dim_val[:,:,1][begin,2]
# @test y_vec[begin] == time_dim_val[:,2,2][begin]
# @test y_mat[begin,1] == time_dim_val[:,:,2][begin,1]
# @test y_mat[begin,2] == time_dim_val[:,:,2][begin,2]
@test x_vec[begin] == time_dim_val[:,1,1][begin]
@test x_mat[begin,1] == time_dim_val[:,:,1][begin,1]
@test x_mat[begin,2] == time_dim_val[:,:,1][begin,2]
@test y_vec[begin] == time_dim_val[:,2,2][begin]
@test y_mat[begin,1] == time_dim_val[:,:,2][begin,1]
@test y_mat[begin,2] == time_dim_val[:,:,2][begin,2]

@test x_vec[end] == time_dim_val[:,1,1][end]
@test x_mat[end,1] == time_dim_val[:,:,1][end,1]
Expand Down