Merge branch 'main' into fix-ci-macos

Signed-off-by: Cédrik Fuoco <[email protected]>

Author: cedrik-fuoco-adsk

.github/workflows/ci.yml

@@ -470,10 +470,7 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          python3 --version
           python3 -m pip install --user --upgrade -r requirements.txt
-          python3 -m pip install --user --upgrade pipdeptree
-          python3 -m pipdeptree
   
       - name: Install Homebrew dependencies
         # icu4c is needed for Qt UIC executable / AUTOUIC.
@@ -537,11 +534,7 @@ jobs:
         run: |
           cmake --build _build --config ${{ matrix.build-type }} --target dependencies --parallel=$(python -c 'import os; print(os.cpu_count())') -v
           ls -al _build
-
-      - name: Display RV's python dependencies list to confirm pyopengl-accelerate installation
-        run: |
-          ./_build/RV_DEPS_PYTHON/install/bin/python -m pip list
-
+          
       - name: Build OpenRV main executable
         run: |
           cmake --build _build --config ${{ matrix.build-type }} --target main_executable --parallel=$(python -c 'import os; print(os.cpu_count())') -v

cmake/dependencies/python3.cmake

@@ -294,7 +294,10 @@ EXTERNALPROJECT_ADD(
 # ##############################################################################################################################################################
 # This is temporary until the patch gets into the official PyOpenGL repo.      #
 # ##############################################################################################################################################################
-IF(NOT RV_TARGET_APPLE_ARM64)
+# Only for Apple Intel. Windows and Linux uses the requirements.txt file to install PyOpenGL-accelerate.
+IF(APPLE
+   AND RV_TARGET_APPLE_X86_64
+)
   MESSAGE(STATUS "Patching PyOpenGL and building PyOpenGL from source")
   SET(_patch_pyopengl_command
       patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patch/pyopengl-accelerate.patch

src/build/make_pyside6.py

@@ -80,32 +80,65 @@ def prepare() -> None:
     # PySide6 requires Clang 13+.
     print("Setting up Clang...")
     clang_filename_suffix = ""
+    fallback_clang_filename_suffix = None
 
     system = platform.system()
     if system == "Darwin":
-        clang_version_search = re.search(
-            "version (\d+)\.(\d+)\.(\d+)",
-            os.popen("clang --version").read(),
-        )
-        clang_version_str = ".".join(clang_version_search.groups())
-        if clang_version_str == "17.0.0":
-            # The 17.0.0 version does not exist on the Qt server
-            clang_version_str = "17.0.1"
-        clang_filename_suffix = clang_version_str + "-based-macos-universal.7z"
+
+        def get_clang_version():
+            version_output = os.popen("clang --version").read()
+            version_search = re.search(r"version (\d+)\.(\d+)\.(\d+)", version_output)
+            if version_search:
+                return version_search.groups()
+            print(f"ERROR: Could not extract clang --version")
+            return None
+
+        def get_clang_filename_suffix(version):
+            version_str = ".".join(version)
+            return f"{version_str}-based-macos-universal.7z"
+
+        def get_fallback_clang_filename_suffix(version):
+            major_minor_version_str = ".".join(version[:2])
+            if major_minor_version_str == "17.0":
+                return "17.0.1-based-macos-universal.7z"
+            return None
+
+        clang_version = get_clang_version()
+        if clang_version:
+            clang_filename_suffix = get_clang_filename_suffix(clang_version)
+            fallback_clang_filename_suffix = get_fallback_clang_filename_suffix(
+                clang_version
+            )
+
     elif system == "Linux":
         clang_filename_suffix = "19.1.0-based-linux-Rhel8.8-gcc10.3-x86_64.7z"
     elif system == "Windows":
         clang_filename_suffix = "19.1.0-based-windows-vs2019_64.7z"
 
     download_url = LIBCLANG_URL_BASE + clang_filename_suffix
     libclang_zip = os.path.join(TEMP_DIR, "libclang.7z")
-    if os.path.exists(libclang_zip) is False:
-        download_file(download_url, libclang_zip)
+
     # if we have a failed download, clean it up and redownload.
     # checking for False since it can return None when archive doesn't have a CRC
-    elif verify_7z_archive(libclang_zip) is False:
+    if os.path.exists(libclang_zip) and verify_7z_archive(libclang_zip) is False:
         os.remove(libclang_zip)
-        download_file(download_url, libclang_zip)
+
+    # download it if necessary
+    if os.path.exists(libclang_zip) is False:
+        download_ok = download_file(download_url, libclang_zip)
+        if not download_ok and fallback_clang_filename_suffix:
+            fallback_download_url = LIBCLANG_URL_BASE + fallback_clang_filename_suffix
+            print(
+                f"WARNING: Could not download or version does not exist: {download_url}"
+            )
+            print(
+                f"WARNING: Attempting to fallback on known version: {fallback_download_url}..."
+            )
+            download_ok = download_file(fallback_download_url, libclang_zip)
+        if not download_ok:
+            print(
+                f"ERROR: Could not download or version does not exist: {download_url}"
+            )
 
     # clean up previous failed extraction
     libclang_tmp = os.path.join(TEMP_DIR, "libclang-tmp")

src/build/utils.py

@@ -231,6 +231,8 @@ def download_file(url, file_path):
     """
     Download a file with HTTP or HTTPS.
 
+    Returns True if the HTTP request succeeded, False otherwise
+
     param: url: url to download
     param file_path: destination file path
     """
@@ -251,6 +253,8 @@ def download_file(url, file_path):
                 file.write(chunk)
                 print(f"{current} / {total} ({round((current / total) * 100)}%)")
 
+    return req.ok
+
 
 def get_cygpath_windows(cygpath: str) -> str:
     """

src/plugins/rv-packages/stereo_disassembly/PACKAGE

@@ -1,4 +1,4 @@
-package: Stereo Disassmbly
+package: Stereo Disassembly
 author: Autodesk, Inc.
 organization: Autodesk, Inc.
 version: 1.3
@@ -48,7 +48,7 @@ description: |
   <div class="paragraph"><p>Four menu items provide access to various functions of the package:</p></div>
   <div class="sect3">
   <h4 id="_em_image_stereo_disassembly_add_disassembly_node_em"><em>Image/Stereo/Disassembly-Add Disassembly Node</em></h4>
-  <div class="paragraph"><p>Selecting this menu item will cause RV to examine the currently visible sources, and for each, if it does not already have a StereoDisassmbly node, add one.  Note that the node will be added "internally" (in the RVLinearizePipelineGroup within the Source), so the new node will not be visible in the Session manager, and any view using this Source will see the result of the "disassembly".</p></div>
+  <div class="paragraph"><p>Selecting this menu item will cause RV to examine the currently visible sources, and for each, if it does not already have a StereoDisassembly node, add one.  Note that the node will be added "internally" (in the RVLinearizePipelineGroup within the Source), so the new node will not be visible in the Session manager, and any view using this Source will see the result of the "disassembly".</p></div>
   </div>
   <div class="sect3">
   <h4 id="_em_image_stereo_disassembly_remove_disassembly_node_em"><em>Image/Stereo/Disassembly-Remove Disassembly Node</em></h4>

src/plugins/rv-packages/stereo_disassembly/stereo_disassembly_help.asciidoc

@@ -25,7 +25,7 @@ This experimental package enables you to load stereo media with both eyes in the
 Four menu items provide access to various functions of the package:
 
 ==== 'Image/Stereo/Disassembly-Add Disassembly Node' ====
-Selecting this menu item will cause RV to examine the currently visible sources, and for each, if it does not already have a StereoDisassmbly node, add one.  Note that the node will be added "internally" (in the RVLinearizePipelineGroup within the Source), so the new node will not be visible in the Session Manager, and any view using this Source will see the result of the "disassembly".
+Selecting this menu item will cause RV to examine the currently visible sources, and for each, if it does not already have a StereoDisassembly node, add one.  Note that the node will be added "internally" (in the RVLinearizePipelineGroup within the Source), so the new node will not be visible in the Session Manager, and any view using this Source will see the result of the "disassembly".
 
 ==== 'Image/Stereo/Disassembly-Remove Disassembly Node' ====
 Remove StereoDisassembly nodes from all visible sources.

src/plugins/rv-packages/stereo_disassembly/stereo_disassembly_help.html

@@ -612,7 +612,7 @@ <h3 id="_menu_items">Menu Items</h3>
 <div class="paragraph"><p>Four menu items provide access to various functions of the package:</p></div>
 <div class="sect3">
 <h4 id="_em_image_stereo_disassembly_add_disassembly_node_em"><em>Image/Stereo/Disassembly-Add Disassembly Node</em></h4>
-<div class="paragraph"><p>Selecting this menu item will cause RV to examine the currently visible sources, and for each, if it does not already have a StereoDisassmbly node, add one.  Note that the node will be added "internally" (in the RVLinearizePipelineGroup within the Source), so the new node will not be visible in the Session Manager, and any view using this Source will see the result of the "disassembly".</p></div>
+<div class="paragraph"><p>Selecting this menu item will cause RV to examine the currently visible sources, and for each, if it does not already have a StereoDisassembly node, add one.  Note that the node will be added "internally" (in the RVLinearizePipelineGroup within the Source), so the new node will not be visible in the Session Manager, and any view using this Source will see the result of the "disassembly".</p></div>
 </div>
 <div class="sect3">
 <h4 id="_em_image_stereo_disassembly_remove_disassembly_node_em"><em>Image/Stereo/Disassembly-Remove Disassembly Node</em></h4>