From 9faf386da47ef86d1150120ff13bd6d903710ccf Mon Sep 17 00:00:00 2001
From: bahill <bhill@broadinstitute.org>
Date: Thu, 7 Nov 2024 16:01:05 -0500
Subject: [PATCH] Upgrade packaging to make setuptools happy (?) so actions
 will run

---
 orchestration/poetry.lock    | 11 ++++++-----
 orchestration/pyproject.toml |  3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/orchestration/poetry.lock b/orchestration/poetry.lock
index 3901186d..8f6f05a6 100644
--- a/orchestration/poetry.lock
+++ b/orchestration/poetry.lock
@@ -597,7 +597,7 @@ beautifulsoup4 = "*"
 
 [[package]]
 name = "google-api-core"
-version = "2.19.0"
+version = "2.22.0"
 description = "Google API client core library"
 category = "main"
 optional = false
@@ -609,10 +609,11 @@ googleapis-common-protos = ">=1.56.2,<2.0.dev0"
 grpcio = {version = ">=1.33.2,<2.0dev", optional = true, markers = "extra == \"grpc\""}
 grpcio-status = {version = ">=1.33.2,<2.0.dev0", optional = true, markers = "extra == \"grpc\""}
 proto-plus = ">=1.22.3,<2.0.0dev"
-protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0.dev0"
+protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<6.0.0.dev0"
 requests = ">=2.18.0,<3.0.0.dev0"
 
 [package.extras]
+async-rest = ["google-auth[aiohttp] (>=2.35.0,<3.0.dev0)"]
 grpc = ["grpcio (>=1.33.2,<2.0dev)", "grpcio-status (>=1.33.2,<2.0.dev0)", "grpcio (>=1.49.1,<2.0dev)", "grpcio-status (>=1.49.1,<2.0.dev0)"]
 grpcgcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"]
 grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"]
@@ -1250,11 +1251,11 @@ signedtoken = ["cryptography (>=3.0.0)", "pyjwt (>=2.0.0,<3)"]
 
 [[package]]
 name = "packaging"
-version = "23.2"
+version = "24.1"
 description = "Core utilities for Python packages"
 category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 
 [[package]]
 name = "pandas"
@@ -2057,7 +2058,7 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"]
 [metadata]
 lock-version = "1.1"
 python-versions = "3.9.16"
-content-hash = "188d2c1e4fa7c8d434aa39e0854b49e1ff4a606096161d60ac1ecc9b43b04e95"
+content-hash = "39bb27312cbe083ca0ab11cec2ea91901c924316683239facb7e51bcbdd0ceb4"
 
 [metadata.files]
 aiohttp = []
diff --git a/orchestration/pyproject.toml b/orchestration/pyproject.toml
index 335af35a..a5d99799 100644
--- a/orchestration/pyproject.toml
+++ b/orchestration/pyproject.toml
@@ -36,7 +36,10 @@ sentry-sdk = "^1.39.2"
 typing-extensions = "^3.7.4"
 # werkzeug = "2.2.3"
 # will have to update dagit which means updating broad-dagster-utils - FE-36
+# NB - werkzeug goes away if we get rid of dagster-utils
 aiohttp = "3.9.4"
+# >> Installed to fix https://github.com/pypa/setuptools/issues/4483
+packaging = "^24.0"
 
 [tool.poetry.dev-dependencies]
 # NB this notation is not preferred after poetry 1.2.0 https://python-poetry.org/docs/master/managing-dependencies/