Skip to content

Commit 9ca548d

Browse files
authored
Remove mention of Julia in documentation ahead of discontinued support in v2.13 (#4156)
1 parent 30d1689 commit 9ca548d

22 files changed

Lines changed: 14 additions & 204 deletions

.circleci/config.yml

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ commands:
4141
command: |
4242
. /opt/conda/etc/profile.d/conda.sh
4343
conda activate esmvaltool
44-
# Add existing Julia to PATH
45-
export PATH=/root/.juliaup/bin:$PATH
4644
pytest -n 4 --junitxml=test-reports/report.xml
4745
esmvaltool version
4846
esmvaltool -- --help
@@ -98,10 +96,6 @@ commands:
9896
conda activate esmvaltool
9997
mamba list >> /logs/conda.txt
10098
pip install << parameters.flags >> ".[<<parameters.extra>>]"> /logs/install.txt 2>&1
101-
curl -fsSL https://install.julialang.org | sh -s -- --yes
102-
export PATH=/root/.juliaup/bin:$PATH
103-
julia --version
104-
esmvaltool install Julia > /logs/install_julia.txt 2>&1
10599
if [[ "<<parameters.flags>>" != *'--editable'* ]]
106100
then
107101
rm -r esmvaltool
@@ -142,10 +136,6 @@ jobs:
142136
conda activate esmvaltool
143137
mkdir /logs
144138
pip install .[test] > /logs/install.txt 2>&1
145-
curl -fsSL https://install.julialang.org | sh -s -- --yes
146-
export PATH=/root/.juliaup/bin:$PATH
147-
julia --version
148-
esmvaltool install Julia > /logs/install_julia.txt 2>&1
149139
- run:
150140
name: Check Python code style and mistakes
151141
command: |
@@ -217,11 +207,6 @@ jobs:
217207
conda activate esmvaltool
218208
mamba list >> /logs/conda.txt
219209
pip install --editable .[develop]
220-
# Install Julia from source and add to PATH
221-
curl -fsSL https://install.julialang.org | sh -s -- --yes
222-
export PATH=/root/.juliaup/bin:$PATH
223-
julia --version
224-
esmvaltool install Julia > /logs/install_julia.txt 2>&1
225210
git clone https://github.com/ESMValGroup/ESMValCore $HOME/ESMValCore
226211
pip install --editable $HOME/ESMValCore[develop]
227212
- log_versions
@@ -284,15 +269,9 @@ jobs:
284269
# Install prerequisites
285270
mkdir /logs
286271
# Install ESMValTool in a new conda environment
287-
mamba create -y --name esmvaltool -c conda-forge esmvaltool julia 'python=3.11' >> /logs/conda.txt 2>&1
272+
mamba create -y --name esmvaltool -c conda-forge esmvaltool 'python=3.11' >> /logs/conda.txt 2>&1
288273
# Activate the environment
289274
set +x; conda activate esmvaltool; set -x
290-
# install Julia from source and add to PATH
291-
curl -fsSL https://install.julialang.org | sh -s -- --yes
292-
export PATH=/root/.juliaup/bin:$PATH
293-
julia --version
294-
# install the Julia dependencies
295-
esmvaltool install Julia > /logs/install_Julia.txt 2>&1
296275
# Log versions
297276
mamba env export > /logs/environment.yml
298277
# Test installation

.circleci/install_triggers

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
^\.circleci/
22
^environment\.yml$
3-
^esmvaltool/install/
43
^pyproject.toml$
54
^setup\.py$
65
^setup\.cfg$

.github/workflows/install-from-conda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
# - run: which conda 2>&1 | tee conda_install_osx_artifacts_python_${{ matrix.python-version }}/conda_path.txt
7373
# - run: python -V 2>&1 | tee conda_install_osx_artifacts_python_${{ matrix.python-version }}/python_version.txt
7474
# # ncurses needs to be from conda-forge and not main channel
75-
# # for now it's turned off since we're not testing R/Julia installs
75+
# # for now it's turned off since we're not testing R installs
7676
# # - run: conda uninstall -y ncurses
7777
# # - run: conda list ncurses
7878
# # - run: conda install -y conda-forge::ncurses

.github/workflows/run-tests-monitor.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ jobs:
4949
run: pip install pytest-monitor
5050
- name: Install ESMValTool
5151
run: pip install -e .[develop] 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/install.txt
52-
- name: Install Julia from source
53-
run: curl -fsSL https://install.julialang.org | sh -s -- --yes
54-
- name: Install Julia dependencies
55-
run: esmvaltool install Julia
5652
- name: Run tests
5753
run: >
5854
pytest -n 2 -m "not installation" --db ../.pymon 2>&1

.github/workflows/test-development.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ jobs:
4848
python -V 2>&1 | tee develop_test_linux_artifacts_python_${{ matrix.python-version }}/python_version.txt
4949
- name: Install ESMValTool
5050
run: pip install -e .[develop] 2>&1 | tee develop_test_linux_artifacts_python_${{ matrix.python-version }}/install.txt
51-
- name: Install Julia from source
52-
run: curl -fsSL https://install.julialang.org | sh -s -- --yes
53-
- name: Install Julia dependencies
54-
run: esmvaltool install Julia
5551
- name: Install development version of ESMValCore
5652
run: |
5753
cd ..

.github/workflows/test.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,10 @@ jobs:
4848
run: pip install -e .[develop] 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/install.txt
4949
- name: Inspect environment
5050
run: conda list
51-
- name: Install Julia from source
52-
run: curl -fsSL https://install.julialang.org | sh -s -- --yes
53-
- name: Install Julia dependencies
54-
run: esmvaltool install Julia
55-
- name: Export Python minor version
56-
run: echo "pver1=$(python -V)" >> $GITHUB_ENV
57-
- name: Exit if Python minor version changed
58-
if: ${{ env.pver1 != env.pver0}}
59-
run: |
60-
echo "Python minor version changed after Julia install"
61-
python -V
62-
exit 1
6351
- name: Inspect environment
6452
run: conda list
65-
- name: Check Julia and NCL
66-
run: |
67-
ncl -V
68-
julia --version
53+
- name: Check NCL
54+
run: ncl -V
6955
- name: Check code quality
7056
run: pre-commit run -a
7157
- name: Run tests

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ doc/sphinx/source/gallery.rst
107107
.Rproj.user
108108
esmvaltool.Rproj
109109

110-
# Julia installation
111-
esmvaltool/install/Julia/Manifest.toml
112-
113110
# Cylc suite
114111
esmvaltool/utils/testing/regression/.service/
115112

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ files that contain pointers to the requested data types, directives for the prep
3535
will be subject to, and directives for the actual diagnostics that will be run with the now preprocessed data.
3636
Data preprocessing is done via the [ESMValCore](https://docs.esmvaltool.org/projects/ESMValCore/en/latest/quickstart/index.html) package, a pure Python, highly-optimized scientific library, developed by the ESMValTool core developers,
3737
and that performs a number of common analysis tasks
38-
such as regridding, masking, levels extraction etc. [Diagnostics](https://docs.esmvaltool.org/en/latest/develop/diagnostic.html) are written in a variety of programming languages (Python, NCL, R, Julia) and are developed by the wider
38+
such as regridding, masking, levels extraction etc. [Diagnostics](https://docs.esmvaltool.org/en/latest/develop/diagnostic.html) are written in a variety of programming languages (Python, NCL, R) and are developed by the wider
3939
scientific community, and included after a scientific and technical review process.
4040

4141
# Input data

doc/sphinx/source/community/code_documentation.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,6 @@ the following files:
465465
- ``environment_osx.yml``
466466
contains development dependencies for MacOSX. Should be the same as ``environment.yml``,
467467
but currently without multi language support.
468-
- ``esmvaltool/install/Julia/Project.toml``
469-
contains Julia dependencies that can be installed from the default Julia
470-
package registry
471468
- ``pyproject.toml``
472469
contains all Python dependencies, regardless of their installation source
473470

doc/sphinx/source/community/diagnostic.rst

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@ The easiest way to do this is probably to copy the example recipe and diagnostic
2424
script and adjust those to your needs.
2525

2626
If you have no preferred programming language yet, Python 3 is highly recommended, because it is most well supported.
27-
However, NCL, R, (and Julia) scripts are also supported.
28-
29-
.. note::
30-
31-
ESMValTool stopped supporting Julia as a main dependency, so if you'd like to
32-
write and test a Julia diagnostic, you will have to install Julia from source.
27+
However, NCL, and R scripts are also supported.
3328

3429
Good example recipes for the different languages are:
3530

@@ -363,38 +358,6 @@ Have a look at the example NCL diagnostic in
363358
`esmvaltool/diag_scripts/examples/diagnostic.ncl <https://github.com/ESMValGroup/ESMValTool/blob/main/esmvaltool/diag_scripts/examples/diagnostic.ncl>`_
364359
for a complete example.
365360

366-
Recording provenance in a Julia diagnostic script
367-
-------------------------------------------------
368-
The provenance information is written in a ``diagnostic_provenance.yml`` that will be located in ``run_dir``.
369-
For example a ``provenance_record`` can be stored in a yaml file as:
370-
371-
.. code-block:: julia
372-
373-
provenance_file = string(run_dir, "/diagnostic_provenance.yml")
374-
375-
open(provenance_file, "w") do io
376-
JSON.print(io, provenance_records, 4)
377-
end
378-
379-
The ``provenance_records`` can be defined as a dictionary of provenance items.
380-
For example:
381-
382-
.. code-block:: julia
383-
384-
provenance_records = Dict()
385-
386-
provenance_record = Dict(
387-
"ancestors" => [input_file],
388-
"authors" => ["vonhardenberg_jost", "arnone_enrico"],
389-
"caption" => "Example diagnostic in Julia",
390-
"domains" => ["global"],
391-
"projects" => ["crescendo", "c3s-magic"],
392-
"references" => ["zhang11wcc"],
393-
"statistics" => ["other"],
394-
)
395-
396-
provenance_records[output_file] = provenance_record
397-
398361
Recording provenance in an R diagnostic script
399362
----------------------------------------------
400363
The provenance information is written in a ``diagnostic_provenance.yml`` that will be located in ``run_dir``.

0 commit comments

Comments
 (0)