From fdf1b841b255fce9c9975209a0632d00a3c2be8e Mon Sep 17 00:00:00 2001 From: henryruhs Date: Mon, 11 May 2026 17:42:51 +0200 Subject: [PATCH] setup_platform is no longer needed, bring back conda.py --- facefusion.py | 5 ++--- facefusion/{environment.py => conda.py} | 24 ++---------------------- tests/test_api_stream.py | 4 +--- tests/test_library_datachannel.py | 4 +--- tests/test_rtc.py | 4 +--- tests/test_rtc_store.py | 4 +--- 6 files changed, 8 insertions(+), 37 deletions(-) rename facefusion/{environment.py => conda.py} (62%) diff --git a/facefusion.py b/facefusion.py index cbbe69bb..223d8534 100755 --- a/facefusion.py +++ b/facefusion.py @@ -4,9 +4,8 @@ import os os.environ['OMP_NUM_THREADS'] = '1' -from facefusion import core, environment +from facefusion import conda, core if __name__ == '__main__': - environment.setup_conda() - environment.setup_platform() + conda.setup() core.cli() diff --git a/facefusion/environment.py b/facefusion/conda.py similarity index 62% rename from facefusion/environment.py rename to facefusion/conda.py index 47a0b046..ab8bd586 100644 --- a/facefusion/environment.py +++ b/facefusion/conda.py @@ -2,10 +2,10 @@ import os import sys from typing import List -from facefusion.common_helper import is_linux, is_macos, is_windows +from facefusion.common_helper import is_linux, is_windows -def setup_conda() -> None: +def setup() -> None: conda_prefix = os.getenv('CONDA_PREFIX') conda_ready = os.getenv('CONDA_READY') @@ -39,23 +39,3 @@ def setup_conda() -> None: library_paths.append(os.getenv('PATH')) os.environ['PATH'] = os.pathsep.join(library_paths) os.environ['CONDA_READY'] = '1' - - -def setup_platform() -> None: - homebrew_prefix = os.environ.get('HOMEBREW_PREFIX') - platform_ready = os.getenv('PLATFORM_READY') - - if homebrew_prefix and not platform_ready: - if is_macos(): - library_paths =\ - [ - os.path.join(homebrew_prefix, 'lib'), - os.path.join(homebrew_prefix, 'opt', 'openssl', 'lib') - ] - library_paths = list(filter(os.path.exists, library_paths)) - - if library_paths: - if os.getenv('DYLD_LIBRARY_PATH'): - library_paths.append(os.getenv('DYLD_LIBRARY_PATH')) - os.environ['DYLD_LIBRARY_PATH'] = os.pathsep.join(library_paths) - os.environ['PLATFORM_READY'] = '1' diff --git a/tests/test_api_stream.py b/tests/test_api_stream.py index a8496c8d..662e6744 100644 --- a/tests/test_api_stream.py +++ b/tests/test_api_stream.py @@ -7,7 +7,7 @@ import numpy import pytest from starlette.testclient import TestClient -from facefusion import environment, metadata, session_manager, state_manager +from facefusion import metadata, session_manager, state_manager from facefusion.apis import asset_store from facefusion.apis.core import create_api from facefusion.core import common_pre_check, processors_pre_check @@ -36,8 +36,6 @@ def before_all() -> None: state_manager.init_item('face_swapper_model', 'hyperswap_1a_256') state_manager.init_item('face_swapper_pixel_boost', '256x256') - environment.setup_platform() - common_pre_check() processors_pre_check() diff --git a/tests/test_library_datachannel.py b/tests/test_library_datachannel.py index c379c596..6790d2fd 100644 --- a/tests/test_library_datachannel.py +++ b/tests/test_library_datachannel.py @@ -2,7 +2,7 @@ import ctypes import pytest -from facefusion import environment, state_manager +from facefusion import state_manager from facefusion.libraries import datachannel as datachannel_module @@ -10,8 +10,6 @@ from facefusion.libraries import datachannel as datachannel_module def before_all() -> None: state_manager.init_item('download_providers', [ 'github', 'huggingface' ]) - environment.setup_platform() - datachannel_module.pre_check() diff --git a/tests/test_rtc.py b/tests/test_rtc.py index 4ac069b4..bbc1513b 100644 --- a/tests/test_rtc.py +++ b/tests/test_rtc.py @@ -2,7 +2,7 @@ from typing import List import pytest -from facefusion import environment, rtc, state_manager +from facefusion import rtc, state_manager from facefusion.libraries import datachannel as datachannel_module, opus as opus_module, vpx as vpx_module from facefusion.types import RtcPeer @@ -11,8 +11,6 @@ from facefusion.types import RtcPeer def before_all() -> None: state_manager.init_item('download_providers', [ 'github', 'huggingface' ]) - environment.setup_platform() - datachannel_module.pre_check() opus_module.pre_check() vpx_module.pre_check() diff --git a/tests/test_rtc_store.py b/tests/test_rtc_store.py index b08337a4..de7ae6b8 100644 --- a/tests/test_rtc_store.py +++ b/tests/test_rtc_store.py @@ -1,6 +1,6 @@ import pytest -from facefusion import environment, state_manager +from facefusion import state_manager from facefusion.libraries import datachannel as datachannel_module, opus as opus_module, vpx as vpx_module @@ -8,8 +8,6 @@ from facefusion.libraries import datachannel as datachannel_module, opus as opus def before_all() -> None: state_manager.init_item('download_providers', [ 'github', 'huggingface' ]) - environment.setup_platform() - datachannel_module.pre_check() opus_module.pre_check() vpx_module.pre_check()