From f1c7b3d6c9ddc5d9ccddc77f51058aca1abad681 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Sun, 28 Jan 2024 20:14:23 +0100 Subject: [PATCH] Enable venv on the fly --- .flake8 | 2 +- facefusion/installer.py | 5 +---- install.py | 4 ++++ run.py | 13 +++++++++++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.flake8 b/.flake8 index 483099ec..1ca6ddab 100644 --- a/.flake8 +++ b/.flake8 @@ -1,3 +1,3 @@ [flake8] select = E3, E4, F -per-file-ignores = facefusion/core.py:E402, facefusion/installer.py:E402 +per-file-ignores = facefusion/core.py:E402 diff --git a/facefusion/installer.py b/facefusion/installer.py index 598b1fdf..b0491e47 100644 --- a/facefusion/installer.py +++ b/facefusion/installer.py @@ -4,11 +4,8 @@ import os import platform import tempfile import subprocess -from argparse import ArgumentParser, HelpFormatter - -subprocess.call([ 'pip', 'install' , 'inquirer', '-q' ]) - import inquirer +from argparse import ArgumentParser, HelpFormatter from facefusion import metadata, wording diff --git a/install.py b/install.py index 307f686f..9ce0d08a 100755 --- a/install.py +++ b/install.py @@ -1,5 +1,9 @@ #!/usr/bin/env python3 +import subprocess + +subprocess.call([ 'pip', 'install' , 'inquirer', '-q' ]) + from facefusion import installer if __name__ == '__main__': diff --git a/run.py b/run.py index 1c2a8bd9..803c6bff 100755 --- a/run.py +++ b/run.py @@ -1,6 +1,15 @@ #!/usr/bin/env python3 -from facefusion import core +import subprocess +import sys if __name__ == '__main__': - core.cli() + if 'venv' in sys.executable or 'conda' in sys.executable: + from facefusion import core + + core.cli() + else: + try: + subprocess.run([ 'venv/bin/python', 'run.py' ]) + except KeyboardInterrupt: + sys.exit()