Fix NTSC rates in global start time test (#58)

* Fix NTSC rates in global start time test * Updated CI matrix to mostly match OTIO core repo Signed-off-by: Joshua Minor <joshm@pixar.com> Signed-off-by: Joshua Minor <jminor@users.noreply.github.com>
OpenTimelineIO · Jan 29, 2025 · 8db72e8 · 8db72e8
1 parent 9b49540
commit 8db72e8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -66,9 +66,20 @@ jobs:
       matrix:
         # Use macos-13 so we'll be on intel hardware and can pull a pre-built wheel
         # When OTIO has an Apple Silicon build we can switch back to macos-latest for that version
-        os: [ubuntu-latest, macos-13, windows-latest]
+        os: [ubuntu-latest, macos-13, windows-latest, macos-latest]
         otio-version: ["main", "0.17.0"]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        include:
+          - { os: ubuntu-latest, shell: bash }
+          - { os: ubuntu-22.04, shell: bash, python-version: 3.7 }
+          - { os: macos-latest, shell: bash }
+          - { os: macos-13, shell: bash }
+          - { os: windows-latest, shell: pwsh }
+        exclude:
+          - { os: macos-latest, python-version: 3.7 }
+          - { os: macos-latest, python-version: 3.8 }
+          - { os: macos-latest, python-version: 3.9 }
+          - { os: ubuntu-latest, python-version: 3.7 }
 
     name: ${{ matrix.os }} py-${{ matrix.python-version }} otio-${{ matrix.otio-version }}
     runs-on: ${{ matrix.os }}

diff --git a/tests/test_aaf_adapter.py b/tests/test_aaf_adapter.py
@@ -1931,12 +1931,12 @@ def test_aaf_writer_metadata_roundtrip(self):
                          expected)
 
     def test_aaf_writer_global_start_time(self):
-        for tc, rate in [("01:00:00:00", 23.97),
+        for tc, rate in [("01:00:00:00", 24000 / 1001),
                          ("01:00:00:00", 24),
                          ("01:00:00:00", 25),
-                         ("01:00:00:00", 29.97),
+                         ("01:00:00:00", 30000 / 1001),
                          ("01:00:00:00", 30),
-                         ("01:00:00:00", 59.94),
+                         ("01:00:00:00", 60000 / 1001),
                          ("01:00:00:00", 60)]:
 
             otio_timeline = otio.schema.Timeline()