From 4e809067700cb35cedaa5d3ba12ac75649bd620e Mon Sep 17 00:00:00 2001
From: Jadon Naas <jadon.naas@canonical.com>
Date: Tue, 11 Jun 2024 22:06:32 -0400
Subject: [PATCH] Update setuptools pinning

The Ironic API charm is using a very old version of setuptools
due to an old configuration in the build.lock file. Update
build.lock to use a new version of setuptools, remove an
unnecessary setuptools pin from requirements.in, and
ensure the charm builds with the correct requirements pinning.
This should fix a failure in Ironic API that is blocking
testing for Ironic Conductor.

Change-Id: Ic6434cdecb68f2b6df59acde785f1e7a34bf7b2c
---
 charmcraft.yaml      | 3 +++
 requirements.in      | 1 -
 src/build.lock       | 2 +-
 test-requirements.in | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/charmcraft.yaml b/charmcraft.yaml
index c31dea1..81a3a48 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -4,6 +4,9 @@ parts:
   charm:
     source: src/
     plugin: reactive
+    reactive-charm-build-arguments:
+    - --verbose
+    - --use-lock-file-branches
     build-packages:
       - libpython3-dev
     build-snaps:
diff --git a/requirements.in b/requirements.in
index b3dc23f..c5b8af3 100644
--- a/requirements.in
+++ b/requirements.in
@@ -6,7 +6,6 @@
 # NOTE(lourot): This might look like a duplication of test-requirements.txt but
 # some tox targets use only test-requirements.txt whereas charm-build uses only
 # requirements.txt
-setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 # NOTE: newer versions of cryptography require a Rust compiler to build,
 # see
diff --git a/src/build.lock b/src/build.lock
index d157877..d9168d2 100644
--- a/src/build.lock
+++ b/src/build.lock
@@ -182,7 +182,7 @@
       "type": "python_module",
       "package": "setuptools",
       "vcs": null,
-      "version": "49.6.0"
+      "version": "62.1.0"
     },
     {
       "type": "python_module",
diff --git a/test-requirements.in b/test-requirements.in
index 376bfeb..92d9a30 100644
--- a/test-requirements.in
+++ b/test-requirements.in
@@ -4,7 +4,7 @@
 #     https://github.com/openstack-charmers/release-tools
 #
 pyparsing<3.0.0  # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
-setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
+
 
 stestr>=2.2.0