From 1c2cae73d9a1c0e3ff834c7a724273687a29ca57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?thorbjoernl=20=28Thorbj=C3=B8rn=29?= <51087536+thorbjoernl@users.noreply.github.com> Date: Tue, 30 Jul 2024 10:45:13 +0000 Subject: [PATCH 1/2] fix non-compliant-json issue --- pyaerocom_env.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyaerocom_env.yml b/pyaerocom_env.yml index b9468019a..d2df32490 100644 --- a/pyaerocom_env.yml +++ b/pyaerocom_env.yml @@ -32,7 +32,7 @@ dependencies: - geojsoncontour - geocoder_reverse_natural_earth >= 0.0.2 - pyaro >= 0.0.10 - - git+https://github.com/metno/aerovaldb.git@v0.0.13 + - git+https://github.com/metno/aerovaldb.git@v0.0.14 ## testing - pytest >=7.4 - pytest-dependency diff --git a/pyproject.toml b/pyproject.toml index 28837ed5f..7636d65f8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ classifiers = [ ] requires-python = ">=3.10" dependencies = [ - "aerovaldb@git+https://github.com/metno/aerovaldb.git@v0.0.13", + "aerovaldb@git+https://github.com/metno/aerovaldb.git@v0.0.14", "scitools-iris>=3.8.1", "xarray>=2022.10.0", "cartopy>=0.21.1", From d3497223f9d457582d2c1f62a80ecc92b5086d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?thorbjoernl=20=28Thorbj=C3=B8rn=29?= <51087536+thorbjoernl@users.noreply.github.com> Date: Tue, 30 Jul 2024 10:46:03 +0000 Subject: [PATCH 2/2] Cap xarray dependency --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7636d65f8..95be71147 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ requires-python = ">=3.10" dependencies = [ "aerovaldb@git+https://github.com/metno/aerovaldb.git@v0.0.14", "scitools-iris>=3.8.1", - "xarray>=2022.10.0", + "xarray>=2022.10.0, <2024.7.0", "cartopy>=0.21.1", "matplotlib>=3.7.1", "scipy>=1.10.1",