tentative fix for macos by locking setuptools verision

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

Author: cedrik-fuoco-adsk

.github/workflows/ci.yml

@@ -470,7 +470,10 @@ 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.

cmake/dependencies/python3.cmake

@@ -291,6 +291,45 @@ EXTERNALPROJECT_ADD(
   USES_TERMINAL_BUILD TRUE
 )
 
+# ##############################################################################################################################################################
+# This is temporary until the patch gets into the official PyOpenGL repo.      #
+# ##############################################################################################################################################################
+IF(NOT RV_TARGET_APPLE_ARM64)
+  MESSAGE(STATUS "Patching PyOpenGL and building PyOpenGL from source")
+  SET(_patch_pyopengl_command
+      patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patch/pyopengl-accelerate.patch
+  )
+
+  EXTERNALPROJECT_ADD(
+    pyopengl_accelerate
+    GIT_REPOSITORY https://github.com/mcfletch/pyopengl.git
+    GIT_TAG master
+    SOURCE_DIR ${CMAKE_BINARY_DIR}/pyopengl_accelerate
+    PATCH_COMMAND ${_patch_pyopengl_command}
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/pyopengl_accelerate/setup.py
+  )
+
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_BINARY_DIR}/pyopengl_accelerate/.pip_installed
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/pyopengl_accelerate
+    COMMAND "${_python3_executable}" -m pip install .
+    COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/pyopengl_accelerate/.pip_installed
+    DEPENDS pyopengl_accelerate ${_python3_target}
+    COMMENT "Applying patch and installing patched PyOpenGL_accelerate"
+  )
+
+  ADD_CUSTOM_TARGET(
+    pyopengl_accelerate_pip_install
+    DEPENDS ${CMAKE_BINARY_DIR}/pyopengl_accelerate/.pip_installed
+  )
+
+  ADD_DEPENDENCIES(pyopengl_accelerate ${_python3_target})
+ENDIF()
+# ##############################################################################################################################################################
+
 SET(${_python3_target}-requirements-flag
     ${_install_dir}/${_python3_target}-requirements-flag
 )

src/build/requirements.txt

@@ -5,9 +5,15 @@ setuptools              # License: MIT License
 # We need to use the main branch of the OTIO Github repo since the latest release available as a Pypi package is missing some features we need for Live Review
 git+https://github.com/AcademySoftwareFoundation/OpenTimelineIO@main#egg=OpenTimelineIO # License: Other/Proprietary License (Modified Apache 2.0 License)
 PyOpenGL                # License: BSD License (BSD)
+
+# PyOpenGL_accelerate is COMMENTED OUT because of an issue with the main branch.
+# PyOpenGL_accelerate is built from source in python3.cmake as a workaround until the fix
+# is merged in the main branch.
+# See https://github.com/mcfletch/pyopengl/issues/147 and https://github.com/mcfletch/pyopengl/pull/146
+
 # PyOpenGL_accelerate as issue with native arm64 build on MacOS.
 # Use PyOpenGL_accelerate only on x86_64 platform.
-PyOpenGL_accelerate ; platform_machine=='x86_64' # License: BSD License (BSD)
+# PyOpenGL_accelerate ; platform_machine=='x86_64' # License: BSD License (BSD)
 
 
 # Those are installed by the src/build/make_python.py script, adding them here to list their licenses.