Skip to content

Commit 1794742

Browse files
committed
Install intake-esgf to run tests
1 parent 19fdbf0 commit 1794742

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ commands:
6666
- run:
6767
name: Install git+ssh
6868
environment:
69-
DEBIAN_FRONTEND: noninteractive # needed to install tzdata
69+
DEBIAN_FRONTEND: noninteractive # needed to install tzdata
7070
command: apt update && apt install -y git ssh
7171
- checkout
7272
- check_changes
@@ -141,6 +141,7 @@ jobs:
141141
. /opt/conda/etc/profile.d/conda.sh
142142
mkdir /logs
143143
conda activate esmvaltool
144+
pip install intake-esgf 'globus-sdk<4' # TODO: remove before merging
144145
pip install --no-deps .[test] > /logs/install.txt 2>&1
145146
pip check
146147
- test_and_report:
@@ -155,7 +156,7 @@ jobs:
155156
name: Install gpg (required by codecov orb)
156157
command: apt update && apt install -y gpg
157158
- codecov/upload:
158-
files: 'test-reports/coverage.xml'
159+
files: "test-reports/coverage.xml"
159160
disable_search: true
160161

161162
test_installation_from_source_test_mode:

environment.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- cartopy
1010
- cf-units
1111
- cftime
12-
- dask >=2025 # github.com/ESMValGroup/ESMValCore/issues/2503
12+
- dask >=2025 # github.com/ESMValGroup/ESMValCore/issues/2503
1313
- dask-jobqueue
1414
- distributed
1515
- esgf-pyclient >=0.3.1
@@ -21,13 +21,14 @@ dependencies:
2121
- geopy
2222
- humanfriendly
2323
- intake-esgf
24+
- globus-sdk <4 # https://github.com/esgf2-us/intake-esgf/issues/150
2425
- intake-esm
25-
- iris >=3.12.2 # https://github.com/SciTools/iris/issues/6417
26+
- iris >=3.12.2 # https://github.com/SciTools/iris/issues/6417
2627
- iris-esmf-regrid >=0.11.0
27-
- iris-grib >=0.20.0 # github.com/ESMValGroup/ESMValCore/issues/2535
28-
- isodate >=0.7.0 # incompatible with very old 0.6.1
28+
- iris-grib >=0.20.0 # github.com/ESMValGroup/ESMValCore/issues/2535
29+
- isodate >=0.7.0 # incompatible with very old 0.6.1
2930
- jinja2
30-
- libnetcdf !=4.9.1 # to avoid hdf5 warnings; only on conda-forge
31+
- libnetcdf !=4.9.1 # to avoid hdf5 warnings; only on conda-forge
3132
- nc-time-axis
3233
- ncdata
3334
- nested-lookup

0 commit comments

Comments
 (0)