Fixes Issue 13 and updates CI workflow (#15)

Fixed typo in variable used to produce error message
Added unittest to confirm the fixed behavior
Updated OS list and python versions in CI workflow
Updated github action versions in workflows

Signed-off-by: apetrynet <flehnerheener@gmail.com>
Co-authored-by: cgarjun <5227583+cgarjun@users.noreply.github.com>

---------

Signed-off-by: apetrynet <flehnerheener@gmail.com>

Author: apetrynet

.github/workflows/ci.yaml

@@ -19,19 +19,17 @@ jobs:
   test-plugin:
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-        # 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]
-        otio-version: ["0.17.0", "main"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        os: [ubuntu-latest, macos-14, windows-latest, macos-latest]
+        otio-version: ["0.18.1", "main"]
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/deploy_package.yaml

@@ -11,9 +11,9 @@ jobs:
     permissions:
       id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Install dependencies
@@ -23,7 +23,7 @@ jobs:
       run: |
         python -m build
     - name: Upload Built Artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: dist
         path: |

src/otio_cmx3600_adapter/cmx_3600.py

@@ -645,7 +645,7 @@ def make_transition(self, comment_data):
         if self.transition_id != self.clip_num:
             raise EDLParseError(
                 'transition and event id mismatch: {} vs {}'.format(
-                    self.transaction_id, self.clip_num,
+                    self.transition_id, self.clip_num,
                 )
             )
         if re.match(r'W(\d{3})', self.transition_type):

tests/sample_data/dissolve_test_fail.edl

@@ -0,0 +1,11 @@
+TITLE:   dissolve test
+FCM: NON-DROP FRAME
+001  TST V     C        01:00:04:05 01:00:04:14 01:00:00:00 01:00:00:09
+* FROM CLIP NAME:  clip_A
+001  TST V     C        01:00:04:14 01:00:04:14 01:00:00:09 01:00:00:09
+002  TST V     D    010 01:00:08:08 01:00:08:18 01:00:00:09 01:00:00:19
+* BLEND, DISSOLVE
+* FROM CLIP NAME:  clip_A
+* TO CLIP NAME:  clip_B
+003  TST V     C        01:00:08:18 01:00:08:19 01:00:00:19 01:00:00:20
+* FROM CLIP NAME:  clip_B

tests/test_cmx_3600_adapter.py

@@ -24,6 +24,7 @@
 DISSOLVE_TEST_2 = os.path.join(SAMPLE_DATA_DIR, "dissolve_test_2.edl")
 DISSOLVE_TEST_3 = os.path.join(SAMPLE_DATA_DIR, "dissolve_test_3.edl")
 DISSOLVE_TEST_4 = os.path.join(SAMPLE_DATA_DIR, "dissolve_test_4.edl")
+DISSOLVE_TEST_FAIL = os.path.join(SAMPLE_DATA_DIR, "dissolve_test_fail.edl")
 GAP_TEST = os.path.join(SAMPLE_DATA_DIR, "gap_test.edl")
 WIPE_TEST = os.path.join(SAMPLE_DATA_DIR, "wipe_test.edl")
 TIMECODE_MISMATCH_TEST = os.path.join(SAMPLE_DATA_DIR, "timecode_mismatch.edl")
@@ -1108,6 +1109,13 @@ def test_three_part_transition(cmx_adapter):
     assert tl.tracks[0][7].duration().value == 135.0
 
 
+def test_transition_id_mismatch(cmx_adapter):
+    with pytest.raises(cmx_adapter.module().EDLParseError) as err:
+        cmx_adapter.read_from_file(DISSOLVE_TEST_FAIL)
+
+    assert 'transition and event id mismatch: ' in str(err)
+
+
 def test_enabled(cmx_adapter):
     tl = otio.adapters.read_from_file(ENABLED_TEST)
     # Exception is raised because the OTIO file has two tracks and cmx_3600 only