Skip to content

Commit

Permalink
Merge pull request #748 from CliMA/gb/downgrade
Browse files Browse the repository at this point in the history
Update compats and add downgrade workflows
  • Loading branch information
Sbozzolo authored Sep 2, 2024
2 parents d4ae40d + e362355 commit 94f0789
Show file tree
Hide file tree
Showing 47 changed files with 91 additions and 63 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/downgrade.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Downgrade
on:
pull_request:
push:
branches:
- main
tags: '*'

# Needed to allow julia-actions/cache to delete old caches that it has created
permissions:
actions: write
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
version: ['1']
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: ${{ matrix.version }}
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-downgrade-compat@v1
with:
skip: Dates, LazyArtifacts, LinearAlgebra, Test, Statistics
- uses: julia-actions/julia-buildpkg@latest
- uses: julia-actions/julia-runtest@latest
28 changes: 13 additions & 15 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
Insolation = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8"
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
Expand All @@ -39,27 +38,26 @@ NeuralSnowExt = ["CSV", "HTTP", "Flux", "StatsBase", "cuDNN"]
[compat]
ArtifactWrappers = "0.2"
CSV = "0.10"
CUDA = "5.3"
ClimaComms = "0.5.6, 0.6"
ClimaCore = "0.13.2, 0.14"
ClimaDiagnostics = "0.2.4"
CUDA = "5.2"
ClimaComms = "0.6"
ClimaCore = "0.14"
ClimaDiagnostics = "0.2"
ClimaParams = "0.10.2"
ClimaUtilities = "0.1.2"
DataFrames = "1"
ClimaUtilities = "0.1.6"
DataFrames = "1.4"
Dates = "1"
DocStringExtensions = "0.8, 0.9"
Flux = "0.14"
DocStringExtensions = "0.9"
Flux = "0.14.0"
HTTP = "1.10"
Insolation = "0.9.2"
Interpolations = "0.15"
IntervalSets = "0.5, 0.6, 0.7"
LazyArtifacts = "1"
LinearAlgebra = "1"
NCDatasets = "0.11, 0.12, 0.13, 0.14"
SciMLBase = "1, 2"
NCDatasets = "0.13.1, 0.14"
SciMLBase = "2"
StaticArrays = "1"
StatsBase = "0.33, 0.34"
SurfaceFluxes = "0.10, 0.11"
Thermodynamics = "0.12"
StatsBase = "0.34"
SurfaceFluxes = "0.11"
Thermodynamics = "0.12.4"
cuDNN = "1"
julia = "1.9"
2 changes: 1 addition & 1 deletion experiments/benchmarks/bucket.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import SciMLBase
using Dates
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaUtilities.TimeVaryingInputs: TimeVaryingInput

import ClimaTimeSteppers as CTS
Expand Down
2 changes: 1 addition & 1 deletion experiments/benchmarks/land.jl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Precipitation data update: every timestep
import SciMLBase
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaTimeSteppers as CTS
using ClimaCore
using ClimaUtilities.ClimaArtifacts
Expand Down
2 changes: 1 addition & 1 deletion experiments/benchmarks/richards.jl
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import NCDatasets
import Interpolations

import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaUtilities.TimeVaryingInputs: TimeVaryingInput
import ClimaUtilities.SpaceVaryingInputs: SpaceVaryingInput
import ClimaUtilities.Regridders: InterpolationsRegridder
Expand Down
2 changes: 1 addition & 1 deletion experiments/integrated/fluxnet/run_fluxnet.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SciMLBase
import ClimaTimeSteppers as CTS
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using ClimaCore
import ClimaParams as CP
using Plots
Expand Down
2 changes: 1 addition & 1 deletion experiments/integrated/global/global_soil_canopy.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SciMLBase
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaTimeSteppers as CTS
using ClimaCore
using ClimaUtilities.ClimaArtifacts
Expand Down
2 changes: 1 addition & 1 deletion experiments/long_runs/land.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Atmos forcing update: every 3 hours
import SciMLBase
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaTimeSteppers as CTS
using ClimaCore
using ClimaUtilities.ClimaArtifacts
Expand Down
2 changes: 1 addition & 1 deletion experiments/long_runs/soil.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Atmos forcing update: every 3 hours
import SciMLBase
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaTimeSteppers as CTS
using ClimaCore
using ClimaUtilities.ClimaArtifacts
Expand Down
4 changes: 2 additions & 2 deletions experiments/standalone/Biogeochemistry/experiment.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SciMLBase
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaTimeSteppers as CTS
using ClimaCore
using ClimaLand
Expand Down Expand Up @@ -183,7 +183,7 @@ for (FT, tf) in ((Float32, 2 * dt), (Float64, tf))
@assert eltype(sol.u[end].soilco2) == FT

