From d85ad9683ac6121e27ac708fc117c31670995afd Mon Sep 17 00:00:00 2001 From: Lyon Rosenblatt Date: Fri, 13 Sep 2024 18:46:45 +0200 Subject: [PATCH 1/5] Update client/ayon_usd/standalone/usd/pinning/_pinning_file_generation_funcs.py Co-authored-by: Roy Nieterau --- .../usd/pinning/_pinning_file_generation_funcs.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/client/ayon_usd/standalone/usd/pinning/_pinning_file_generation_funcs.py b/client/ayon_usd/standalone/usd/pinning/_pinning_file_generation_funcs.py index e0ff42c..d537a00 100644 --- a/client/ayon_usd/standalone/usd/pinning/_pinning_file_generation_funcs.py +++ b/client/ayon_usd/standalone/usd/pinning/_pinning_file_generation_funcs.py @@ -11,12 +11,11 @@ def _normalize_path(path): - if (sys.platform.startswith('win') - and len(path) > 1 - and path[1] == ':' - ): - - path = path[0].lower() + path[1:] + # On windows force drive letter to lowercase + if sys.platform.startswith('win'): + drive, tail = os.path.splitdrive(path) + drive = drive.lower() + path = f"{drive}{tail}" return os.path.normpath(path) From 9c267cc015c5abf7afe08c830f298b0bc57ba6fb Mon Sep 17 00:00:00 2001 From: ynput Date: Mon, 16 Sep 2024 14:49:07 +0200 Subject: [PATCH 2/5] changed lakeFs branch to v0.1.0 tag, moved import --- client/ayon_usd/addon.py | 2 +- package.py | 2 +- server/settings/main.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/ayon_usd/addon.py b/client/ayon_usd/addon.py index bd5254b..ec8b214 100644 --- a/client/ayon_usd/addon.py +++ b/client/ayon_usd/addon.py @@ -13,7 +13,6 @@ from .utils import ADDON_DATA_JSON_PATH, DOWNLOAD_DIR, USD_ADDON_ROOT_DIR from .version import __version__ -from .ayon_bin_client.ayon_bin_distro.gui import progress_ui from .ayon_bin_client.ayon_bin_distro.work_handler import worker from .ayon_bin_client.ayon_bin_distro.util import zip @@ -121,6 +120,7 @@ def tray_start(self): dependency_id=[usd_download_work_item.get_uuid()], ) + from .ayon_bin_client.ayon_bin_distro.gui import progress_ui download_ui = progress_ui.ProgressDialog( controller, close_on_finish=True, diff --git a/package.py b/package.py index 05f85bc..336346c 100644 --- a/package.py +++ b/package.py @@ -2,7 +2,7 @@ name = "ayon_usd" title = "Usd Addon" -version = "0.1.0-alpha-dev.1" +version = "0.1.0-alpha" client_dir = "ayon_usd" services = {} diff --git a/server/settings/main.py b/server/settings/main.py index fc5d6c0..2dfb96a 100644 --- a/server/settings/main.py +++ b/server/settings/main.py @@ -108,7 +108,7 @@ class LakeFsSettings(BaseSettingsModel): description="The url to your LakeFs server.", ) server_repo: str = SettingsField( - "lakefs://ayon-usd/main/", + "lakefs://ayon-usd/v0.1.0/", title="LakeFs Repository Uri", description="The url to your LakeFs Repository Path", ) From 24561dc63bda6cbe564e91c7fe2a89f52d50bd51 Mon Sep 17 00:00:00 2001 From: ynput Date: Mon, 16 Sep 2024 16:26:31 +0200 Subject: [PATCH 3/5] 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 4/5] 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 5/5] 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: