From e362355e9ef18edda44a197568a76a5649321fb3 Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Sun, 1 Sep 2024 16:09:23 -0700 Subject: [PATCH] Update compats and add downgrade workflows ClimaLand was falsely advertising compatibility with packages that are not really compatible. This commit updates the minimum bounds of the compats to reflect that. I also added a GitHub action workflow to check on that. --- .github/workflows/downgrade.yml | 34 +++++++++++++++++++ Project.toml | 28 +++++++-------- experiments/benchmarks/bucket.jl | 2 +- experiments/benchmarks/land.jl | 2 +- experiments/benchmarks/richards.jl | 2 +- experiments/integrated/fluxnet/run_fluxnet.jl | 2 +- .../integrated/global/global_soil_canopy.jl | 2 +- experiments/long_runs/land.jl | 2 +- experiments/long_runs/soil.jl | 2 +- .../standalone/Biogeochemistry/experiment.jl | 4 +-- experiments/standalone/Bucket/bucket_era5.jl | 2 +- .../Bucket/global_bucket_function.jl | 2 +- .../Bucket/global_bucket_temporalmap.jl | 2 +- .../standalone/Soil/richards_comparison.jl | 2 +- .../standalone/Soil/richards_runoff.jl | 2 +- .../standalone/Soil/water_conservation.jl | 2 +- .../Soil/water_energy_conservation.jl | 2 +- src/shared_utilities/Domains.jl | 1 - test/Project.toml | 3 -- test/integrated/lsms.jl | 2 +- test/integrated/pond_soil_lsm.jl | 2 +- test/integrated/soil_canopy_lsm.jl | 2 +- .../soil_energy_hydrology_biogeochemistry.jl | 2 +- test/shared_utilities/domains.jl | 2 +- test/shared_utilities/drivers.jl | 2 +- .../energy_hydrology_model.jl | 2 +- .../implicit_timestepping/richards_model.jl | 2 +- test/shared_utilities/utilities.jl | 2 +- test/shared_utilities/variable_types.jl | 2 +- test/standalone/Bucket/albedo_types.jl | 2 +- test/standalone/Bucket/snow_bucket_tests.jl | 2 +- test/standalone/Bucket/soil_bucket_tests.jl | 2 +- test/standalone/Snow/snow.jl | 2 +- .../Biogeochemistry/biogeochemistry_module.jl | 2 +- .../Biogeochemistry/co2_parameterizations.jl | 2 +- test/standalone/Soil/climate_drivers.jl | 2 +- test/standalone/Soil/runoff.jl | 2 +- test/standalone/Soil/soil_bc.jl | 2 +- .../standalone/Soil/soil_parameterizations.jl | 2 +- test/standalone/Soil/soil_test_3d.jl | 2 +- test/standalone/Soil/soiltest.jl | 2 +- test/standalone/SurfaceWater/pond_test.jl | 2 +- test/standalone/Vegetation/canopy_model.jl | 2 +- .../Vegetation/plant_hydraulics_test.jl | 2 +- .../test_bigleaf_parameterizations.jl | 2 +- test/standalone/Vegetation/test_pfts.jl | 2 +- test/standalone/Vegetation/test_two_stream.jl | 2 +- 47 files changed, 91 insertions(+), 63 deletions(-) create mode 100644 .github/workflows/downgrade.yml diff --git a/.github/workflows/downgrade.yml b/.github/workflows/downgrade.yml new file mode 100644 index 0000000000..493aec095c --- /dev/null +++ b/.github/workflows/downgrade.yml @@ -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 diff --git a/Project.toml b/Project.toml index 2764ea45c4..7ca60f41a9 100644 --- a/Project.toml +++ b/Project.toml @@ -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" @@ -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" diff --git a/experiments/benchmarks/bucket.jl b/experiments/benchmarks/bucket.jl index 0985d70a14..c62fc7d96a 100644 --- a/experiments/benchmarks/bucket.jl +++ b/experiments/benchmarks/bucket.jl @@ -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 diff --git a/experiments/benchmarks/land.jl b/experiments/benchmarks/land.jl index 85368220be..eae8aa3beb 100644 --- a/experiments/benchmarks/land.jl +++ b/experiments/benchmarks/land.jl @@ -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 diff --git a/experiments/benchmarks/richards.jl b/experiments/benchmarks/richards.jl index c2b15f0a84..b778c225bf 100644 --- a/experiments/benchmarks/richards.jl +++ b/experiments/benchmarks/richards.jl @@ -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 diff --git a/experiments/integrated/fluxnet/run_fluxnet.jl b/experiments/integrated/fluxnet/run_fluxnet.jl index 1dfc7cd645..caf0cd05f0 100644 --- a/experiments/integrated/fluxnet/run_fluxnet.jl +++ b/experiments/integrated/fluxnet/run_fluxnet.jl @@ -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 diff --git a/experiments/integrated/global/global_soil_canopy.jl b/experiments/integrated/global/global_soil_canopy.jl index d56e48d9d7..86baac684b 100644 --- a/experiments/integrated/global/global_soil_canopy.jl +++ b/experiments/integrated/global/global_soil_canopy.jl @@ -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 diff --git a/experiments/long_runs/land.jl b/experiments/long_runs/land.jl index 3fd0a5dabe..9399b3d51e 100644 --- a/experiments/long_runs/land.jl +++ b/experiments/long_runs/land.jl @@ -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 diff --git a/experiments/long_runs/soil.jl b/experiments/long_runs/soil.jl index e636e22d38..f0550f9499 100644 --- a/experiments/long_runs/soil.jl +++ b/experiments/long_runs/soil.jl @@ -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 diff --git a/experiments/standalone/Biogeochemistry/experiment.jl b/experiments/standalone/Biogeochemistry/experiment.jl index 5df25a8df8..8d36a9f43e 100644 --- a/experiments/standalone/Biogeochemistry/experiment.jl +++ b/experiments/standalone/Biogeochemistry/experiment.jl @@ -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 @@ -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 diff --git a/experiments/standalone/Bucket/bucket_era5.jl b/experiments/standalone/Bucket/bucket_era5.jl index 11a1b07331..d76ab40de6 100644 --- a/experiments/standalone/Bucket/bucket_era5.jl +++ b/experiments/standalone/Bucket/bucket_era5.jl @@ -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 diff --git a/experiments/standalone/Bucket/global_bucket_function.jl b/experiments/standalone/Bucket/global_bucket_function.jl index b13656107e..71317c020d 100644 --- a/experiments/standalone/Bucket/global_bucket_function.jl +++ b/experiments/standalone/Bucket/global_bucket_function.jl @@ -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 diff --git a/experiments/standalone/Bucket/global_bucket_temporalmap.jl b/experiments/standalone/Bucket/global_bucket_temporalmap.jl index 1616a81df0..d73d590ddb 100644 --- a/experiments/standalone/Bucket/global_bucket_temporalmap.jl +++ b/experiments/standalone/Bucket/global_bucket_temporalmap.jl @@ -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 diff --git a/experiments/standalone/Soil/richards_comparison.jl b/experiments/standalone/Soil/richards_comparison.jl index 5ee3196008..9055a21269 100644 --- a/experiments/standalone/Soil/richards_comparison.jl +++ b/experiments/standalone/Soil/richards_comparison.jl @@ -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 diff --git a/experiments/standalone/Soil/richards_runoff.jl b/experiments/standalone/Soil/richards_runoff.jl index 91b980afcc..9f8ca9bf17 100644 --- a/experiments/standalone/Soil/richards_runoff.jl +++ b/experiments/standalone/Soil/richards_runoff.jl @@ -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 diff --git a/experiments/standalone/Soil/water_conservation.jl b/experiments/standalone/Soil/water_conservation.jl index db9b68094f..4e1e41ca7f 100644 --- a/experiments/standalone/Soil/water_conservation.jl +++ b/experiments/standalone/Soil/water_conservation.jl @@ -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 diff --git a/experiments/standalone/Soil/water_energy_conservation.jl b/experiments/standalone/Soil/water_energy_conservation.jl index 1d296fe2f4..dca6df0e45 100644 --- a/experiments/standalone/Soil/water_energy_conservation.jl +++ b/experiments/standalone/Soil/water_energy_conservation.jl @@ -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 diff --git a/src/shared_utilities/Domains.jl b/src/shared_utilities/Domains.jl index 5bc5ce751d..76e5d5654f 100644 --- a/src/shared_utilities/Domains.jl +++ b/src/shared_utilities/Domains.jl @@ -1,7 +1,6 @@ module Domains using ClimaCore using ClimaComms -using IntervalSets using DocStringExtensions import ClimaCore: Meshes, Spaces, Topologies, Geometry diff --git a/test/Project.toml b/test/Project.toml index 03175b535e..1c5efc4c30 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -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" diff --git a/test/integrated/lsms.jl b/test/integrated/lsms.jl index 28d86b37b5..079e71caac 100644 --- a/test/integrated/lsms.jl +++ b/test/integrated/lsms.jl @@ -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, diff --git a/test/integrated/pond_soil_lsm.jl b/test/integrated/pond_soil_lsm.jl index 36efcbbdff..f1fa61dd7c 100644 --- a/test/integrated/pond_soil_lsm.jl +++ b/test/integrated/pond_soil_lsm.jl @@ -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 diff --git a/test/integrated/soil_canopy_lsm.jl b/test/integrated/soil_canopy_lsm.jl index 54bd63e07f..dac0cdad03 100644 --- a/test/integrated/soil_canopy_lsm.jl +++ b/test/integrated/soil_canopy_lsm.jl @@ -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 diff --git a/test/integrated/soil_energy_hydrology_biogeochemistry.jl b/test/integrated/soil_energy_hydrology_biogeochemistry.jl index 8ad122aba7..c4957aaf6d 100644 --- a/test/integrated/soil_energy_hydrology_biogeochemistry.jl +++ b/test/integrated/soil_energy_hydrology_biogeochemistry.jl @@ -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 diff --git a/test/shared_utilities/domains.jl b/test/shared_utilities/domains.jl index baa69b0bb3..66db30e853 100644 --- a/test/shared_utilities/domains.jl +++ b/test/shared_utilities/domains.jl @@ -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 diff --git a/test/shared_utilities/drivers.jl b/test/shared_utilities/drivers.jl index bc75662a67..aab8249b7a 100644 --- a/test/shared_utilities/drivers.jl +++ b/test/shared_utilities/drivers.jl @@ -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 diff --git a/test/shared_utilities/implicit_timestepping/energy_hydrology_model.jl b/test/shared_utilities/implicit_timestepping/energy_hydrology_model.jl index 1786854164..0794108ebe 100644 --- a/test/shared_utilities/implicit_timestepping/energy_hydrology_model.jl +++ b/test/shared_utilities/implicit_timestepping/energy_hydrology_model.jl @@ -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 diff --git a/test/shared_utilities/implicit_timestepping/richards_model.jl b/test/shared_utilities/implicit_timestepping/richards_model.jl index 4dda6ae449..60c04d999e 100644 --- a/test/shared_utilities/implicit_timestepping/richards_model.jl +++ b/test/shared_utilities/implicit_timestepping/richards_model.jl @@ -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 diff --git a/test/shared_utilities/utilities.jl b/test/shared_utilities/utilities.jl index df6a2e663d..e44fbe8a16 100644 --- a/test/shared_utilities/utilities.jl +++ b/test/shared_utilities/utilities.jl @@ -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 diff --git a/test/shared_utilities/variable_types.jl b/test/shared_utilities/variable_types.jl index 88ce05cea1..06b2b2e9ee 100644 --- a/test/shared_utilities/variable_types.jl +++ b/test/shared_utilities/variable_types.jl @@ -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 diff --git a/test/standalone/Bucket/albedo_types.jl b/test/standalone/Bucket/albedo_types.jl index 870a878760..651558d6ba 100644 --- a/test/standalone/Bucket/albedo_types.jl +++ b/test/standalone/Bucket/albedo_types.jl @@ -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 diff --git a/test/standalone/Bucket/snow_bucket_tests.jl b/test/standalone/Bucket/snow_bucket_tests.jl index 6ea2518eec..f991a76dc8 100644 --- a/test/standalone/Bucket/snow_bucket_tests.jl +++ b/test/standalone/Bucket/snow_bucket_tests.jl @@ -1,6 +1,6 @@ using Test import ClimaComms -@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends +ClimaComms.@import_required_backends using Statistics diff --git a/test/standalone/Bucket/soil_bucket_tests.jl b/test/standalone/Bucket/soil_bucket_tests.jl index 7bc0301d2c..59c04a9866 100644 --- a/test/standalone/Bucket/soil_bucket_tests.jl +++ b/test/standalone/Bucket/soil_bucket_tests.jl @@ -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 diff --git a/test/standalone/Snow/snow.jl b/test/standalone/Snow/snow.jl index 17668b62c3..8c486649d7 100644 --- a/test/standalone/Snow/snow.jl +++ b/test/standalone/Snow/snow.jl @@ -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 diff --git a/test/standalone/Soil/Biogeochemistry/biogeochemistry_module.jl b/test/standalone/Soil/Biogeochemistry/biogeochemistry_module.jl index 29bbc1ac6e..e77ab88ffe 100644 --- a/test/standalone/Soil/Biogeochemistry/biogeochemistry_module.jl +++ b/test/standalone/Soil/Biogeochemistry/biogeochemistry_module.jl @@ -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 diff --git a/test/standalone/Soil/Biogeochemistry/co2_parameterizations.jl b/test/standalone/Soil/Biogeochemistry/co2_parameterizations.jl index 38fa487577..cbae8398d9 100644 --- a/test/standalone/Soil/Biogeochemistry/co2_parameterizations.jl +++ b/test/standalone/Soil/Biogeochemistry/co2_parameterizations.jl @@ -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 diff --git a/test/standalone/Soil/climate_drivers.jl b/test/standalone/Soil/climate_drivers.jl index a44f515a3c..15ca894c8d 100644 --- a/test/standalone/Soil/climate_drivers.jl +++ b/test/standalone/Soil/climate_drivers.jl @@ -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 diff --git a/test/standalone/Soil/runoff.jl b/test/standalone/Soil/runoff.jl index ca44efec67..c77ed2479e 100644 --- a/test/standalone/Soil/runoff.jl +++ b/test/standalone/Soil/runoff.jl @@ -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 diff --git a/test/standalone/Soil/soil_bc.jl b/test/standalone/Soil/soil_bc.jl index 549408169a..051ed12119 100644 --- a/test/standalone/Soil/soil_bc.jl +++ b/test/standalone/Soil/soil_bc.jl @@ -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 diff --git a/test/standalone/Soil/soil_parameterizations.jl b/test/standalone/Soil/soil_parameterizations.jl index b9d150c44e..277febf370 100644 --- a/test/standalone/Soil/soil_parameterizations.jl +++ b/test/standalone/Soil/soil_parameterizations.jl @@ -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 diff --git a/test/standalone/Soil/soil_test_3d.jl b/test/standalone/Soil/soil_test_3d.jl index 3ba3c2230a..8a924995f9 100644 --- a/test/standalone/Soil/soil_test_3d.jl +++ b/test/standalone/Soil/soil_test_3d.jl @@ -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 as CP diff --git a/test/standalone/Soil/soiltest.jl b/test/standalone/Soil/soiltest.jl index f84b38c1df..e51e9a1053 100644 --- a/test/standalone/Soil/soiltest.jl +++ b/test/standalone/Soil/soiltest.jl @@ -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 as CP diff --git a/test/standalone/SurfaceWater/pond_test.jl b/test/standalone/SurfaceWater/pond_test.jl index a6a30480cb..fa715dd99a 100644 --- a/test/standalone/SurfaceWater/pond_test.jl +++ b/test/standalone/SurfaceWater/pond_test.jl @@ -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 diff --git a/test/standalone/Vegetation/canopy_model.jl b/test/standalone/Vegetation/canopy_model.jl index e71edc13c7..ed5e278195 100644 --- a/test/standalone/Vegetation/canopy_model.jl +++ b/test/standalone/Vegetation/canopy_model.jl @@ -1,7 +1,7 @@ using Test import ClimaParams import ClimaComms -@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends +ClimaComms.@import_required_backends using ClimaCore using Thermodynamics using Dates diff --git a/test/standalone/Vegetation/plant_hydraulics_test.jl b/test/standalone/Vegetation/plant_hydraulics_test.jl index d99c9ea1d2..2671e84234 100644 --- a/test/standalone/Vegetation/plant_hydraulics_test.jl +++ b/test/standalone/Vegetation/plant_hydraulics_test.jl @@ -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 NLsolve using ClimaCore diff --git a/test/standalone/Vegetation/test_bigleaf_parameterizations.jl b/test/standalone/Vegetation/test_bigleaf_parameterizations.jl index e60f4c0e1f..a5e5e69a23 100644 --- a/test/standalone/Vegetation/test_bigleaf_parameterizations.jl +++ b/test/standalone/Vegetation/test_bigleaf_parameterizations.jl @@ -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.Canopy diff --git a/test/standalone/Vegetation/test_pfts.jl b/test/standalone/Vegetation/test_pfts.jl index 7435571cd3..82b9ce8e54 100644 --- a/test/standalone/Vegetation/test_pfts.jl +++ b/test/standalone/Vegetation/test_pfts.jl @@ -6,7 +6,7 @@ on percentage PFT cover works as expected. using Test import ClimaComms -@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends +ClimaComms.@import_required_backends import ClimaLand using ClimaLand.Canopy diff --git a/test/standalone/Vegetation/test_two_stream.jl b/test/standalone/Vegetation/test_two_stream.jl index 20bbe4754d..6b7e6cdf9e 100644 --- a/test/standalone/Vegetation/test_two_stream.jl +++ b/test/standalone/Vegetation/test_two_stream.jl @@ -8,7 +8,7 @@ using Test using ClimaLand import ClimaComms -@static pkgversion(ClimaComms) >= v"0.6" && ClimaComms.@import_required_backends +ClimaComms.@import_required_backends using ClimaLand.Canopy using DelimitedFiles using ArtifactWrappers