Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ad9db05
pin sphinx
valeriupredoi Apr 14, 2025
f4faeb9
run build docs test at commit
valeriupredoi Apr 14, 2025
067cbe2
temporary install nbsphinx and autodocsumm only from conda forge
valeriupredoi Apr 14, 2025
a7fc93f
add note
valeriupredoi Apr 14, 2025
fa8b5db
Merge branch 'main' into pin_sphinx
valeriupredoi Apr 15, 2025
34b5766
dont use nbsphinx for now
valeriupredoi Apr 15, 2025
ffada93
gah forgot to remove extension
valeriupredoi Apr 15, 2025
56c5686
do an explicit env creation
valeriupredoi Apr 15, 2025
eb658e5
readd nbsphinx
valeriupredoi Apr 15, 2025
de6f818
pop in an lc all locale var
valeriupredoi Apr 15, 2025
bba7b07
try set lc all to C only
valeriupredoi Apr 15, 2025
0e57a6c
remove cf units from env
valeriupredoi May 8, 2025
b559f73
run only doc builds as tests
valeriupredoi May 8, 2025
5b1cbb1
remove iris from env
valeriupredoi May 8, 2025
eb4e481
remove all other irisy deps
valeriupredoi May 8, 2025
59bde9d
ah sample data needs removed too
valeriupredoi May 8, 2025
12f3af4
reinstate just conda forge iris
valeriupredoi May 8, 2025
18c2d58
pin iris to 3.10
valeriupredoi May 8, 2025
cd98ac4
pin iris to 3.11
valeriupredoi May 8, 2025
3d8b972
let everything else back in but keep iris pinned to 3.10
valeriupredoi May 8, 2025
cbd4dcd
pin cf-units to be sure
valeriupredoi May 8, 2025
5ccca83
pin python to 3.13.2 and iris 3.11
valeriupredoi May 8, 2025
afd656c
pin python to 3.13.3
valeriupredoi May 8, 2025
c2d93cb
repin python to 3.13.2
valeriupredoi May 8, 2025
80bfa30
do not install cf-units
valeriupredoi May 8, 2025
d3ea1ab
pin to python 3.13.3
valeriupredoi May 8, 2025
72b7943
print locale before and after
valeriupredoi May 8, 2025
d942219
print locale from conf.py
valeriupredoi May 9, 2025
c831c10
fix syntax
valeriupredoi May 9, 2025
41dfd83
also show encoding
valeriupredoi May 9, 2025
88f8bff
switch back to iris 3.10 and python 3.13.2
valeriupredoi May 9, 2025
7a71308
adjust pin on python
valeriupredoi May 9, 2025
22b872f
restore main env but with pin on iris
valeriupredoi May 9, 2025
709ae56
pin python
valeriupredoi May 9, 2025
3fed124
restore iris pin
valeriupredoi May 9, 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
11 changes: 7 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,24 +223,27 @@ jobs:
mkdir /logs
. /opt/conda/etc/profile.d/conda.sh
# Install
mamba env create
locale
mamba env create -n esmvaltool -f environment.yml
conda activate esmvaltool
pip install .[doc]
# Log versions
dpkg -l | tee /logs/versions.txt
conda env export | tee /logs/environment.yml
pip freeze | tee /logs/requirements.txt
# Test building documentation
locale
MPLBACKEND=Agg sphinx-build -W doc doc/build
- store_artifacts:
path: /logs

workflows:
commit:
jobs:
- run_tests
- test_installation_from_source_develop_mode
- test_installation_from_source_test_mode
- build_documentation
#- run_tests
#- test_installation_from_source_develop_mode
#- test_installation_from_source_test_mode

nightly:
triggers:
Expand Down
6 changes: 6 additions & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@
'autosummary': True,
}

# show locale
import locale
print("XXX")
print(locale.getlocale())
print(locale.getencoding())

# Show type hints in function signature AND docstring
autodoc_typehints = 'both'

Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- cartopy
- cf-units
- cftime
- dask >=2025 # github.com/ESMValGroup/ESMValCore/issues/2503
- dask >=2025, <2025.4.0 # github.com/ESMValGroup/ESMValCore/issues/2503, github.com/ESMValGroup/ESMValCore/issues/2716
- dask-jobqueue
- distributed
- esgf-pyclient >=0.3.1
Expand Down Expand Up @@ -36,7 +36,7 @@ dependencies:
- psutil
- py-cordex
- pybtex
- python >=3.10
- python >=3.10,<3.13.3
- python-stratify >=0.3
- pyyaml
- requests
Expand Down
15 changes: 8 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dynamic = [
]
dependencies = [
"cartopy",
"cf-units",
# "cf-units",
"dask[array,distributed]>=2025", # ESMValCore/issues/2503
"dask-jobqueue",
"esgf-pyclient>=0.3.1",
Expand All @@ -45,7 +45,7 @@ dependencies = [
"fire",
"geopy",
"humanfriendly",
"iris-grib>=0.20.0", # github.com/ESMValGroup/ESMValCore/issues/2535
# "iris-grib>=0.20.0", # github.com/ESMValGroup/ESMValCore/issues/2535
"isodate>=0.7.0",
"jinja2",
"nc-time-axis", # needed by iris.plot
Expand All @@ -63,7 +63,7 @@ dependencies = [
"requests",
"rich",
"scipy>=1.6",
"scitools-iris>=3.11", # 3.11 first to support Numpy 2 and Python 3.13
# "scitools-iris>=3.11", # 3.11 first to support Numpy 2 and Python 3.13
"shapely>=2.0.0",
"stratify>=0.3",
"yamale",
Expand All @@ -82,13 +82,14 @@ test = [
"pytest-metadata>=1.5.1",
"pytest-mock",
"pytest-xdist",
"ESMValTool_sample_data==0.0.3",
# "ESMValTool_sample_data==0.0.3",
]
doc = [
"autodocsumm>=0.2.2",
# https://github.com/ESMValGroup/ESMValCore/pull/2706
# "autodocsumm>=0.2.2",
# "nbsphinx>=0.9.7", # github.com/ESMValGroup/ESMValCore/issues/2669
"ipython<9.0", # github.com/ESMValGroup/ESMValCore/issues/2680
"nbsphinx>=0.9.7", # github.com/ESMValGroup/ESMValCore/issues/2669
"sphinx>=6.1.3",
"sphinx>=8.2.3", # >=6.1.3",
"pydata_sphinx_theme",
]
develop = [
Expand Down