fix: Workaround for launcher bug on windows; Added missing release notes; Platform dependent harmony build on CI

.github/workflows/build-plugin.yml

@@ -75,7 +75,7 @@ jobs:
     needs: set-variables
     concurrency:
       group: ci-${{ github.ref }}
-    if: ${{ needs.set-variables.outputs.package != 'framework-photoshop' && needs.set-variables.outputs.package != 'framework-premiere' && needs.set-variables.outputs.package != 'framework-harmony' }}
+    if: ${{ needs.set-variables.outputs.package != 'framework-photoshop' && needs.set-variables.outputs.package != 'framework-premiere' }}
     runs-on: ubuntu-latest
     outputs:
       package: ${{ needs.set-variables.outputs.package }}
@@ -86,9 +86,13 @@ jobs:
         with:
           python-version: '3.7'
       - uses: actions/setup-python@v4
-        if: ${{ needs.set-variables.outputs.package == 'framework-harmony' || needs.set-variables.outputs.package == 'framework-houdini'}}
+        if: ${{ needs.set-variables.outputs.package == 'framework-houdini'}}
         with:
           python-version: '3.9'
+      - uses: actions/setup-python@v4
+        if: ${{ needs.set-variables.outputs.package == 'framework-harmony' }}
+        with:
+          python-version: '3.10'
       - name: install poetry
         shell: bash
         run: |
@@ -106,12 +110,19 @@ jobs:
           # Use --testpypi or --from_source to change where the deps are picked from
           python tools/build.py --remove_intermediate_folder build_connect_plugin ${{ needs.set-variables.outputs.folder }}
       - name: build standard framework DCC integration plugin
-        if: ${{ needs.set-variables.outputs.package == 'framework-maya' || needs.set-variables.outputs.package == 'framework-nuke' || needs.set-variables.outputs.package == 'framework-harmony' || needs.set-variables.outputs.package == 'framework-houdini'}}
+        if: ${{ needs.set-variables.outputs.package == 'framework-maya' || needs.set-variables.outputs.package == 'framework-nuke' || needs.set-variables.outputs.package == 'framework-houdini'}}
         shell: bash
         run: |
           pip install -r tools/requirements.txt
           # Use --testpypi or --from_source to change where the deps are picked from
           python tools/build.py --remove_intermediate_folder --include_resources resource/bootstrap build_connect_plugin ${{ needs.set-variables.outputs.folder }}
+      - name: build standard platform dependent framework DCC integration plugin
+        if: ${{ needs.set-variables.outputs.package == 'framework-harmony'}}
+        shell: bash
+        run: |
+          pip install -r tools/requirements.txt
+          # Use --testpypi or --from_source to change where the deps are picked from
+          python tools/build.py --remove_intermediate_folder --include_resources resource/bootstrap --platform_dependent build_connect_plugin ${{ needs.set-variables.outputs.folder }}
       - name: build nuke studio connect plugin
         if: ${{ needs.set-variables.outputs.package == 'nuke-studio' }}
         shell: bash
@@ -139,46 +150,54 @@ jobs:
           name: dist
           path: ${{ needs.set-variables.outputs.folder }}/dist
 
