Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
9f4020a
temp remove all calls to Julia from GHA
valeriupredoi Feb 20, 2025
8e2cf66
remove Julia from env
valeriupredoi Feb 20, 2025
31b81cb
run a GHA
valeriupredoi Feb 20, 2025
ec50d2a
use new esmvalcore RC1 and unpin pandas
valeriupredoi Feb 20, 2025
dd494d9
temp remove ncl
valeriupredoi Feb 20, 2025
abdaf6f
Merge branch 'main' into remove_Julia
valeriupredoi Apr 1, 2025
aebdb85
pop install Julia from source
valeriupredoi Apr 1, 2025
bce24d6
install Julia from source in GHA
valeriupredoi Apr 1, 2025
eda4dad
install Julia from source in circle ci
valeriupredoi Apr 1, 2025
80f2cce
get Julia version
valeriupredoi Apr 1, 2025
2a6353c
try put Julia in path for Circle
valeriupredoi Apr 1, 2025
b004554
set -x
valeriupredoi Apr 1, 2025
6bdbf9f
try with a direct export
valeriupredoi Apr 1, 2025
34967c4
actual correct export
valeriupredoi Apr 1, 2025
3218e73
set -x
valeriupredoi Apr 1, 2025
7c34fbb
baghh am shilly
valeriupredoi Apr 1, 2025
f5d9f3b
set path and set path for tests too
valeriupredoi Apr 1, 2025
e2ac677
Update environment.yml
valeriupredoi Apr 1, 2025
cc7c356
remove ncl and add comment
valeriupredoi Apr 2, 2025
84d3cd9
Merge branch 'main' into remove_Julia
valeriupredoi Apr 7, 2025
e52b0c0
remove pin on importlib
valeriupredoi Apr 7, 2025
61cd9fe
pop install ncl
valeriupredoi Apr 7, 2025
e35ae70
pop NCL installation
valeriupredoi Apr 8, 2025
0692f25
add pin on NCL
valeriupredoi Apr 8, 2025
0c1f4ad
delete guff
valeriupredoi Apr 8, 2025
f9df053
remove R deps
valeriupredoi Apr 8, 2025
b79edd9
add esmvaltool R env file
valeriupredoi Apr 8, 2025
14efb51
install pinned importlib
valeriupredoi Apr 8, 2025
8451d24
add curl
valeriupredoi Apr 8, 2025
f46a076
update env with R crap
valeriupredoi Apr 8, 2025
b787187
update env with R crap
valeriupredoi Apr 8, 2025
9b75858
actual correct name for env R crap
valeriupredoi Apr 8, 2025
d9f01c7
del file
valeriupredoi Apr 8, 2025
63b51f2
force conda forge
valeriupredoi Apr 8, 2025
116940a
force conda forge
valeriupredoi Apr 8, 2025
dc3e608
correct format of env file
valeriupredoi Apr 9, 2025
bdc1d66
call to env update
valeriupredoi Apr 9, 2025
49e7d97
call to env update
valeriupredoi Apr 9, 2025
860c4ba
add final env inspection
valeriupredoi Apr 9, 2025
b17affa
no more need for importlib metadata pin thanks Bouwe for fixing NCL
valeriupredoi Apr 9, 2025
26daff2
add Py 3.13 for a quick and dirty test
valeriupredoi Apr 9, 2025
94538c6
unpin upper Python
valeriupredoi Apr 9, 2025
95ca517
remove unneeded curl
valeriupredoi Apr 9, 2025
b672012
install curl for Circle test
valeriupredoi Apr 9, 2025
ab770b3
curl is cached in the env
valeriupredoi Apr 9, 2025
2b1d031
curls is needed
valeriupredoi Apr 9, 2025
7160400
readc curl to main env
valeriupredoi Apr 9, 2025
6bca628
pin iris help with the 3.13 env solving
valeriupredoi Apr 9, 2025
553c306
repin iris to 3.11
valeriupredoi Apr 9, 2025
0ee28ca
unrun with Python 3.13
valeriupredoi Apr 9, 2025
a682b4e
Merge branch 'main' into remove_Julia
valeriupredoi Apr 23, 2025
946e625
restore main env and remove julia and friends
valeriupredoi May 20, 2025
8445640
Merge branch 'main' into remove_Julia
valeriupredoi May 20, 2025
4137d9a
remove uneeded R env file
valeriupredoi May 20, 2025
e4fdfd2
remove install of ncl and R env from CircleCI conf
valeriupredoi May 20, 2025
4378784
add comments
valeriupredoi May 20, 2025
3db0bac
add docs how to install Julia from source
valeriupredoi May 20, 2025
e440c0a
add more docs on that
valeriupredoi May 20, 2025
a6ee8b9
remove install R env and ncl from GHA
valeriupredoi May 20, 2025
2585f3c
unrun GHA
valeriupredoi May 20, 2025
349f9c3
skip Julia diag test
valeriupredoi May 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ commands:
command: |
. /opt/conda/etc/profile.d/conda.sh
conda activate esmvaltool
mamba --version
# Add existing Julia to PATH
export PATH=/root/.juliaup/bin:$PATH
pytest -n 4 --junitxml=test-reports/report.xml
esmvaltool version
esmvaltool -- --help
Expand Down Expand Up @@ -96,6 +97,9 @@ commands:
conda activate esmvaltool
mamba list >> /logs/conda.txt
pip install << parameters.flags >> ".[<<parameters.extra>>]"> /logs/install.txt 2>&1
curl -fsSL https://install.julialang.org | sh -s -- --yes
export PATH=/root/.juliaup/bin:$PATH
julia --version
esmvaltool install Julia > /logs/install_julia.txt 2>&1
if [[ "<<parameters.flags>>" != *'--editable'* ]]
then
Expand Down Expand Up @@ -137,6 +141,8 @@ jobs:
conda activate esmvaltool
mkdir /logs
pip install .[test] > /logs/install.txt 2>&1
curl -fsSL https://install.julialang.org | sh -s -- --yes
julia --version
esmvaltool install Julia > /logs/install_julia.txt 2>&1
- run:
name: Check Python code style and mistakes
Expand Down Expand Up @@ -209,6 +215,10 @@ jobs:
conda activate esmvaltool
mamba list >> /logs/conda.txt
pip install --editable .[develop]
# Install Julia from source and add to PATH
curl -fsSL https://install.julialang.org | sh -s -- --yes
export PATH=/root/.juliaup/bin:$PATH
julia --version
esmvaltool install Julia > /logs/install_julia.txt 2>&1
git clone https://github.com/ESMValGroup/ESMValCore $HOME/ESMValCore
pip install --editable $HOME/ESMValCore[develop]
Expand Down Expand Up @@ -275,6 +285,10 @@ jobs:
mamba create -y --name esmvaltool -c conda-forge esmvaltool julia 'python=3.11' >> /logs/conda.txt 2>&1
# Activate the environment
set +x; conda activate esmvaltool; set -x
# install Julia from source and add to PATH
curl -fsSL https://install.julialang.org | sh -s -- --yes
export PATH=/root/.juliaup/bin:$PATH
julia --version
# install the Julia dependencies
esmvaltool install Julia > /logs/install_Julia.txt 2>&1
# Log versions
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/run-tests-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ jobs:
run: pip install pytest-monitor
- name: Install ESMValTool
run: pip install -e .[develop] 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/install.txt
- name: Install Julia from source
run: curl -fsSL https://install.julialang.org | sh -s -- --yes
- name: Install Julia dependencies
run: esmvaltool install Julia
- name: Run tests
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ jobs:
python -V 2>&1 | tee develop_test_linux_artifacts_python_${{ matrix.python-version }}/python_version.txt
- name: Install ESMValTool
run: pip install -e .[develop] 2>&1 | tee develop_test_linux_artifacts_python_${{ matrix.python-version }}/install.txt
- name: Install Julia from source
run: curl -fsSL https://install.julialang.org | sh -s -- --yes
- name: Install Julia dependencies
run: esmvaltool install Julia
- name: Install development version of ESMValCore
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ jobs:
run: conda list
- name: Install ESMValTool
run: pip install -e .[develop] 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/install.txt
- name: Examine conda environment
- name: Inspect environment
run: conda list
- name: Install Julia from source
run: curl -fsSL https://install.julialang.org | sh -s -- --yes
- name: Install Julia dependencies
run: esmvaltool install Julia
- name: Export Python minor version
Expand All @@ -60,6 +62,10 @@ jobs:
exit 1
- name: Inspect environment
run: conda list
- name: Check Julia and NCL
run: |
ncl -V
julia --version
- name: Check code quality
run: pre-commit run -a
- name: Run tests
Expand Down
8 changes: 5 additions & 3 deletions doc/sphinx/source/quickstart/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ environment is activated and then execute

