From fcc847ed7e70de876727602d37df1f44164f0fbc Mon Sep 17 00:00:00 2001 From: sloosvel Date: Fri, 11 Feb 2022 17:38:27 +0100 Subject: [PATCH 1/2] Try to match environment to earthdiagnostics --- environment.yml | 4 +++- setup.py | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 02e8be1..6f51d92 100644 --- a/environment.yml +++ b/environment.yml @@ -6,4 +6,6 @@ channels: dependencies: # Python packages that cannot be installed from PyPI: - - iris \ No newline at end of file + - python<3.9 + - six + - iris==3.0.1 diff --git a/setup.py b/setup.py index 59082e6..e4fcd47 100644 --- a/setup.py +++ b/setup.py @@ -14,9 +14,11 @@ REQUIREMENTS = { 'setuptools_scm', ], 'install': [ + 'dask[array]' 'netCDF4', 'numba==0.52', 'numpy', + 'scitools-iris==3.0.1', 'six', ], 'gpu': [ -- GitLab From 2583e4c7385e1b74c968ef11f68e9d974cc91286 Mon Sep 17 00:00:00 2001 From: sloosvel Date: Fri, 11 Feb 2022 17:49:15 +0100 Subject: [PATCH 2/2] Add dask? --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e4fcd47..f4779bb 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,8 @@ REQUIREMENTS = { 'setuptools_scm', ], 'install': [ - 'dask[array]' + #'dask[array]', I have doubts about this one, because it's in the setup of + # earthdiagnostics but it does not get used in there, but rather in diagonals 'netCDF4', 'numba==0.52', 'numpy', -- GitLab