From 77946e246be0e0279b37eaa017e7362bba155323 Mon Sep 17 00:00:00 2001
From: Gavin Aguiar <gavin@GavinPC>
Date: Mon, 24 Apr 2023 17:04:12 -0500
Subject: [PATCH 1/4] Build fixes tests

---
 tests/utils/testutils_lc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/utils/testutils_lc.py b/tests/utils/testutils_lc.py
index 68598e7d..8d0192a9 100644
--- a/tests/utils/testutils_lc.py
+++ b/tests/utils/testutils_lc.py
@@ -281,8 +281,8 @@ def _encrypt_context(cls, encryption_key: str, plain_text: str) -> str:
         return f'{iv_base64}.{encrypted_base64}.{key_sha256_base64}'
 
     def __enter__(self):
-        mesh_image = self._find_latest_mesh_image(self._host_version,
-                                                  self._py_version)
+        mesh_image = "mcr.microsoft.com/azure-functions/mesh:4.17.3.1-python3" \
+                     ".10"
         self.spawn_container(image=mesh_image)
         return self
 

From 64b5cddaef86fbb951a3b4c4916352a0b99889c4 Mon Sep 17 00:00:00 2001
From: Gavin Aguiar <gavin@GavinPC>
Date: Wed, 26 Apr 2023 21:29:28 -0500
Subject: [PATCH 2/4] Adding --use-pep517 to pip

---
 pack/scripts/nix_deps.sh    | 4 ++--
 pack/scripts/win_deps.ps1   | 4 ++--
 tests/utils/testutils_lc.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pack/scripts/nix_deps.sh b/pack/scripts/nix_deps.sh
index 33d798d6..53bf8829 100644
--- a/pack/scripts/nix_deps.sh
+++ b/pack/scripts/nix_deps.sh
@@ -4,6 +4,6 @@ python -m venv .env
 source .env/bin/activate
 python -m pip install --upgrade pip
 
-python -m pip install .
+python -m pip install . --use-pep517
 
-python -m pip install . --no-compile --target "$BUILD_SOURCESDIRECTORY/deps"
\ No newline at end of file
+python -m pip install . --no-compile --use-pep517 --target "$BUILD_SOURCESDIRECTORY/deps"
\ No newline at end of file
diff --git a/pack/scripts/win_deps.ps1 b/pack/scripts/win_deps.ps1
index d674915d..cc92ef2a 100644
--- a/pack/scripts/win_deps.ps1
+++ b/pack/scripts/win_deps.ps1
@@ -2,8 +2,8 @@ python -m venv .env
 .env\Scripts\Activate.ps1
 python -m pip install --upgrade pip
 
-python -m pip install .
+python -m pip install . --use-pep517
 
 $depsPath = Join-Path -Path $env:BUILD_SOURCESDIRECTORY -ChildPath "deps"
 
-python -m pip install . azure-functions --no-compile --target $depsPath.ToString()
+python -m pip install . azure-functions --use-pep517 --no-compile --target $depsPath.ToString()
diff --git a/tests/utils/testutils_lc.py b/tests/utils/testutils_lc.py
index 8d0192a9..68598e7d 100644
--- a/tests/utils/testutils_lc.py
+++ b/tests/utils/testutils_lc.py
@@ -281,8 +281,8 @@ def _encrypt_context(cls, encryption_key: str, plain_text: str) -> str:
         return f'{iv_base64}.{encrypted_base64}.{key_sha256_base64}'
 
     def __enter__(self):
-        mesh_image = "mcr.microsoft.com/azure-functions/mesh:4.17.3.1-python3" \
-                     ".10"
+        mesh_image = self._find_latest_mesh_image(self._host_version,
+                                                  self._py_version)
         self.spawn_container(image=mesh_image)
         return self
 

From 4b5b6cd76e6323efaf0ba0e14b05f74b9f4942f6 Mon Sep 17 00:00:00 2001
From: Gavin Aguiar <gavin@GavinPC>
Date: Wed, 26 Apr 2023 22:00:11 -0500
Subject: [PATCH 3/4] Installing setuptools and wheel

---
 pack/scripts/nix_deps.sh  | 6 +++---
 pack/scripts/win_deps.ps1 | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pack/scripts/nix_deps.sh b/pack/scripts/nix_deps.sh
index 53bf8829..8853139c 100644
--- a/pack/scripts/nix_deps.sh
+++ b/pack/scripts/nix_deps.sh
@@ -2,8 +2,8 @@
 
 python -m venv .env
 source .env/bin/activate
-python -m pip install --upgrade pip
+python -m pip install --upgrade pip setuptools wheel
 
-python -m pip install . --use-pep517
+python -m pip install .
 
-python -m pip install . --no-compile --use-pep517 --target "$BUILD_SOURCESDIRECTORY/deps"
\ No newline at end of file
+python -m pip install . --no-compile --target "$BUILD_SOURCESDIRECTORY/deps"
\ No newline at end of file
diff --git a/pack/scripts/win_deps.ps1 b/pack/scripts/win_deps.ps1
index cc92ef2a..c4afc542 100644
--- a/pack/scripts/win_deps.ps1
+++ b/pack/scripts/win_deps.ps1
@@ -1,9 +1,9 @@
 python -m venv .env
 .env\Scripts\Activate.ps1
-python -m pip install --upgrade pip
+python -m pip install --upgrade pip setuptools wheel
 
-python -m pip install . --use-pep517
+python -m pip install .
 
 $depsPath = Join-Path -Path $env:BUILD_SOURCESDIRECTORY -ChildPath "deps"
 
-python -m pip install . azure-functions --use-pep517 --no-compile --target $depsPath.ToString()
+python -m pip install . azure-functions --no-compile --target $depsPath.ToString()

From a878db954dd6dc1eda25999db0c46254bb787272 Mon Sep 17 00:00:00 2001
From: Gavin Aguiar <gavin@GavinPC>
Date: Wed, 26 Apr 2023 22:11:08 -0500
Subject: [PATCH 4/4] Upgrading pip to version 23.0

---
 pack/scripts/nix_deps.sh  | 2 +-
 pack/scripts/win_deps.ps1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pack/scripts/nix_deps.sh b/pack/scripts/nix_deps.sh
index 8853139c..13a2315d 100644
--- a/pack/scripts/nix_deps.sh
+++ b/pack/scripts/nix_deps.sh
@@ -2,7 +2,7 @@
 
 python -m venv .env
 source .env/bin/activate
-python -m pip install --upgrade pip setuptools wheel
+python -m pip install --upgrade pip==23.0
 
 python -m pip install .
 
diff --git a/pack/scripts/win_deps.ps1 b/pack/scripts/win_deps.ps1
index c4afc542..1ad0e42c 100644
--- a/pack/scripts/win_deps.ps1
+++ b/pack/scripts/win_deps.ps1
@@ -1,6 +1,6 @@
 python -m venv .env
 .env\Scripts\Activate.ps1
-python -m pip install --upgrade pip setuptools wheel
+python -m pip install --upgrade pip==23.0
 
 python -m pip install .