From d02ec6906a6a2eba1d78f18967a3c79252311225 Mon Sep 17 00:00:00 2001
From: thorbjoernl <51087536+thorbjoernl@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:01:35 +0100
Subject: [PATCH 1/4] Remove xfail on test

---
 tests/io/test_read_aeronet_invv3.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/io/test_read_aeronet_invv3.py b/tests/io/test_read_aeronet_invv3.py
index bb2db0c61..aa6277f52 100644
--- a/tests/io/test_read_aeronet_invv3.py
+++ b/tests/io/test_read_aeronet_invv3.py
@@ -9,7 +9,6 @@
 
 
 @lustre_unavail
-@pytest.mark.xfail(raises=AssertionError)
 def test_load_berlin():
     dataset = ReadAeronetInvV3()
     files = dataset.find_in_file_list("*Berlin_FUB*")

From 887d973394db669e8737b27894dff226265af3d4 Mon Sep 17 00:00:00 2001
From: thorbjoernl <51087536+thorbjoernl@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:42:53 +0100
Subject: [PATCH 2/4] Upper limit on geojsoncontour

---
 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 508894e97..e3dce897b 100644
--- a/pyaerocom_env.yml
+++ b/pyaerocom_env.yml
@@ -29,7 +29,7 @@ dependencies:
 ## from pip
   - pip
   - pip:
-    - geojsoncontour
+    - geojsoncontour<3.10.0
     - geocoder_reverse_natural_earth >= 0.0.2
     - pyaro >= 0.0.14
     - aerovaldb >= 0.1.1
diff --git a/pyproject.toml b/pyproject.toml
index 09525fede..39aed7aa6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,7 +38,7 @@ dependencies = [
     "geocoder_reverse_natural_earth",
     "tqdm",
     "openpyxl",
-    "geojsoncontour",
+    "geojsoncontour<3.10.0",
     "typer>=0.7.0",
     # python < 3.11
     'tomli>=2.0.1; python_version < "3.11"',

From 2967c1bbe263c6cb2117faf24e101058ef0ca731 Mon Sep 17 00:00:00 2001
From: thorbjoernl <51087536+thorbjoernl@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:47:26 +0100
Subject: [PATCH 3/4] Actually matplotlib

---
 pyaerocom_env.yml | 3 ++-
 pyproject.toml    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pyaerocom_env.yml b/pyaerocom_env.yml
index e3dce897b..ee86e9ce2 100644
--- a/pyaerocom_env.yml
+++ b/pyaerocom_env.yml
@@ -26,10 +26,11 @@ dependencies:
   - tomli >=2.0.1
   - importlib-resources >=5.10
   - typing-extensions >=4.6.1
+  - matplotlib<3.10.0
 ## from pip
   - pip
   - pip:
-    - geojsoncontour<3.10.0
+    - geojsoncontour
     - geocoder_reverse_natural_earth >= 0.0.2
     - pyaro >= 0.0.14
     - aerovaldb >= 0.1.1
diff --git a/pyproject.toml b/pyproject.toml
index 39aed7aa6..ac50a7611 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
     "scitools-iris>=3.11.0",
     "xarray>=2022.12.0",
     "cartopy>=0.21.1",
-    "matplotlib>=3.7.1",
+    "matplotlib>=3.7.1,<3.10.0",
     "scipy>=1.10.1",
     "pandas>=1.5.3",
     "numpy>=1.25.0",
@@ -38,7 +38,7 @@ dependencies = [
     "geocoder_reverse_natural_earth",
     "tqdm",
     "openpyxl",
-    "geojsoncontour<3.10.0",
+    "geojsoncontour",
     "typer>=0.7.0",
     # python < 3.11
     'tomli>=2.0.1; python_version < "3.11"',

From dde9dbee5522eba67b09fbcffeb2d6ed82d9351f Mon Sep 17 00:00:00 2001
From: thorbjoernl <51087536+thorbjoernl@users.noreply.github.com>
Date: Wed, 18 Dec 2024 12:42:30 +0100
Subject: [PATCH 4/4] undo

---
 pyaerocom_env.yml | 1 -
 pyproject.toml    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyaerocom_env.yml b/pyaerocom_env.yml
index ee86e9ce2..508894e97 100644
--- a/pyaerocom_env.yml
+++ b/pyaerocom_env.yml
@@ -26,7 +26,6 @@ dependencies:
   - tomli >=2.0.1
   - importlib-resources >=5.10
   - typing-extensions >=4.6.1
-  - matplotlib<3.10.0
 ## from pip
   - pip
   - pip:
diff --git a/pyproject.toml b/pyproject.toml
index ac50a7611..09525fede 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
     "scitools-iris>=3.11.0",
     "xarray>=2022.12.0",
     "cartopy>=0.21.1",
-    "matplotlib>=3.7.1,<3.10.0",
+    "matplotlib>=3.7.1",
     "scipy>=1.10.1",
     "pandas>=1.5.3",
     "numpy>=1.25.0",