# Animation
# You will need to ]add GLMakie to your base Julia Project.toml
# You will need to ]add GlMakie to your base Julia Project.toml
#=
if FT == Float64
using GLMakie
Expand Down
2 changes: 1 addition & 1 deletion experiments/standalone/Bucket/bucket_era5.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# surface temperature, evaporation, and surface energy flux.
import SciMLBase
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using Dates
using DelimitedFiles
using Statistics
Expand Down
2 changes: 1 addition & 1 deletion experiments/standalone/Bucket/global_bucket_function.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import SciMLBase
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using CairoMakie
using Dates
using DelimitedFiles
Expand Down
2 changes: 1 addition & 1 deletion experiments/standalone/Bucket/global_bucket_temporalmap.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import SciMLBase
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using CairoMakie
using Dates
using DelimitedFiles
Expand Down
2 changes: 1 addition & 1 deletion experiments/standalone/Soil/richards_comparison.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using Plots
using DelimitedFiles
using Statistics
Expand Down
2 changes: 1 addition & 1 deletion experiments/standalone/Soil/richards_runoff.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using CairoMakie
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using Statistics
using Dates
import SciMLBase
Expand Down
2 changes: 1 addition & 1 deletion experiments/standalone/Soil/water_conservation.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using ClimaCore
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import SciMLBase
import ClimaTimeSteppers as CTS
using Plots
Expand Down
2 changes: 1 addition & 1 deletion experiments/standalone/Soil/water_energy_conservation.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using ClimaCore
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import SciMLBase
import ClimaTimeSteppers as CTS
using Plots
Expand Down
1 change: 0 additions & 1 deletion src/shared_utilities/Domains.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module Domains
using ClimaCore
using ClimaComms
using IntervalSets
using DocStringExtensions

import ClimaCore: Meshes, Spaces, Topologies, Geometry
Expand Down
3 changes: 0 additions & 3 deletions test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,9 @@ Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
[compat]
Aqua = "0.8"
BSON = "0.3"
CSV = "0.10"
DataFrames = "1.6"
DelimitedFiles = "1"
HTTP = "1.10"
NLsolve = "4.5"
SafeTestsets = "0.1"
StatsBase = "0.34"
Test = "1"
Thermodynamics = "0.12"
2 changes: 1 addition & 1 deletion test/integrated/lsms.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaLand:
name,
prognostic_types,
Expand Down
2 changes: 1 addition & 1 deletion test/integrated/pond_soil_lsm.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using ClimaCore
using ClimaLand
using ClimaLand.Domains: HybridBox, Column, obtain_surface_domain
Expand Down
2 changes: 1 addition & 1 deletion test/integrated/soil_canopy_lsm.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using ClimaCore
using ClimaLand
using ClimaLand.Soil
Expand Down
2 changes: 1 addition & 1 deletion test/integrated/soil_energy_hydrology_biogeochemistry.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using ClimaCore
import ClimaParams
using ClimaLand
Expand Down
2 changes: 1 addition & 1 deletion test/shared_utilities/domains.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using ClimaCore
using Test
using ClimaLand
Expand Down
2 changes: 1 addition & 1 deletion test/shared_utilities/drivers.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaLand.Parameters as LP
using ClimaCore
using Test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using LinearAlgebra
import ClimaCore: MatrixFields
import ClimaParams as CP
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using LinearAlgebra
import ClimaCore: MatrixFields
import ClimaParams as CP
Expand Down
2 changes: 1 addition & 1 deletion test/shared_utilities/utilities.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using ClimaCore: Spaces, Geometry, Fields
import ClimaComms
using ClimaLand
Expand Down
2 changes: 1 addition & 1 deletion test/shared_utilities/variable_types.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using ClimaCore
using Test
using StaticArrays
Expand Down
2 changes: 1 addition & 1 deletion test/standalone/Bucket/albedo_types.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends

using ClimaUtilities.TimeManager
using ClimaUtilities.DataHandling
Expand Down
2 changes: 1 addition & 1 deletion test/standalone/Bucket/snow_bucket_tests.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends

using Statistics

Expand Down
2 changes: 1 addition & 1 deletion test/standalone/Bucket/soil_bucket_tests.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends

using Dates
using Statistics
Expand Down
2 changes: 1 addition & 1 deletion test/standalone/Snow/snow.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaParams as CP
import ClimaUtilities.TimeVaryingInputs: TimeVaryingInput
using Thermodynamics
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using Dates
import ClimaParams as CP
using ClimaCore
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaParams as CP
using ClimaLand.Soil.Biogeochemistry

Expand Down
2 changes: 1 addition & 1 deletion test/standalone/Soil/climate_drivers.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using ClimaCore
import ClimaParams as CP
using Thermodynamics
Expand Down
2 changes: 1 addition & 1 deletion test/standalone/Soil/runoff.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaUtilities
import ClimaUtilities.TimeVaryingInputs: TimeVaryingInput
using ClimaLand
Expand Down
2 changes: 1 addition & 1 deletion test/standalone/Soil/soil_bc.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
using Statistics
using ClimaCore
import ClimaParams
Expand Down
2 changes: 1 addition & 1 deletion test/standalone/Soil/soil_parameterizations.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Test
import ClimaComms
@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends
ClimaComms.@import_required_backends
import ClimaParams as CP
using ClimaLand.Soil
import ClimaLand
Expand Down
Loading

0 comments on commit 94f0789

Please sign in to comment.