Merge branch 'master' into fs3

Author: torzdf

.install/linux/faceswap_setup_x64.sh

@@ -338,10 +338,11 @@ conda_install() {
         info "Installing Miniconda3..."
         yellow ; fname="$(basename -- $DL_CONDA)"
         bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA"
+        "$CONDA_EXECUTABLE" tos accept
         if $CONDA_TO_PATH ; then
             info "Adding Miniconda3 to PATH..."
             yellow ; "$CONDA_EXECUTABLE" init
-            "$CONDA_EXECUTABLE" config --set auto_activate_base false
+            "$CONDA_EXECUTABLE" config --set auto_activate false
         fi
     fi
 }

.install/macos/faceswap_setup_macos.sh

@@ -379,10 +379,11 @@ conda_install() {
         info "Installing Miniconda3..."
         yellow ; fname="$(basename -- $DL_CONDA)"
         bash "$TMP_DIR/$fname" -b -p "$DIR_CONDA"
+        "$CONDA_EXECUTABLE" tos accept
         if $CONDA_TO_PATH ; then
             info "Adding Miniconda3 to PATH..."
             yellow ; "$CONDA_EXECUTABLE" init zsh bash
-            "$CONDA_EXECUTABLE" config --set auto_activate_base false
+            "$CONDA_EXECUTABLE" config --set auto_activate false
         fi
     fi
 }

.install/windows/install.nsi

@@ -361,6 +361,8 @@ FunctionEnd
 Function SetEnvironment
     DetailPrint "Initializing Conda..."
     SetDetailsPrint listonly
+    ExecDos::exec /NOUNLOAD /ASYNC /DETAILED "$\"$dirConda\Scripts\conda.exe$\" tos accept"
+    pop $0
     ExecDos::exec /NOUNLOAD /ASYNC /DETAILED "$\"$dirConda\scripts\activate.bat$\" && conda update -y -n base -c defaults conda && conda deactivate"
     pop $0
     ExecDos::wait $0

README.md

@@ -1,4 +1,7 @@
 # deepfakes_faceswap
+
+### Important information for **Patreon** and **PayPal** supporters. Please see this forum post: https://forum.faceswap.dev/viewtopic.php?f=14&t=3120
+
 <p align="center">
   <a href="https://faceswap.dev"><img src="https://i.imgur.com/zHvjHnb.png"></img></a>
 <br />FaceSwap is a tool that utilizes deep learning to recognize and swap faces in pictures and videos.
@@ -21,11 +24,13 @@
 <br />Jennifer Lawrence/Steve Buscemi FaceSwap using the Villain model
 </p>
 
