From e6550dea55625cc7c44354e349b9af0714210c01 Mon Sep 17 00:00:00 2001
From: Martynas Asipauskas <me@martynas.co.uk>
Date: Thu, 14 Nov 2024 14:46:32 +0000
Subject: [PATCH] Upgrade armada-client

---
 third_party/airflow/pyproject.toml                 | 14 ++++++--------
 .../airflow/test/unit/operators/test_armada.py     | 14 +++++++++-----
 third_party/airflow/tox.ini                        |  4 ++--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/third_party/airflow/pyproject.toml b/third_party/airflow/pyproject.toml
index 5073307bab3..bc9498c375a 100644
--- a/third_party/airflow/pyproject.toml
+++ b/third_party/airflow/pyproject.toml
@@ -4,21 +4,19 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "armada_airflow"
-version = "1.0.9"
+version = "1.1.0"
 description = "Armada Airflow Operator"
 readme='README.md'
 authors = [{name = "Armada-GROSS", email = "armada@armadaproject.io"}]
 license = { text = "Apache Software License" }
 dependencies=[
-    'armada-client==0.3.4',
-    'apache-airflow>=2.6.3',
-    'grpcio==1.58.0',
-    'grpcio-tools==1.58.0',
-    'types-protobuf==4.24.0.1',
+    'armada-client>=0.4.5',
+    'apache-airflow>=2.9.2',
     'kubernetes>=23.6.0',
     'kubernetes_asyncio>=24.2.3',
+    'opentelemetry-proto<=1.27.1', # We need to have compatible protobuf dependency opentelemetry-proto and armada-client
 ]
-requires-python=">=3.8"
+requires-python=">=3.9"
 classifiers=[
     'Programming Language :: Python :: 3',
     'Operating System :: OS Independent',
@@ -42,7 +40,7 @@ include = ["armada_airflow*"]
 
 [tool.black]
 line-length = 88
-target-version = ['py38', 'py39', 'py310']
+target-version = ['py39', 'py310', 'py311', 'py312']
 include = '''
 /(
     armada
diff --git a/third_party/airflow/test/unit/operators/test_armada.py b/third_party/airflow/test/unit/operators/test_armada.py
index 4e3f8804e36..e7edd33666c 100644
--- a/third_party/airflow/test/unit/operators/test_armada.py
+++ b/third_party/airflow/test/unit/operators/test_armada.py
@@ -38,11 +38,15 @@ def default_hook() -> MagicMock:
 @pytest.fixture(scope="function", autouse=True)
 def mock_operator_dependencies():
     # We no-op time.sleep in tests.
-    with patch("time.sleep", return_value=None) as sleep, patch(
-        "armada.log_manager.KubernetesPodLogManager.fetch_container_logs"
-    ) as logs, patch(
-        "armada.operators.armada.ArmadaOperator.hook", new_callable=default_hook
-    ) as hook:
+    with (
+        patch("time.sleep", return_value=None) as sleep,
+        patch(
+            "armada.log_manager.KubernetesPodLogManager.fetch_container_logs"
+        ) as logs,
+        patch(
+            "armada.operators.armada.ArmadaOperator.hook", new_callable=default_hook
+        ) as hook,
+    ):
         yield sleep, logs, hook
 
 
diff --git a/third_party/airflow/tox.ini b/third_party/airflow/tox.ini
index ed457e94d70..07cc38e224c 100644
--- a/third_party/airflow/tox.ini
+++ b/third_party/airflow/tox.ini
@@ -1,10 +1,10 @@
 [tox]
-isolated_build = true
 envlist =
     format
-    py38
     py39
     py310
+    py311
+    py312
 
 [testenv]
 extras = test