From fb9bf388cb1049e064f87fed3b40d29a370e7526 Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Tue, 8 Apr 2025 11:53:45 -0400
Subject: [PATCH] Fix build

- Make tox.ini compatible with tox>=4.0
- Update constraints url
- Pin setuptools<71.0.0

Related-PR: https://github.com/pypa/setuptools/issues/4483
Change-Id: Iabccec77607b9981617bd4339ef459b308d1b780
---
 snapcraft.yaml | 3 ++-
 tox.ini        | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2d0b28d..342726c 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -175,12 +175,13 @@ parts:
       - python-openstackclient
       - gnocchiclient
       - python-octaviaclient
+      - "setuptools<71.0.0"  # https://github.com/pypa/setuptools/issues/4483
       - setuptools_scm
       - toml
       - setuptools-rust
       - Cython
     python-constraints:
-      - https://raw.githubusercontent.com/openstack/requirements/stable/zed/upper-constraints.txt
+      - https://raw.githubusercontent.com/openstack/requirements/zed-eom/upper-constraints.txt
     build-packages:
       - libffi-dev
       - libssl-dev
diff --git a/tox.ini b/tox.ini
index b375201..88e2714 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,10 +7,9 @@ basepython = python3
 install_command = pip install {opts} {packages}
 setenv =
     PATH = /snap/bin:{env:PATH}
-passenv = HOME TERM
-whitelist_externals =
-    sudo
-    /snap/bin/snapcraft
+passenv = HOME, TERM
+allowlist_externals =
+    {toxinidir}/tools/lxd_build.sh
 
 [testenv:snap]
 deps = -r{toxinidir}/requirements.txt