Merge remote-tracking branch 'upstream/mainline' into feature/pre-gui-hook

# Conflicts:
#	src/deadline/cinema4d_submitter/cinema4d_render_submitter.py
#	test/integ/test_cinema4d.py

Author: leon-li-inspire

.github/dependabot.yml

@@ -9,7 +9,13 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
-    commit-message: 
+    # PySide6 is pinned to 6.8 to align with VFX Reference Platform 2026, so
+    # Dependabot must not propose bumps for it: https://vfxplatform.com/#reference-platform
+    # Omitting `versions` and `update-types` ignores every update for the
+    # dependency, which is what we want here.
+    ignore:
+      - dependency-name: "pyside6*"
+    commit-message:
       prefix: "chore(deps):"
     # Combine all minor and patch bumps into a single PR. Major bumps do not
     # match this group and so each get their own individual PR.

.github/workflows/integ_macos.yml

@@ -2,6 +2,11 @@ name: "Integ Tests - macOS"
 
 on:
   workflow_call:
+    inputs:
+      c4d_version:
+        description: Cinema 4D major version to test
+        required: true
+        type: string
     secrets:
       AWS_OIDC_ROLE_ARN:
         required: true
@@ -22,8 +27,9 @@ jobs:
   IntegMacOS:
     if: >-
       github.repository == 'aws-deadline/deadline-cloud-for-cinema-4d' &&
-      github.ref == 'refs/heads/mainline'
-    name: Integration Tests (macOS)
+      (github.ref == 'refs/heads/mainline' ||
+      github.ref == 'refs/heads/feature/ci-tests')
+    name: Integration Tests (macOS, Cinema 4D ${{ inputs.c4d_version }})
     runs-on: macos-latest
     timeout-minutes: 60
     permissions:
@@ -35,7 +41,7 @@ jobs:
       redshift_LICENSE: "${{ secrets.RLM_PORT }}@127.0.0.1"
       g_licenseServerRLM: "127.0.0.1:${{ secrets.RLM_PORT }}"
       g_licenseModel: "LICENSEMODEL::RLM"
-      C4D_VERSION: "2026"
+      C4D_VERSION: ${{ inputs.c4d_version }}
       INSTALLER_BUCKET: ${{ secrets.INSTALLER_BUCKET }}
       INSTALLER_BUCKET_EXPECTED_OWNER: ${{ secrets.INSTALLER_BUCKET_EXPECTED_OWNER }}
     steps:
@@ -82,8 +88,8 @@ jobs:
 
       - name: Grant accessibility to Cinema 4D
         run: |
-          C4D_BIN="/Applications/Maxon Cinema 4D 2026/Cinema 4D.app/Contents/MacOS/Cinema 4D"
-          C4DPY_BIN="/Applications/Maxon Cinema 4D 2026/c4dpy.app/Contents/MacOS/c4dpy"
+          C4D_BIN="/Applications/Maxon Cinema 4D $C4D_VERSION/Cinema 4D.app/Contents/MacOS/Cinema 4D"
+          C4DPY_BIN="/Applications/Maxon Cinema 4D $C4D_VERSION/c4dpy.app/Contents/MacOS/c4dpy"
           for BIN_PATH in "$C4D_BIN" "$C4DPY_BIN"; do
             if [ -f "$BIN_PATH" ]; then
               sudo sqlite3 "/Library/Application Support/com.apple.TCC/TCC.db" \

.github/workflows/integ_windows.yml

@@ -2,6 +2,11 @@ name: "Integ Tests - Windows"
 
 on:
   workflow_call:
+    inputs:
+      c4d_version:
+        description: Cinema 4D major version to test
+        required: true
+        type: string
     secrets:
       AWS_OIDC_ROLE_ARN:
         required: true
@@ -22,8 +27,9 @@ jobs:
   IntegWindows:
     if: >-
       github.repository == 'aws-deadline/deadline-cloud-for-cinema-4d' &&
