From 24561dc63bda6cbe564e91c7fe2a89f52d50bd51 Mon Sep 17 00:00:00 2001 From: ynput Date: Mon, 16 Sep 2024 16:26:31 +0200 Subject: [PATCH 1/3] changed bin bridgle version to v0.1.0 tag --- client/ayon_usd/addon.py | 2 +- client/ayon_usd/ayon_bin_client | 2 +- client/ayon_usd/config.py | 5 +++-- client/ayon_usd/version.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/ayon_usd/addon.py b/client/ayon_usd/addon.py index ec8b214..5b7e96b 100644 --- a/client/ayon_usd/addon.py +++ b/client/ayon_usd/addon.py @@ -125,7 +125,7 @@ def tray_start(self): controller, close_on_finish=True, auto_close_timeout=1, - delet_progress_bar_on_finish=False, + delete_progress_bar_on_finish=False, title="ayon_usd-Addon [UsdLib Download]", ) download_ui.setStyleSheet(style.load_stylesheet()) diff --git a/client/ayon_usd/ayon_bin_client b/client/ayon_usd/ayon_bin_client index 622906f..17c8f92 160000 --- a/client/ayon_usd/ayon_bin_client +++ b/client/ayon_usd/ayon_bin_client @@ -1 +1 @@ -Subproject commit 622906f5940d1931e81759f87c6c822d982224b4 +Subproject commit 17c8f92dd046a0275a3260b9cf6a12099204a154 diff --git a/client/ayon_usd/config.py b/client/ayon_usd/config.py index 0ae5bd8..d198040 100644 --- a/client/ayon_usd/config.py +++ b/client/ayon_usd/config.py @@ -46,13 +46,14 @@ def _get_lakefs_repo_items(lake_fs_repo: str) -> list: def get_lakefs_usdlib_name(lake_fs_repo: str) -> str: """Return AyonUsdBin/usd LakeFS repo object name for current platform.""" platform_name = platform.system().lower() - for item in _get_lakefs_repo_items(lake_fs_repo): + lake_fs_repo_items = _get_lakefs_repo_items(lake_fs_repo) + for item in lake_fs_repo_items: if "AyonUsdBin/usd" in item and platform_name in item: return item raise RuntimeError( "No AyonUsdBin/usd item found for current platform " - f"'{platform_name}' on LakeFS server: {lake_fs_repo}") + f"'{platform_name}' on LakeFS server: {lake_fs_repo} all lakeFs repo items: {lake_fs_repo_items}") def get_lakefs_usdlib_path(settings: dict) -> str: diff --git a/client/ayon_usd/version.py b/client/ayon_usd/version.py index 7f5b6df..cf545ce 100644 --- a/client/ayon_usd/version.py +++ b/client/ayon_usd/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring AYON addon 'ayon_usd' version.""" -__version__ = "0.1.0-alpha-dev.1" +__version__ = "0.1.0-alpha" From f903ea9df8c59cceb7ade862f57e69db706b9302 Mon Sep 17 00:00:00 2001 From: Lyon Rosenblatt Date: Mon, 16 Sep 2024 16:32:54 +0200 Subject: [PATCH 2/3] Update client/ayon_usd/config.py Co-authored-by: Roy Nieterau --- client/ayon_usd/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/ayon_usd/config.py b/client/ayon_usd/config.py index d198040..6f81601 100644 --- a/client/ayon_usd/config.py +++ b/client/ayon_usd/config.py @@ -53,7 +53,8 @@ def get_lakefs_usdlib_name(lake_fs_repo: str) -> str: raise RuntimeError( "No AyonUsdBin/usd item found for current platform " - f"'{platform_name}' on LakeFS server: {lake_fs_repo} all lakeFs repo items: {lake_fs_repo_items}") + f"'{platform_name}' on LakeFS server: {lake_fs_repo}. " + f"All LakeFS repository items found: {lake_fs_repo_items}") def get_lakefs_usdlib_path(settings: dict) -> str: From 0ec344d6557df1330c7661ab7faacd757c136843 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Mon, 16 Sep 2024 16:33:47 +0200 Subject: [PATCH 3/3] Update client/ayon_usd/config.py --- client/ayon_usd/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/ayon_usd/config.py b/client/ayon_usd/config.py index 6f81601..fa06189 100644 --- a/client/ayon_usd/config.py +++ b/client/ayon_usd/config.py @@ -53,8 +53,8 @@ def get_lakefs_usdlib_name(lake_fs_repo: str) -> str: raise RuntimeError( "No AyonUsdBin/usd item found for current platform " - f"'{platform_name}' on LakeFS server: {lake_fs_repo}. " - f"All LakeFS repository items found: {lake_fs_repo_items}") + f"'{platform_name}' on LakeFS server: {lake_fs_repo}. " + f"All LakeFS repository items found: {lake_fs_repo_items}") def get_lakefs_usdlib_path(settings: dict) -> str: