Skip to content

Commit

Permalink
Merge pull request #117 from gaelforget/v0p3p3b_dev
Browse files Browse the repository at this point in the history
V0p3p3b dev
  • Loading branch information
gaelforget authored Jun 2, 2024
2 parents 060ed49 + 517fe03 commit d8b05cc
Show file tree
Hide file tree
Showing 11 changed files with 816 additions and 1,039 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.6' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
- '1.9' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
- '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
os:
- ubuntu-latest
Expand All @@ -41,6 +41,13 @@ jobs:
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/julia-buildpkg@v1
- run: |
julia --project=test -e '
using Pkg
Pkg.instantiate()
ENV["PYTHON"]=""
Pkg.build("PyCall")
'
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
Expand All @@ -58,7 +65,9 @@ jobs:
julia --project=docs -e '
using Pkg
Pkg.develop(PackageSpec(path=pwd()))
Pkg.instantiate()'
Pkg.instantiate()
ENV["PYTHON"]=""
Pkg.build("PyCall")'
- run: sudo apt-get update
- run: sudo apt-get install libnetcdf-dev
- run: sudo apt-get install libnetcdff-dev
Expand Down
12 changes: 11 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,20 @@ TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

[weakdeps]
Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"

[extensions]
ClimateModelsCondaExt = ["Conda"]
ClimateModelsPyCallExt = ["PyCall"]

[compat]
CSV = "0.6, 0.7, 0.8, 0.9, 0.10"
Conda = "1"
DataFrames = "1"
Git = "1"
OrderedCollections = "1"
PyCall = "1"
Suppressor = "0.2"
julia = "^1.6"
julia = "^1.9"
6 changes: 5 additions & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
using Documenter, ClimateModels, CairoMakie, Pkg
import PlutoSliderServer
import PlutoSliderServer, PyCall, Conda

Pkg.precompile()

ClimateModels.conda(:fair)
ClimateModels.pyimport(:fair)

lst=("defaults.jl","Hector.jl","FaIR.jl","Oceananigans.jl","RandomWalker.jl",
"ShallowWaters.jl","MITgcm.jl","Speedy.jl","CMIP6.jl","IPCC.jl")

Expand Down
Loading

0 comments on commit d8b05cc

Please sign in to comment.