-      github.ref == 'refs/heads/mainline'
-    name: Integration Tests (Windows)
+      (github.ref == 'refs/heads/mainline' ||
+      github.ref == 'refs/heads/feature/ci-tests')
+    name: Integration Tests (Windows, Cinema 4D ${{ inputs.c4d_version }})
     runs-on: windows-latest
     timeout-minutes: 60
     permissions:
@@ -35,7 +41,7 @@ jobs:
       redshift_LICENSE: "${{ secrets.RLM_PORT }}@127.0.0.1"
       g_licenseServerRLM: "127.0.0.1:${{ secrets.RLM_PORT }}"
       g_licenseModel: "LICENSEMODEL::RLM"
-      C4D_VERSION: "2026"
+      C4D_VERSION: ${{ inputs.c4d_version }}
       INSTALLER_BUCKET: ${{ secrets.INSTALLER_BUCKET }}
       INSTALLER_BUCKET_EXPECTED_OWNER: ${{ secrets.INSTALLER_BUCKET_EXPECTED_OWNER }}
     steps:
@@ -135,6 +141,15 @@ jobs:
 
           hatch run integ:test
 
+      - name: Upload render outputs
+        if: always()
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: cinema4d-${{ inputs.c4d_version }}-render-outputs
+          path: test/integ/test_cases/**/actual/renders/**
+          if-no-files-found: ignore
+          retention-days: 7
+
       - name: Tear down
         if: always()
         shell: pwsh

.github/workflows/integration_tests_xa11y.yml

@@ -4,10 +4,19 @@ on:
   push:
     branches:
       - mainline
+      # Restricted to developers with permission to approve pull requests.
+      - feature/ci-tests
 
 jobs:
   windows:
+    name: Windows, Cinema 4D ${{ matrix.c4d_version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        c4d_version: ["2024", "2025", "2026"]
     uses: ./.github/workflows/integ_windows.yml
+    with:
+      c4d_version: ${{ matrix.c4d_version }}
     secrets:
       AWS_OIDC_ROLE_ARN: ${{ secrets.AWS_OIDC_ROLE_ARN }}
       AWS_REGION: ${{ secrets.AWS_REGION }}
@@ -21,7 +30,14 @@ jobs:
       contents: read
 
   macos:
+    name: macOS, Cinema 4D ${{ matrix.c4d_version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        c4d_version: ["2024", "2025", "2026"]
     uses: ./.github/workflows/integ_macos.yml
+    with:
+      c4d_version: ${{ matrix.c4d_version }}
     secrets:
       AWS_OIDC_ROLE_ARN: ${{ secrets.AWS_OIDC_ROLE_ARN }}
       AWS_REGION: ${{ secrets.AWS_REGION }}

.github/workflows/release_bump.yml

@@ -1,6 +1,9 @@
 name: "Release: Bump"
 
 on:
+  schedule:
+    # Every Monday at 14:00 UTC (~6/7am Pacific, ~9/10am Eastern).
+    - cron: "0 14 * * 1"
   workflow_dispatch:
     inputs:
       force_version_bump:
@@ -26,4 +29,4 @@ jobs:
       pull-requests: write
     secrets: inherit
     with:
-      force_version_bump: ${{ inputs.force_version_bump }}
+      force_version_bump: ${{ inputs.force_version_bump }}

.github/workflows/release_publish.yml

@@ -36,8 +36,14 @@ jobs:
 
   Xa11yWindows:
     needs: [TagRelease, UnitTests]
-    name: xa11y Integration Tests (Windows)
+    name: xa11y Integration Tests (Windows, Cinema 4D ${{ matrix.c4d_version }})
+    strategy:
+      fail-fast: false
+      matrix:
+        c4d_version: ["2024", "2025", "2026"]
     uses: ./.github/workflows/integ_windows.yml
+    with:
+      c4d_version: ${{ matrix.c4d_version }}
     secrets:
       AWS_OIDC_ROLE_ARN: ${{ secrets.AWS_OIDC_ROLE_ARN }}
       AWS_REGION: ${{ secrets.AWS_REGION }}
@@ -52,8 +58,14 @@ jobs:
 
   Xa11yMacOS:
     needs: [TagRelease, UnitTests]
-    name: xa11y Integration Tests (macOS)
+    name: xa11y Integration Tests (macOS, Cinema 4D ${{ matrix.c4d_version }})
+    strategy:
+      fail-fast: false
+      matrix:
+        c4d_version: ["2024", "2025", "2026"]
     uses: ./.github/workflows/integ_macos.yml
+    with:
+      c4d_version: ${{ matrix.c4d_version }}
     secrets:
       AWS_OIDC_ROLE_ARN: ${{ secrets.AWS_OIDC_ROLE_ARN }}
       AWS_REGION: ${{ secrets.AWS_REGION }}

hatch_custom_hook.py

@@ -1,7 +1,7 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 import os
 import shutil
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any
 
 from hatchling.builders.hooks.plugin.interface import BuildHookInterface
@@ -29,7 +29,7 @@ def initialize(self, version: str, build_data: dict[str, Any]) -> None:
         # Append release_date to _version.py after hatch-vcs generates it
         version_file = os.path.join(self.root, "_version.py")
         with open(version_file, "a", encoding="utf-8") as f:
-            release_date = datetime.today().strftime("%B %d, %Y")
+            release_date = datetime.now(timezone.utc).strftime("%B %d, %Y")
             f.write(f"\n__release_date__ = release_date = '{release_date}'\n")
 
         for destination in self.config["copy_version_py"]["destinations"]:

pipeline/setup-runner.py

@@ -14,11 +14,23 @@
 from botocore.config import Config
 
 C4D_INSTALLERS = {
+    "2024": {
+        "windows": {
+            "s3_key": "cinema4d/2024/Cinema4D_2024_2024.5.1_Win.exe",
+            "sha256": "e71f7f103bb783fc5155e1b43e057d20c839052a0fe712ea3f42e447acff46b1",
+            "type": "exe",
+        },
+        "macos": {
+            "s3_key": "cinema4d/2024/Cinema4D_2024_2024.5.1_Mac.dmg",
+            "sha256": "08d3d0efc8dd06f69fae8f86bf50539689b12029a2ac79c0d6c358f7d9d63edc",
+            "type": "dmg",
+        },
+    },
     "2025": {
         "windows": {
-            "s3_key": "cinema4d/2025/Cinema4D_2025_2025.3.3_Win.zip",
-            "sha256": "fcf0ea40af73727f1bc1fb1a47ea0c2f3476f0652824d3b740181dc1a6123e09",
-            "type": "zip",
+            "s3_key": "cinema4d/2025/Cinema4D_2025_2025.3.3_Win.exe",
+            "sha256": "66f5f5b74f93b32490d32386c642d6857aef98629a5b3eaa88fa366b1598a18e",
+            "type": "exe",
         },
         "macos": {
             "s3_key": "cinema4d/2025/Cinema4D_2025_2025.3.3_Mac.dmg",
@@ -41,6 +53,10 @@
 }
 
 C4D_INSTALL_PATHS = {
+    "2024": {
+        "windows": Path("C:/Program Files/Maxon Cinema 4D 2024"),
+        "macos": Path("/Applications/Maxon Cinema 4D 2024"),
+    },
     "2025": {
         "windows": Path("C:/Program Files/Maxon Cinema 4D 2025"),
         "macos": Path("/Applications/Maxon Cinema 4D 2025"),
@@ -55,7 +71,7 @@
 def run(cmd, check=True):
     """Run a shell command, exiting on failure if check is True."""
     print(f"Running: {' '.join(cmd)}")
-    result = subprocess.run(cmd)
+    result = subprocess.run(cmd, check=False)
     if check and result.returncode != 0:
         sys.exit(result.returncode)
     return result
@@ -154,6 +170,7 @@ def setup_windows(versions):
                 ],
                 capture_output=True,
                 text=True,
+                check=False,
             )
             print(f"Installer exit code: {result.returncode}")
             print(f"Installer stdout: {result.stdout}")
@@ -182,17 +199,17 @@ def setup_windows(versions):
 def setup_macos(versions):
     """Install Cinema 4D on macOS for each version."""
     for version in versions:
+        if "macos" not in C4D_INSTALLERS.get(version, {}):
+            print(f"ERROR: No macOS installer configured for version {version}")
+            sys.exit(1)
+
         install_dir = C4D_INSTALL_PATHS[version]["macos"]
         marker = install_dir / ".installed"
 
         if marker.exists():
             print(f"Cinema 4D {version} already installed at {install_dir}")
             continue
 
-        if "macos" not in C4D_INSTALLERS.get(version, {}):
-            print(f"ERROR: No macOS installer configured for version {version}")
-            sys.exit(1)
-
         print(f"Installing Cinema 4D {version}...")
         installer_info = C4D_INSTALLERS[version]["macos"]
         local_installer = Path(f"/tmp/{Path(installer_info['s3_key']).name}")
@@ -259,6 +276,7 @@ def setup_macos(versions):
             ],
             stdin=subprocess.DEVNULL,
             timeout=600,
+            check=False,
         )
         print(f"Installer exit code: {result.returncode}")
 
@@ -317,9 +335,8 @@ def _configure_rlm_licensing(versions, platform_key):
             # write to a temp file first then sudo cp it into place.
             import tempfile
 
-            tmp = tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".txt")
-            tmp.write(new_content)
-            tmp.close()
+            with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".txt") as tmp:
+                tmp.write(new_content)
             run(["sudo", "cp", tmp.name, str(config_txt)])
             os.unlink(tmp.name)
         else:
@@ -333,7 +350,7 @@ def _configure_rlm_licensing(versions, platform_key):
         "--versions",
         nargs="+",
         required=True,
-        help="Cinema 4D versions to install (e.g., 2025 2026)",
+        help="Cinema 4D versions to install (e.g., 2024 2025 2026)",
     )
     args = parser.parse_args()
 

requirements-testing.txt

@@ -4,16 +4,16 @@ mypy == 2.*
 pytest == 9.*
 pytest-cov == 7.*
 pytest-xdist == 3.*
-ruff == 0.15.*
-twine == 6.*
+ruff == 0.16.*
+twine == 7.*
 types-pyyaml == 6.*
 # for integ tests
 numpy == 2.*; python_version >= "3.12"
 numpy >= 2.2.6, < 2.5; python_version < "3.12"
 pillow == 12.*
 openjd-cli == 0.7.*
 fonttools >= 4.0.0
-deadline-cloud-test-fixtures >= 0.18.17
+deadline-cloud-test-fixtures >= 0.18.18
 # Drives the real submitter dialog via the OS accessibility tree.
 # Used by test/integ/.
-xa11y >= 0.11.0
+xa11y >= 0.13.0

scripts/_project.py

@@ -7,7 +7,7 @@
 from enum import Enum
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from typing import Any, Optional
+from typing import Any
 
 ADAPTOR_ONLY_DEPENDENCIES = {"openjd-adaptor-runtime"}
 
@@ -18,7 +18,7 @@ class CPUArch(Enum):
     AMD64: str = "amd64"
 
 
-def get_project_dict(project_path: Optional[Path] = None) -> dict[str, Any]:
+def get_project_dict(project_path: Path | None = None) -> dict[str, Any]:
     if sys.version_info < (3, 11):
         with TemporaryDirectory() as toml_env:
             toml_install_pip_args = ["pip", "install", "--target", toml_env, "toml"]
@@ -52,9 +52,9 @@ def __repr__(self) -> str:
 
 def get_dependencies(pyproject_dict: dict[str, Any], exclude_adaptor_only=True) -> list[Dependency]:
     if "project" not in pyproject_dict:
-        raise Exception("pyproject.toml is missing project section")
+        raise ValueError("pyproject.toml is missing project section")
     if "dependencies" not in pyproject_dict["project"]:
-        raise Exception("pyproject.toml is missing dependencies section")
+        raise ValueError("pyproject.toml is missing dependencies section")
 
     return [
         Dependency(dep_str)