Merge remote-tracking branch 'origin/feature/pinning_file_in_publishi…

…ng' into feature/pinning_file_in_publishing
ynput · Sep 17, 2024 · f70006f · f70006f
2 parents ab3f860 + 9e71df1
commit f70006f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/client/ayon_usd/addon.py b/client/ayon_usd/addon.py
@@ -13,7 +13,7 @@
 from .utils import ADDON_DATA_JSON_PATH, DOWNLOAD_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
 from .ayon_bin_client.ayon_bin_distro.work_handler import worker
 
@@ -123,11 +123,12 @@ 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,
             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
diff --git a/client/ayon_usd/config.py b/client/ayon_usd/config.py
@@ -46,13 +46,15 @@ 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}. "
+        f"All LakeFS repository items found: {lake_fs_repo_items}")
 
 
 def get_lakefs_usdlib_path(settings: dict) -> str:

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
@@ -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)
 

diff --git 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"
diff --git 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
@@ -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",
     )
+81 −6		Docs/src/md/Examples.md
+21 −40		Docs/src/md/Getting_Started.md
+7 −5		Docs/src/md/client_gui.md
+13 −6		Docs/src/md/client_lakectlpy.md
+2 −4		Docs/src/md/client_util.md
+21 −0		Docs/src/md/client_work_handler.md
+0 −25		Docs/src/md/client_work_hanlder.md
+5 −3		Docs/src/md/mainpage.md
+14 −14		ayon_bin_distro/gui/progress_ui.py
+18 −17		ayon_bin_distro/lakectlpy/wrapper.py
+2 −1		ayon_bin_distro/util/zip.py
+8 −9		ayon_bin_distro/work_handler/worker.py