Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
8ad5fcf
test with latest iris 3.11rc0
valeriupredoi Nov 4, 2024
1f8fef6
run GA test
valeriupredoi Nov 4, 2024
1534917
unpin numpy
valeriupredoi Nov 4, 2024
fcd148f
free cartopy
valeriupredoi Nov 4, 2024
581181a
unpin Pandas
valeriupredoi Nov 4, 2024
e8ff68f
comment out esmvalcore
valeriupredoi Nov 4, 2024
2bfb974
try again
valeriupredoi Nov 8, 2024
b082db6
remove ncl
valeriupredoi Nov 8, 2024
df6f5f3
Merge branch 'main' into python313
valeriupredoi Nov 15, 2024
c70069b
remove pin on python 3.13
valeriupredoi Nov 15, 2024
5e187e7
Merge branch 'main' into python313
valeriupredoi Nov 25, 2024
e43e08d
remove rc iris channel
valeriupredoi Nov 25, 2024
3e0cc7b
remove pys2index to test
valeriupredoi Nov 25, 2024
73e634c
remove temp psy-simple
valeriupredoi Nov 28, 2024
7cdea29
remove temp psy-reg
valeriupredoi Nov 28, 2024
b935ddf
remove temp psy-maps
valeriupredoi Nov 28, 2024
76a5d8a
remove temp numba
valeriupredoi Nov 28, 2024
35418be
remove temp xesmf
valeriupredoi Nov 28, 2024
2cccebb
remove temp esmvalcore
valeriupredoi Nov 28, 2024
5baa8cc
away with curl
valeriupredoi Nov 28, 2024
5cfb8d4
add note against curl
valeriupredoi Nov 28, 2024
f892590
recheck ncl
valeriupredoi Nov 28, 2024
843f767
remove note on ncl
valeriupredoi Nov 28, 2024
902d68c
Merge branch 'main' into python313
valeriupredoi Dec 17, 2024
1655713
Merge branch 'main' into python313
valeriupredoi Feb 10, 2025
42e034d
Merge branch 'main' into python313
valeriupredoi Feb 20, 2025
361f24d
keep chugging along
valeriupredoi Feb 20, 2025
593d8a4
Merge branch 'python313' of https://github.com/ESMValGroup/ESMValTool…
valeriupredoi Feb 20, 2025
d78452b
remove ref to panda pin
valeriupredoi Feb 20, 2025
d5e163a
remove panda pin
valeriupredoi Feb 20, 2025
287a7ed
remove temp pys2index
valeriupredoi Feb 20, 2025
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
4634726
for now force latest mamba see if it improves solvability
valeriupredoi Feb 24, 2025
9f92a50
Merge branch 'main' into python313
valeriupredoi Mar 14, 2025
de2eb16
rc channel and curl
valeriupredoi Mar 14, 2025
9ccc0d7
skip Julia install for now
valeriupredoi Mar 14, 2025
0bcb59e
not pys2index from PyPI
valeriupredoi Mar 14, 2025
c0b176c
test without NCL
valeriupredoi Mar 14, 2025
5e17848
remove julia too
valeriupredoi Mar 14, 2025
37ed696
Merge branch 'main' into python313
valeriupredoi Mar 26, 2025
9e6f609
readd pys2index and ncl
valeriupredoi Mar 26, 2025
57d8962
test without ncl
valeriupredoi Mar 27, 2025
61b2b73
comment out importlib pinned
valeriupredoi Mar 27, 2025
8feef98
remove upper pin on rbase
valeriupredoi Mar 27, 2025
2125407
typo
valeriupredoi Mar 27, 2025
773218b
try without ncl again
valeriupredoi Mar 27, 2025
de88848
remove ipython and importlib
valeriupredoi Mar 27, 2025
eba1a02
OK keep the ipython pin
valeriupredoi Mar 27, 2025
0207cf8
put back the importlib pin too
valeriupredoi Mar 27, 2025
411f6ca
run Linux GHA tests off environment_python instead
valeriupredoi Mar 27, 2025
6f03d70
comment out unsupported psys
valeriupredoi Mar 27, 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
b33bd16
revert to classic env file
valeriupredoi Apr 3, 2025
17eda8a
couple cleanups
valeriupredoi Apr 3, 2025
acd69be
up mamba to latest
valeriupredoi Apr 3, 2025
7c84dfd
put back ncl
valeriupredoi Apr 3, 2025
19f059a
phase 1 get rid of NCL and friends
valeriupredoi Apr 4, 2025
e64d2bf
phase 2 remove R packages
valeriupredoi Apr 7, 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
ad2c385
Merge branch 'main' into python313
valeriupredoi May 22, 2025
b4f5b68
restore main envs
valeriupredoi May 22, 2025
6ac26ce
Merge branch 'remove_Julia' into python313
valeriupredoi May 22, 2025
8463d44
removed osy packages
valeriupredoi May 22, 2025
900fd62
removed osy packages
valeriupredoi May 22, 2025
bfab261
fix for locale issue
valeriupredoi May 22, 2025
3780099
add support
valeriupredoi May 22, 2025
bc06868
gha with 3.13 bar conda lock
valeriupredoi May 22, 2025
8e1c2bd
test conda lock in light of new conda-lock package too
valeriupredoi May 22, 2025
c535434
Merge branch 'main' into python313
valeriupredoi May 23, 2025
ed8d3f9
Merge branch 'main' into python313
valeriupredoi May 27, 2025
590dabe
unrun GHA
valeriupredoi May 27, 2025
b89c086
readd pys2index
valeriupredoi May 27, 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
10 changes: 1 addition & 9 deletions .github/workflows/create-condalock-file.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,13 @@ jobs:
with:
auto-update-conda: true
activate-environment: esmvaltool-fromlock
python-version: "3.12"
python-version: "3.13"
miniforge-version: "latest"
use-mamba: true
- name: Show conda config
run: |
conda update -n base -c conda-forge conda
conda --version
# setup-miniconda@v3 installs an old conda and mamba
# forcing a modern mamba updates both mamba and conda
# unpin mamba after conda-lock=3 release
# see github.com/ESMValGroup/ESMValTool/issues/3782
conda install -c conda-forge "mamba>=1.4.8,<2"
conda config --show-sources
conda config --show
conda --version
mamba --version
- name: Python info
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/install-from-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]
name: Linux Python ${{ matrix.python-version }}
steps:
- uses: conda-incubator/setup-miniconda@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/install-from-condalock-file.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
strategy:
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]
fail-fast: false
name: Linux Python ${{ matrix.python-version }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/install-from-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
strategy:
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]
fail-fast: false
name: Linux Python ${{ matrix.python-version }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pypi-build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python 3.12
- name: Set up Python 3.13
uses: actions/setup-python@v1
with:
python-version: "3.12"
python-version: "3.13"
- name: Install pep517
run: >-
python -m
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-tests-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]
name: Linux Python ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
runs-on: "macos-latest"
strategy:
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]
architecture: ["x64"] # need to force Intel, arm64 builds have issues
fail-fast: false
name: OSX Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]
name: Linux Python ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]
name: Linux Python ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v4
Expand All @@ -34,7 +34,7 @@ jobs:
python-version: ${{ matrix.python-version }}
miniforge-version: "latest"
use-mamba: true
mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392
mamba-version: "2.0.8" # https://github.com/conda-incubator/setup-miniconda/issues/392
- run: mkdir -p test_linux_artifacts_python_${{ matrix.python-version }}
- name: Record versions
run: |
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
strategy:
matrix:
python-version: ["3.11", "3.12"]
python-version: ["3.11", "3.12", "3.13"]
architecture: ["x64"] # need to force Intel, arm64 builds have issues
fail-fast: false
name: OSX Python ${{ matrix.python-version }}
Expand Down
6 changes: 6 additions & 0 deletions doc/sphinx/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@
# The full version, including alpha/beta/rc tags.
release = __version__

# a lot of issues with importing esmvaltool modules due to
# "incorrect" locale settings' this looks like a fix
# see https://github.com/python/cpython/issues/133967
import locale
locale.setlocale(locale.LC_ALL, 'C')

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
# language = None
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies:
- prov
- pyproj >=2.1
- pys2index # only from conda-forge
- python >=3.11,<3.13
- python >=3.11,<3.14
- python-cdo
- python-dateutil
- pyyaml
Expand Down
2 changes: 1 addition & 1 deletion environment_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies:
- prov
- pyproj >=2.1
- pys2index >=0.1.5 # only from conda-forge; https://github.com/ESMValGroup/ESMValTool/pull/3792
- python >=3.11,<3.13
- python >=3.11,<3.14
- python-cdo
- python-dateutil
- pyyaml
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ def read_description(filename):
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Atmospheric Science",
"Topic :: Scientific/Engineering :: GIS",
Expand Down