From 3f53ee9cec6d77565fc5bc2b3c6edd885334615d Mon Sep 17 00:00:00 2001
From: torzdf <36920800+torzdf@users.noreply.github.com>
Date: Fri, 2 Aug 2024 18:35:34 +0100
Subject: [PATCH 1/3] Bugfix: Convert - Correctly error if a valid mask has not
 been selected

---
 lib/align/alignments.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/align/alignments.py b/lib/align/alignments.py
index 68bdbcebe9..ff0f2207d3 100644
--- a/lib/align/alignments.py
+++ b/lib/align/alignments.py
@@ -407,8 +407,8 @@ def mask_is_valid(self, mask_type: str) -> bool:
             ``True`` if all faces in the current alignments possess the given ``mask_type``
             otherwise ``False``
         """
-        retval = any((face.get("mask", None) is not None and
-                      face["mask"].get(mask_type, None) is not None)
+        retval = all((face.get("mask") is not None and
+                      face["mask"].get(mask_type) is not None)
                      for val in self._data.values()
                      for face in val["faces"])
         logger.debug(retval)

From 6fe300e601258babcbd5f3099178bbb52ae0c63a Mon Sep 17 00:00:00 2001
From: torzdf <36920800+torzdf@users.noreply.github.com>
Date: Fri, 2 Aug 2024 18:42:57 +0100
Subject: [PATCH 2/3] pin numpy to < 2.0

---
 requirements/_requirements_base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/_requirements_base.txt b/requirements/_requirements_base.txt
index a78ebb1b88..a2f04a17a1 100644
--- a/requirements/_requirements_base.txt
+++ b/requirements/_requirements_base.txt
@@ -1,7 +1,7 @@
 tqdm>=4.65
 psutil>=5.9.0
 numexpr>=2.8.7
-numpy>=1.26.0
+numpy>=1.26.0,<2.0.0
 opencv-python>=4.9.0.0
 pillow>=9.4.0,<10.0.0
 scikit-learn>=1.3.0

From cbaad146d5aca9bd714bb6c69b10dd7c02d88f9d Mon Sep 17 00:00:00 2001
From: torzdf <36920800+torzdf@users.noreply.github.com>
Date: Sat, 10 Aug 2024 12:42:47 +0100
Subject: [PATCH 3/3] Bugfix: Linux installer - pin git to < 2.45

---
 .install/linux/faceswap_setup_x64.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.install/linux/faceswap_setup_x64.sh b/.install/linux/faceswap_setup_x64.sh
index 74825a0844..26d3997fc0 100644
--- a/.install/linux/faceswap_setup_x64.sh
+++ b/.install/linux/faceswap_setup_x64.sh
@@ -380,7 +380,9 @@ activate_env() {
 install_git() {
     # Install git inside conda environment
     info "Installing Git..."
-    yellow ; conda install git -q -y
+    # TODO On linux version 2.45.2 makes the font fixed TK pull in Python from
+    # graalpy, which breaks pretty much everything
+    yellow ; conda install "git<2.45" -q -y
 }
 
 delete_faceswap() {