Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 12:54:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/feature/move-to-pyside2' into feature/move-to-pyside2

Browse source
This commit is contained in:
Ondřej Samohel 2021-06-23 10:51:05 +02:00
commit bab6c337fb
No known key found for this signature in database
GPG key ID: 02376E18990A97C6
5 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -39,6 +39,7 @@ Temporary Items
/dist/
/vendor/bin/*
/vendor/python/*
/.venv
/venv/

15
openpype/lib/import_utils.py
View file

@ -2,7 +2,6 @@ import os
import sys
import importlib
from .log import PypeLogger as Logger
from pathlib import Path
log = Logger().get_logger(__name__)
@ -24,17 +23,3 @@ def discover_host_vendor_module(module_name):
sys.path.insert(1, module_path)
return importlib.import_module(module_name)
def get_pyside2_location():
"""Get location of PySide2 and its dependencies.
Returned path can be used with `site.addsitedir()`
Returns:
str: path to PySide2
"""
path = Path(os.getenv("OPENPYPE_ROOT"))
path = path / "vendor/python/PySide2"
return str(path)

4
start.py
View file

@ -124,6 +124,10 @@ else:
paths.append(frozen_libs)
os.environ["PYTHONPATH"] = os.pathsep.join(paths)
# Vendored python modules that must not be in PYTHONPATH environment but
# are required for OpenPype processes
vendor_python_path = os.path.join(OPENPYPE_ROOT, "vendor", "python")
sys.path.insert(0, vendor_python_path)
import blessed # noqa: E402
import certifi # noqa: E402

2
tools/fetch_thirdparty_libs.ps1
View file

@ -38,7 +38,7 @@ if (-not (Test-Path -PathType Container -Path "$openpype_root\.poetry\bin")) {
}
Write-Host ">>> " -NoNewline -ForegroundColor Green
Write-Host "Installing PySide2 ... "
& "$($env:POETRY_HOME)\bin\poetry.bat" run python -m pip install PySide2 -t "$($openpype_root)\vendor\python\PySide2"
& "$($env:POETRY_HOME)\bin\poetry.bat" run python -m pip install PySide2 -t "$($openpype_root)\vendor\python"
& poetry run python "$($openpype_root)\tools\fetch_thirdparty_libs.py"
Set-Location -Path $current_dir

2
tools/fetch_thirdparty_libs.sh
View file

@ -100,7 +100,7 @@ main () {
pushd "$openpype_root" > /dev/null || return > /dev/null
echo -e "${BIGreen}>>>${RST} Installing PySide2 ..."
"$POETRY_HOME/bin/poetry" run python -m pip install PySide2 -t "$openpype_root/vendor/python/PySide2"
"$POETRY_HOME/bin/poetry" run python -m pip install PySide2 -t "$openpype_root/vendor/python"
echo -e "${BIGreen}>>>${RST} Running Pype tool ..."
poetry run python "$openpype_root/tools/fetch_thirdparty_libs.py"