From 56f558bc24e310313ef94dc19f32b5a945514a75 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 16 Sep 2024 14:01:21 +0100 Subject: [PATCH 1/7] comment out NetCDF pkg from Julia installation --- esmvaltool/install/Julia/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esmvaltool/install/Julia/Project.toml b/esmvaltool/install/Julia/Project.toml index fb8d18f537..42914795bb 100644 --- a/esmvaltool/install/Julia/Project.toml +++ b/esmvaltool/install/Julia/Project.toml @@ -3,7 +3,7 @@ ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63" Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -NetCDF = "30363a11-5582-574a-97bb-aa9a979735b9" +# NetCDF = "30363a11-5582-574a-97bb-aa9a979735b9" PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0" PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" RainFARM = "e9a4e08f-a0a3-5224-a821-6d0231c12d6b" From 91d0762c0fc1f7b8467f68ea9adc77f75a9630a1 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 16 Sep 2024 14:16:00 +0100 Subject: [PATCH 2/7] run a GA test --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f3822e5449..a012fbfcdf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,6 +6,7 @@ on: push: branches: - main + - commentout_netcdf_julia_projecttoml schedule: - cron: '0 0 * * *' From 29ef1012cdee28201fc17b30c41846ee85c26561 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 16 Sep 2024 14:34:25 +0100 Subject: [PATCH 3/7] comment out RainFarm too --- esmvaltool/install/Julia/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esmvaltool/install/Julia/Project.toml b/esmvaltool/install/Julia/Project.toml index 42914795bb..1d6caba975 100644 --- a/esmvaltool/install/Julia/Project.toml +++ b/esmvaltool/install/Julia/Project.toml @@ -6,6 +6,6 @@ JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" # NetCDF = "30363a11-5582-574a-97bb-aa9a979735b9" PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0" PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" -RainFARM = "e9a4e08f-a0a3-5224-a821-6d0231c12d6b" +# RainFARM = "e9a4e08f-a0a3-5224-a821-6d0231c12d6b" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6" From 71419c2ea46a1f502d82496d424122b7a148b3b8 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 16 Sep 2024 14:50:20 +0100 Subject: [PATCH 4/7] try use latest Julia --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 54aa73bcf0..08305c9cad 100644 --- a/environment.yml +++ b/environment.yml @@ -134,4 +134,4 @@ dependencies: - r-styler ==1.10.3 # Julia (dependencies installed by separate script) - - julia + - julia >=1.10.4 From d722102971d755fb35c45af1e6e2a58c813d1fce Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 16 Sep 2024 14:54:58 +0100 Subject: [PATCH 5/7] pin Python --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 08305c9cad..2bd956cac3 100644 --- a/environment.yml +++ b/environment.yml @@ -51,7 +51,7 @@ dependencies: - psy-simple - pyproj >=2.1 - pys2index # only from conda-forge - - python >=3.10 + - python >=3.10, <3.12 - python-cdo - python-dateutil - pyyaml From b16a5ae8a3b8900bb06f3394b535c88c5dfad492 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 16 Sep 2024 15:01:20 +0100 Subject: [PATCH 6/7] unpin Python and Julia --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 2bd956cac3..54aa73bcf0 100644 --- a/environment.yml +++ b/environment.yml @@ -51,7 +51,7 @@ dependencies: - psy-simple - pyproj >=2.1 - pys2index # only from conda-forge - - python >=3.10, <3.12 + - python >=3.10 - python-cdo - python-dateutil - pyyaml @@ -134,4 +134,4 @@ dependencies: - r-styler ==1.10.3 # Julia (dependencies installed by separate script) - - julia >=1.10.4 + - julia From 6450c7954630c47a3818155eceeaac8fe88204da Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 16 Sep 2024 15:18:24 +0100 Subject: [PATCH 7/7] comment out some more Julia pkgs --- esmvaltool/install/Julia/Project.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esmvaltool/install/Julia/Project.toml b/esmvaltool/install/Julia/Project.toml index 1d6caba975..4f2c622904 100644 --- a/esmvaltool/install/Julia/Project.toml +++ b/esmvaltool/install/Julia/Project.toml @@ -1,6 +1,6 @@ [deps] -ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63" -Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" +# ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63" +# Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" # NetCDF = "30363a11-5582-574a-97bb-aa9a979735b9"