+
 ![Build Status](https://github.com/deepfakes/faceswap/actions/workflows/pytest.yml/badge.svg) [![Documentation Status](https://readthedocs.org/projects/faceswap/badge/?version=latest)](https://faceswap.readthedocs.io/en/latest/?badge=latest)
 
 Make sure you check out [INSTALL.md](INSTALL.md) before getting started.
 
 - [deepfakes\_faceswap](#deepfakes_faceswap)
+    - [Important information for **Patreon** and **PayPal** supporters. Please see this forum post: https://forum.faceswap.dev/viewtopic.php?f=14\&t=3120](#important-information-for-patreon-and-paypal-supporters-please-see-this-forum-post-httpsforumfaceswapdevviewtopicphpf14t3120)
 - [Manifesto](#manifesto)
   - [FaceSwap has ethical uses.](#faceswap-has-ethical-uses)
 - [How To setup and run the project](#how-to-setup-and-run-the-project)
@@ -48,12 +53,6 @@ Make sure you check out [INSTALL.md](INSTALL.md) before getting started.
   - [For devs](#for-devs)
   - [For non-dev advanced users](#for-non-dev-advanced-users)
   - [For end-users](#for-end-users)
-  - [For haters](#for-haters)
-- [About github.com/deepfakes](#about-githubcomdeepfakes)
-  - [What is this repo?](#what-is-this-repo)
-  - [Why this repo?](#why-this-repo)
-  - [Why is it named 'deepfakes' if it is not /u/deepfakes?](#why-is-it-named-deepfakes-if-it-is-not-udeepfakes)
-  - [What if /u/deepfakes feels bad about that?](#what-if-udeepfakes-feels-bad-about-that)
 - [About machine learning](#about-machine-learning)
   - [How does a computer know how to recognize/shape faces? How does machine learning work? What is a neural network?](#how-does-a-computer-know-how-to-recognizeshape-faces-how-does-machine-learning-work-what-is-a-neural-network)
 
@@ -171,25 +170,6 @@ Creator of the Unbalanced and OHR models, as well as expanding various capabilit
  - Be patient. This is a relatively new technology for developers as well. Much effort is already being put into making this program easy to use for the average user. It just takes time!
  - **Notice** Any issue related to running the code has to be opened in the [faceswap Forum](https://faceswap.dev/forum)!
 
-## For haters
-Sorry, no time for that.
-
-# About github.com/deepfakes
-
-## What is this repo?
-It is a community repository for active users.
-
-## Why this repo?
-The joshua-wu repo seems not active. Simple bugs like missing _http://_ in front of urls have not been solved since days.
-
-## Why is it named 'deepfakes' if it is not /u/deepfakes?
- 1. Because a typosquat would have happened sooner or later as project grows
- 2. Because we wanted to recognize the original author
- 3. Because it will better federate contributors and users
-
-## What if /u/deepfakes feels bad about that?
-This is a friendly typosquat, and it is fully dedicated to the project. If /u/deepfakes wants to take over this repo/user and drive the project, he is welcomed to do so (Raise an issue, and he will be contacted on Reddit). Please do not send /u/deepfakes messages for help with the code you find here.
-
 # About machine learning
 
 ## How does a computer know how to recognize/shape faces? How does machine learning work? What is a neural network?

requirements/_requirements_base.txt

@@ -2,13 +2,15 @@ tqdm>=4.66
 psutil>=5.9.0
 numexpr>=2.8.7
 numpy>=1.26.0,<2.0.0
-opencv-python>=4.9.0.0
+opencv-python>=4.9.0.0,<4.12.0.0  # >=4.12 pulls in numpy2.x
 pillow>=10.3.0
 scikit-learn>=1.4.2
 fastcluster>=1.2.6
 matplotlib>=3.8.4
 imageio>=2.33.1
-imageio-ffmpeg>=0.4.9
+# ffmpeg binary >=0.6.0 breaks convert.
+# TODO fix convert to use latest binary
+imageio-ffmpeg>=0.4.9,<0.6.0
 ffmpy>=0.3.0
 pywin32>=305 ; sys_platform == "win32"
 torchvision>=0.17.2,<0.19.0

setup.py

@@ -13,7 +13,7 @@
 import sys
 import typing as T
 from shutil import which
-from subprocess import list2cmdline, PIPE, Popen, run, STDOUT
+from subprocess import PIPE, Popen, run, STDOUT
 
 from lib.logger import log_setup
 
@@ -485,7 +485,7 @@ def _parse_requirements(cls, packages: list[str]) -> list[Requirement]:
         list[:class:`packaging.Requirement`]
             List of Requirement objects that are valid for the current environment
         """
-        requirements = [Requirement(p) for p in packages]
+        requirements = [Requirement(p.split("#", maxsplit=1)[0]) for p in packages]
         retval = [r for r in requirements if r.marker is None or r.marker.evaluate()]
         if len(retval) != len(requirements):
             logger.debug("Filtered invalid packages %s",
@@ -1074,8 +1074,6 @@ def _install_setup_packages(self) -> None:
             pkg_str = str(pkg)
             if self._env.is_conda:
                 cmd = ["conda", "install", "-y", "-c", "defaults", "--override-channels"]
-                if any(char in pkg_str for char in (" ", "<", ">", "*", "|")):
-                    pkg_str = f"\"{pkg_str}\""
             else:
                 cmd = [sys.executable, "-m", "pip", "install", "--no-cache-dir"]
                 if self._env.is_admin:
@@ -1555,7 +1553,7 @@ def __init__(self,
                  is_gui: bool) -> None:
         super().__init__(environment, package, command, is_gui)
         self._cmd = which(command[0], path=os.environ.get('PATH', os.defpath))
-        self._cmdline = list2cmdline(command)
+        self._cmdline = " ".join(command)
         logger.debug("cmd: '%s', cmdline: '%s'", self._cmd, self._cmdline)
 
         self._pbar = re.compile(r"(?:eta\s[\d\W]+)|(?:\s+\|\s+\d+%)\Z")