Skip to content
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.

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

Update CI jobs and documentation build to Julia-1.11 #282

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
2 changes: 1 addition & 1 deletion .github/workflows/debug_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: '1.10'
version: '1.11'
arch: x64
- uses: julia-actions/cache@v2
- name: Debug test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: '1.10'
version: '1.11'
- uses: julia-actions/cache@v2
- name: Install dependencies
run: |
Expand All @@ -33,7 +33,7 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: '1.10'
version: '1.11'
- name: Install dependencies
run: |
# Version 3.9.0 of matplotlib causes an error with PyPlot.jl, so pin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: '1.10'
version: '1.11'
- uses: julia-actions/cache@v2
- name: Test examples
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/longtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: '1.10'
version: '1.11'
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-buildpkg@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/parallel_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: '1.10'
version: '1.11'
arch: x64
- uses: julia-actions/cache@v2
- run: |
Expand All @@ -43,7 +43,7 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: '1.10'
version: '1.11'
- uses: julia-actions/cache@v2
- run: |
touch Project.toml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: '1.10'
version: '1.11'
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-buildpkg@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: '1.10'
version: '1.11'
- uses: julia-actions/cache@v2
- name: Test test_scripts
run: |
Expand Down
11 changes: 8 additions & 3 deletions docs/Project.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
[deps]
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
makie_post_processing = "4dd1b173-c370-4c56-9cc2-d797e41ae9f0"
moment_kinetics = "b5ff72cc-06fc-4161-ad14-dba1c22ed34e"
plots_post_processing = "c3e9b6e6-652c-46aa-9ac0-1bc582aad122"

[compat]
Documenter = "0.27"
[sources.makie_post_processing]
path = "../makie_post_processing/makie_post_processing"

[sources.moment_kinetics]
path = "../moment_kinetics/"

[sources.plots_post_processing]
path = "../plots_post_processing/plots_post_processing"
27 changes: 12 additions & 15 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
using Pkg

repo_dir = dirname(dirname(@__FILE__))
Pkg.develop([PackageSpec(path=joinpath(repo_dir, "moment_kinetics")),
PackageSpec(path=joinpath(repo_dir, "makie_post_processing", "makie_post_processing")),
PackageSpec(path=joinpath(repo_dir, "plots_post_processing", "plots_post_processing"))])
Pkg.instantiate()

using Documenter
using Documenter, UUIDs
using moment_kinetics, makie_post_processing, plots_post_processing

if get(ENV, "CI", nothing) == "true"
# On the CI, run in strict mode to turn warnings into errors, so that we don't deploy
# documentation with formatting bugs.
strict = true
else
strict = false
end

makedocs(
sitename = "moment_kinetics",
format = Documenter.HTML(prettyurls = get(ENV, "CI", nothing) == "true"),
format = Documenter.HTML(prettyurls = get(ENV, "CI", nothing) == "true",
size_threshold = 1000000,
size_threshold_warn = 500000,
# Use the following horrible incantation to get the version
# of moment_kinetics. moment_kinetics is the package with the
# UUID being used here. We need to do this because the
# Project.toml in the top-level directory is user-generated
# and does not have a version, but this is the Project.toml
# that would be used by default by Documenter.jl.
inventory_version = Pkg.dependencies()[UUID("b5ff72cc-06fc-4161-ad14-dba1c22ed34e")].version,
),
modules = [moment_kinetics, makie_post_processing, plots_post_processing],
strict = strict,
)

if get(ENV, "CI", nothing) == "true"
Expand Down
2 changes: 1 addition & 1 deletion moment_kinetics/test/calculus_tests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ function runtests()
# something like p*(round-off) for x^p (?) so error on expected_df would
# be p*p*(round-off), or plausibly 1024*(round-off), so tolerance of
# 2e-11 isn't unreasonable.
@test isapprox(df, expected_df, rtol=2.0e-11, atol=6.0e-12,
@test isapprox(df, expected_df, rtol=3.0e-11, atol=6.0e-12,
norm=maxabs_norm)
end
end
Expand Down
Loading