-#  build-windows:
-#    name: Build Windows platform dependent artifacts
-#    needs: set-variables
-#    concurrency:
-#      group: ci-${{ github.ref }}
-#    if: ${{ needs.set-variables.outputs.package == 'framework-photoshop' }}
-#    runs-on: windows-latest
-#    steps:
-#      - uses: actions/checkout@v3
-#      - uses: actions/setup-python@v4
-#        with:
-#          python-version: '3.7'
-#      - name: install poetry
-#        shell: bash
-#        run: |
-#          pip install poetry==1.5.1
-#      - name: poetry build
-#        shell: bash
-#        run: |
-#          cd ${{ needs.set-variables.outputs.folder }}
-#          poetry build
-#      - name: build standard connect plugin
-#        shell: bash
-#        run: |
-#          pip install -r tools/requirements.txt
-#          python tools/build.py --remove_intermediate_folder build_connect_plugin ${{ needs.set-variables.outputs.folder }}
-#      - name: upload artifacts to release
-#        shell: bash
-#        run: |
-#          cd ${{ needs.set-variables.outputs.folder }}
-#          gh release upload ${{ needs.set-variables.outputs.tag }} dist/*  --clobber
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  build-windows:
+    name: Build Windows platform dependent artifacts
+    needs: set-variables
+    concurrency:
+      group: ci-${{ github.ref }}
+    if: ${{ needs.set-variables.outputs.package == 'framework-harmony' }}
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - name: install poetry
+        shell: bash
+        run: |
+          pip install poetry==1.5.1
+      - name: poetry build
+        shell: bash
+        run: |
+          cd ${{ needs.set-variables.outputs.folder }}
+          poetry build
+      - name: build standard platform dependent framework DCC integration plugin
+        if: ${{ needs.set-variables.outputs.package == 'framework-harmony'}}
+        shell: bash
+        run: |
+          pip install -r tools/requirements-connect.txt
+          # Use --testpypi or --from_source to change where the deps are picked from
+          python tools/build.py --remove_intermediate_folder --include_resources resource/bootstrap --platform_dependent build_connect_plugin ${{ needs.set-variables.outputs.folder }}
+      - name: upload artifacts to release
+        shell: bash
+        run: |
+          cd ${{ needs.set-variables.outputs.folder }}
+          gh release upload ${{ needs.set-variables.outputs.tag }} dist/* --clobber
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload temp artifacts
+        uses: actions/upload-artifact@v2
+        if: ${{ needs.set-variables.outputs.to_pypi == 'true' }}
+        with:
+          name: dist
+          path: ${{ needs.set-variables.outputs.folder }}/dist
 
   build-mac:
     name: Build Mac platform dependent artifacts
     needs: set-variables
     concurrency:
       group: ci-${{ github.ref }}
-    if: ${{ needs.set-variables.outputs.package == 'framework-photoshop' || needs.set-variables.outputs.package == 'framework-premiere' }}
+    if: ${{ needs.set-variables.outputs.package == 'framework-photoshop' || needs.set-variables.outputs.package == 'framework-premiere' || needs.set-variables.outputs.package == 'framework-harmony' }}
     runs-on: macos-12
     steps:
       - uses: actions/checkout@v3
@@ -208,6 +227,13 @@ jobs:
           pip install -r tools/requirements.txt
           # Use --testpypi or --from_source to change where the deps are picked from
           python tools/build.py --remove_intermediate_folder --include_resources resource/presets build_connect_plugin ${{ needs.set-variables.outputs.folder }}
+      - name: build platform dependent framework DCC integration plugin
+        if: ${{ needs.set-variables.outputs.package == 'framework-harmony'}}
+        shell: bash
+        run: |
+          pip install -r tools/requirements.txt
+          # Use --testpypi or --from_source to change where the deps are picked from
+          python tools/build.py --remove_intermediate_folder --include_resources resource/bootstrap --platform_dependent build_connect_plugin ${{ needs.set-variables.outputs.folder }}
       - name: Build CSS resources for CEP extension
         if: ${{ needs.set-variables.outputs.package == 'framework-photoshop' || needs.set-variables.outputs.package == 'framework-premiere' }}
         shell: bash

libs/qt/release_notes.md

@@ -1,9 +1,5 @@
 # ftrack QT library release Notes
 
-## upcoming
-
-* [fix] Fix invoke_in_qt_main_thread so it properly returns the result of the function.
-
 
 ## v2.2.1
 2024-05-07

libs/qt/source/ftrack_qt/utils/threading/__init__.py

@@ -1,9 +1,8 @@
 # :coding: utf-8
 # :copyright: Copyright (c) 2024 ftrack
-import time
 
 try:
-    from PySide6 import QtCore, QtWidgets
+    from PySide6 import QtCore
 except ImportError:
     from PySide2 import QtCore, QtWidgets
 
@@ -19,17 +18,15 @@ def __init__(self, fn, *args, **kwargs):
         self.fn = fn
         self.args = args
         self.kwargs = kwargs
-        self.result = None
-        self.triggered = False
 
 
 class Invoker(QtCore.QObject):
     '''Invoker.'''
 
     def event(self, event):
         '''Call function on *event*.'''
-        event.result = event.fn(*event.args, **event.kwargs)
-        event.triggered = True
+        event.fn(*event.args, **event.kwargs)
+
         return True
 
 
@@ -45,12 +42,8 @@ def invoke_in_qt_main_thread(fn, *args, **kwargs):
     or cause instabilities.
     '''
     if QtCore.QThread.currentThread() is _invoker.thread():
-        return fn(*args, **kwargs)
+        fn(*args, **kwargs)
     else:
-        invoke_event = InvokeEvent(fn, *args, **kwargs)
-        QtCore.QCoreApplication.postEvent(_invoker, invoke_event)
-        # Wait for event to be run
-        while not invoke_event.triggered:
-            time.sleep(0.01)
-            QtWidgets.QApplication.processEvents()
-        return invoke_event.result
+        QtCore.QCoreApplication.postEvent(
+            _invoker, InvokeEvent(fn, *args, **kwargs)
+        )

projects/framework-harmony/README.md

@@ -57,7 +57,7 @@ Build Connect plugin:
 
 ```bash
     cd integrations
-    python tools/build.py  --include_resources resource/bootstrap build_connect_plugin projects/framework-harmony
+    python tools/build.py  --include_resources resource/bootstrap --platform_dependent build_connect_plugin projects/framework-harmony
 ```
 
 If the build fails and Harmony is using beta or experimental dependencies published to Test PyPi, use the `--testpypi` flag 

projects/framework-harmony/connect-plugin/hook/discover_ftrack_framework_harmony.py

@@ -151,13 +151,44 @@ def sync_js_plugin(app_path, framework_extensions_paths):
     shutil.copytree(src, dst)
     logger.debug(f'Copied: icons')
 
-    # Collect extensions
+    # Collect extensions and dcc config
 
     registry_instance = registry.Registry()
     registry_instance.scan_extensions(
-        paths=framework_extensions_paths, extension_types=['functions_js']
+        paths=framework_extensions_paths,
+        extension_types=['functions_js', 'dcc_config'],
     )
 
+    # Extract menu launchers
+    dcc_config = registry_instance.get_one(
+        name='framework-harmony', extension_type='dcc_config'
+    )['extension']
+
+    launchers = []
+    for tool in dcc_config['tools']:
+        on_menu = tool.get("menu", True)
+        if on_menu:
+            launchers.append(tool)
+
+    logger.debug(
+        f'Menu driven tools found: {launchers}, writing to JS plugin.'
+    )
+    launcher_path = os.path.join(path_scripts, 'launchers.js')
+    launchers = (
+        str(launchers)
+        .replace(': False', ': false')
+        .replace(': True', ': true')
+    )
+    with open(launcher_path, 'w') as f:
+        f.write(
+            '''
+function getLaunchers() {
+    return %s;
+}
+'''
+            % launchers
+        )
+
     logger.debug(
         f'JS functions extensions found: {len(registry_instance.functions_js or [])}'
     )

projects/framework-harmony/extensions/plugins/harmony_sequence_exporter.py

@@ -38,7 +38,7 @@ def run(self, store):
             render_response = harmony_connection.rpc(
                 'renderSequence',
                 [
-                    '{}{}'.format(temp_folder.replace('\\', '/'), os.sep),
+                    '{}{}'.format(temp_folder, os.sep).replace('\\', '/'),
                     prefix,
                     extension.replace('.', ''),
                     export_format,