Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Runtime dependencies are based on dependency packages #78

Merged
merged 4 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ cython_debug/

.poetry/
.github/
vendor/bin/
vendor/python/
vendor/
docs/
website/
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ Temporary Items
/build
/dist/

/vendor/bin/*
/vendor/python/*
/vendor/*
/.venv
/venv/

Expand Down Expand Up @@ -98,4 +97,3 @@ tools/run_eventserver.*
tools/dev_*

.github_changelog_generator

12 changes: 11 additions & 1 deletion common/ayon_common/distribution/control.py
Original file line number Diff line number Diff line change
Expand Up @@ -1933,7 +1933,17 @@ def get_sys_paths(self):
List[str]: Paths that should be added to 'sys.path'.
"""

return []
output = []
dependency_dist_item = self.get_dependency_dist_item()
if dependency_dist_item is not None:
runtime_dir = None
unzip_dirpath = dependency_dist_item.unzip_dirpath
if unzip_dirpath:
runtime_dir = os.path.join(unzip_dirpath, "runtime")

if runtime_dir and os.path.exists(runtime_dir):
output.append(runtime_dir)
return output

def get_python_paths(self):
"""Get all paths to python packages that should be added to python.
Expand Down
6 changes: 0 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,6 @@ version = "6.4.3"
package = "PySide2"
version = "5.15.2"

[ayon.runtime.deps]
# TODO move to ayon_core
OpenTimelineIO = "0.14.1"
opencolorio = "2.2.1"
Pillow = "9.5.0"

[tool.pyright]
include = [
"vendor"
Expand Down
7 changes: 6 additions & 1 deletion tools/runtime_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,12 @@ def install_qtbinding(pyproject, runtime_dep_root, platform_name):


def install_runtime_dependencies(pyproject, runtime_dep_root):
runtime_deps = pyproject["ayon"]["runtime"]["deps"]
runtime_deps = (
pyproject
.get("ayon", {})
.get("runtime", {})
.get("deps", {})
)
for package, version in runtime_deps.items():
_pip_install(runtime_dep_root, package, version)

Expand Down
3 changes: 0 additions & 3 deletions vendor/README.md

This file was deleted.