From bc98250a0618effeeb3da68ff90019c2f5e0420d Mon Sep 17 00:00:00 2001
From: Sergii Tkachenko <sergiitk@google.com>
Date: Wed, 23 Aug 2023 19:36:46 -0400
Subject: [PATCH] [PSM Interop] Update packaging to fix requirements-dev.txt
 (#34142)

Previously black wouldn't install, as it required newer `packaging`
package.

This fixes `pip install -r requirements-dev.txt`. In addition, `black`
in dev dependencies file is changed to `black[d]`, which bundles
`blackd` binary (["black as a
server"](https://black.readthedocs.io/en/stable/usage_and_configuration/black_as_a_server.html)).
---
 tools/run_tests/xds_k8s_test_driver/requirements-dev.txt | 2 +-
 tools/run_tests/xds_k8s_test_driver/requirements.lock    | 2 +-
 tools/run_tests/xds_k8s_test_driver/requirements.txt     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/run_tests/xds_k8s_test_driver/requirements-dev.txt b/tools/run_tests/xds_k8s_test_driver/requirements-dev.txt
index e8d336c38a3..8b5991cffb6 100644
--- a/tools/run_tests/xds_k8s_test_driver/requirements-dev.txt
+++ b/tools/run_tests/xds_k8s_test_driver/requirements-dev.txt
@@ -1,6 +1,6 @@
 -r requirements.lock
 # Mirrors black version set in
 # https://github.com/grpc/grpc/blob/master/tools/distrib/black_code.sh
-black==23.3.0
+black[d]==23.3.0
 isort~=5.9
 # TODO(https://github.com/grpc/grpc/pull/25872): mypy
diff --git a/tools/run_tests/xds_k8s_test_driver/requirements.lock b/tools/run_tests/xds_k8s_test_driver/requirements.lock
index 3795027a910..62e00445d0e 100644
--- a/tools/run_tests/xds_k8s_test_driver/requirements.lock
+++ b/tools/run_tests/xds_k8s_test_driver/requirements.lock
@@ -10,7 +10,7 @@ grpcio-channelz==1.48.2
 kubernetes==27.2.0
 six==1.16.0
 tenacity==6.3.1
-packaging==21.3
+packaging==23.1
 Pygments==2.14.0
 python-dateutil==2.8.2
 protobuf==3.20.3
diff --git a/tools/run_tests/xds_k8s_test_driver/requirements.txt b/tools/run_tests/xds_k8s_test_driver/requirements.txt
index 0527864fd9e..3285e8901f3 100644
--- a/tools/run_tests/xds_k8s_test_driver/requirements.txt
+++ b/tools/run_tests/xds_k8s_test_driver/requirements.txt
@@ -10,7 +10,7 @@ grpcio-channelz~=1.34
 kubernetes~=27.2
 six~=1.13
 tenacity~=6.2
-packaging~=21.3
+packaging~=23.1
 Pygments~=2.9
 python-dateutil~=2.8
 protobuf~=3.14