.. code-block:: bash

mamba install julia
curl -fsSL https://install.julialang.org | sh -s -- --yes
esmvaltool install Julia
.. _install_on_macosx:

Expand Down Expand Up @@ -397,10 +397,11 @@ the source code will immediately be available in the installed version of the
tool.

If you would like to run Julia diagnostic scripts, you will need to
install the ESMValTool Julia dependencies:
install Julia and the ESMValTool Julia dependencies:

.. code-block:: bash

curl -fsSL https://install.julialang.org | sh -s -- --yes
esmvaltool install Julia

If you are planning to do any coding, install the :ref:`esmvaltool:pre-commit`
Expand Down Expand Up @@ -664,10 +665,11 @@ ESMValTool and any remaining Python dependencies with the command:
pip install esmvaltool

If you would like to run Julia diagnostic scripts, you will also need to
install the Julia dependencies:
install Julia and the ESMValTool Julia dependencies:

.. code-block:: bash

curl -fsSL https://install.julialang.org | sh -s -- --yes
esmvaltool install Julia

.. _installation_from_the_conda_lock_file:
Expand Down
5 changes: 0 additions & 5 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ dependencies:
- cfgrib
- cftime
- cmocean
- curl <8.10 # https://github.com/ESMValGroup/ESMValTool/issues/3758
- cython
- dask !=2024.8.0 # https://github.com/dask/dask/issues/11296
- distributed
Expand All @@ -29,7 +28,6 @@ dependencies:
- fire
- fsspec
- gdal >=3.9.0
- importlib_metadata <8 # https://github.com/ESMValGroup/ESMValTool/issues/3699 only for Python 3.11 and esmpy<8.6
- ipython <9.0 # github.com/ESMValGroup/ESMValCore/issues/2680 ; remove ipython when solved
- iris >=3.11
- iris-esmf-regrid >=0.10.0 # github.com/SciTools-incubator/iris-esmf-regrid/pull/342
Expand Down Expand Up @@ -133,6 +131,3 @@ dependencies:
- r-git2r # dependency of lintr
- r-lintr ==3.1.2
- r-styler ==1.10.3

# Julia (dependencies installed by separate script)
- julia
5 changes: 2 additions & 3 deletions tests/integration/test_diagnostic_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@ def check(result_file):
),
pytest.param(
"diagnostic.jl",
marks=pytest.mark.skipif(
sys.platform == "darwin",
reason="ESMValTool Julia not supported on OSX",
marks=pytest.mark.skip(
reason="Julia is not installed by default.",
),
),
]
Expand Down