From 2df546fe1c43767dff4a0253dbca2734f455970f Mon Sep 17 00:00:00 2001 From: Martynas Asipauskas Date: Wed, 29 May 2024 17:05:54 +0100 Subject: [PATCH 1/6] Update pyproject.toml --- client/python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/python/pyproject.toml b/client/python/pyproject.toml index e05e9c9b86d..bfa261fe8cd 100644 --- a/client/python/pyproject.toml +++ b/client/python/pyproject.toml @@ -4,7 +4,7 @@ version = "0.3.1" description = "Armada gRPC API python client" readme = "README.md" requires-python = ">=3.7" -dependencies = ["grpcio>=1.64.0", "grpcio-tools>=1.64.0", "mypy-protobuf>=3.2.0", "protobuf>=3.20.3"] +dependencies = ["grpcio==1.58.0", "grpcio-tools==1.58.0", "mypy-protobuf>=3.2.0", "protobuf>=3.20.3"] license = { text = "Apache Software License" } authors = [{ name = "G-Research Open Source Software", email = "armada@armadaproject.io" }] From 48242e9b84e83fb4ffbd6e320535966d58345950 Mon Sep 17 00:00:00 2001 From: Martynas Asipauskas Date: Wed, 29 May 2024 17:06:44 +0100 Subject: [PATCH 2/6] Update pyproject.toml --- third_party/airflow/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/airflow/pyproject.toml b/third_party/airflow/pyproject.toml index a4864b430d0..b13c2eac309 100644 --- a/third_party/airflow/pyproject.toml +++ b/third_party/airflow/pyproject.toml @@ -10,8 +10,8 @@ requires-python = ">=3.7" dependencies = [ "armada-client", "apache-airflow>=2.6.3", - "grpcio==1.64.0", - "grpcio-tools==1.64.0", + "grpcio==1.58.0", + "grpcio-tools==1.58.0", "types-protobuf==4.24.0.1" ] authors = [{name = "Armada-GROSS", email = "armada@armadaproject.io"}] From fae39ec5b8da910f0056eefeb5dd6c82ef207fc1 Mon Sep 17 00:00:00 2001 From: Martynas Asipauskas Date: Thu, 30 May 2024 12:37:31 +0100 Subject: [PATCH 3/6] Update pyproject.toml --- client/python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/python/pyproject.toml b/client/python/pyproject.toml index bfa261fe8cd..c21d9b27147 100644 --- a/client/python/pyproject.toml +++ b/client/python/pyproject.toml @@ -4,7 +4,7 @@ version = "0.3.1" description = "Armada gRPC API python client" readme = "README.md" requires-python = ">=3.7" -dependencies = ["grpcio==1.58.0", "grpcio-tools==1.58.0", "mypy-protobuf>=3.2.0", "protobuf>=3.20.3"] +dependencies = ["grpcio>=1.46.3", "grpcio-tools>=1.46.3", "mypy-protobuf>=3.2.0", "protobuf>=3.20.3, < 5.0"] license = { text = "Apache Software License" } authors = [{ name = "G-Research Open Source Software", email = "armada@armadaproject.io" }] From 223091a69b068b56ff27028953a61f620f815ef8 Mon Sep 17 00:00:00 2001 From: Martynas Asipauskas Date: Thu, 30 May 2024 14:24:11 +0100 Subject: [PATCH 4/6] Update pyproject.toml --- client/python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/python/pyproject.toml b/client/python/pyproject.toml index c21d9b27147..f3facd1d8ee 100644 --- a/client/python/pyproject.toml +++ b/client/python/pyproject.toml @@ -4,7 +4,7 @@ version = "0.3.1" description = "Armada gRPC API python client" readme = "README.md" requires-python = ">=3.7" -dependencies = ["grpcio>=1.46.3", "grpcio-tools>=1.46.3", "mypy-protobuf>=3.2.0", "protobuf>=3.20.3, < 5.0"] +dependencies = ["grpcio>=1.46.3, <=1.62.1", "grpcio-tools>=1.46.3, <=1.62.1", "mypy-protobuf>=3.2.0", "protobuf>=3.20.3, < 5.0"] license = { text = "Apache Software License" } authors = [{ name = "G-Research Open Source Software", email = "armada@armadaproject.io" }] From 8f7099c653d6ac66386067d362832c10754a766b Mon Sep 17 00:00:00 2001 From: Martynas Asipauskas Date: Thu, 30 May 2024 14:26:51 +0100 Subject: [PATCH 5/6] Update pyproject.toml --- client/python/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/client/python/pyproject.toml b/client/python/pyproject.toml index f3facd1d8ee..e08ab6e8201 100644 --- a/client/python/pyproject.toml +++ b/client/python/pyproject.toml @@ -4,6 +4,7 @@ version = "0.3.1" description = "Armada gRPC API python client" readme = "README.md" requires-python = ">=3.7" +# 2024-05-30 - masipauskas - we can't depend on protobuf 5+ and transitively grpcio, grpcio-tools (>1.46.3) due to probuf constraint in opentelemetry-proto used in airflow dependencies = ["grpcio>=1.46.3, <=1.62.1", "grpcio-tools>=1.46.3, <=1.62.1", "mypy-protobuf>=3.2.0", "protobuf>=3.20.3, < 5.0"] license = { text = "Apache Software License" } authors = [{ name = "G-Research Open Source Software", email = "armada@armadaproject.io" }] From 7d3f301dfa8d476097abaaba4fa71e24e795c41b Mon Sep 17 00:00:00 2001 From: Martynas Asipauskas Date: Thu, 30 May 2024 17:38:59 +0100 Subject: [PATCH 6/6] Update pyproject.toml --- client/python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/python/pyproject.toml b/client/python/pyproject.toml index e08ab6e8201..4d1a7dd348a 100644 --- a/client/python/pyproject.toml +++ b/client/python/pyproject.toml @@ -5,7 +5,7 @@ description = "Armada gRPC API python client" readme = "README.md" requires-python = ">=3.7" # 2024-05-30 - masipauskas - we can't depend on protobuf 5+ and transitively grpcio, grpcio-tools (>1.46.3) due to probuf constraint in opentelemetry-proto used in airflow -dependencies = ["grpcio>=1.46.3, <=1.62.1", "grpcio-tools>=1.46.3, <=1.62.1", "mypy-protobuf>=3.2.0", "protobuf>=3.20.3, < 5.0"] +dependencies = ["grpcio>=1.46.3, <=1.62.1", "grpcio-tools>=1.46.3, <=1.62.1", "mypy-protobuf==3.6.0", "protobuf==3.6.0"] license = { text = "Apache Software License" } authors = [{ name = "G-Research Open Source Software", email = "armada@armadaproject.io" }]