Merge branch 'main' into nested_audio_dissolve_v1

.github/workflows/deploy_package.yaml

@@ -8,24 +8,26 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.x'
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: __token__
-        # You need to add a token to your repo's secrets
-        # Make sure you match the name of your secret to the token name below.
-        TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        python -m pip install build
+    - name: Build dist package
       run: |
-        python setup.py sdist bdist_wheel --universal
-
-        # Make sure everything works on testpypi before releasing on pypi
-        twine upload --repository pypi dist/*
+        python -m build
+    - name: Upload Built Artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: dist
+        path: |
+          ./dist/*.whl
+          ./dist/*.gz
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1

setup.py

@@ -14,7 +14,7 @@
     name="otio-aaf-adapter",
     author="Contributors to the OpenTimelineIO project",
     author_email="[email protected]",
-    version="0.15.0.dev1",
+    version="1.0.0",
     description="OpenTimelineIO Advanced Authoring Format (AAF) Adapter",
     long_description=long_description,
     long_description_content_type="text/markdown",

src/otio_aaf_adapter/adapters/advanced_authoring_format.py

@@ -870,8 +870,8 @@ def _transcribe(item, parents, edit_rate, indent=0):
             elif media_kind in ("SoundMasterTrack", "Sound"):
                 result.kind = otio.schema.TrackKind.Audio
             else:
-                # Timecode, Edgecode, others?
-                result.kind = ""
+                # Timecode, Edgecode, Data, ...
+                result.kind = f"AAF_{media_kind}"
 
     # Done!
     return result

tests/test_aaf_adapter.py

@@ -205,6 +205,11 @@
     "nested_audio_dissolve.aaf"
 )
 
+AVID_DATA_TRACK_EXAMPLE_PATH = os.path.join(
+    SAMPLE_DATA_DIR,
+    "avid_data_track_example.aaf"
+)
+
 
 try:
     lib_path = os.environ.get("OTIO_AAF_PYTHON_LIB")
@@ -1583,6 +1588,12 @@ def get_expected_dict(timeline):
         self.assertEqual(get_expected_dict(tl_unbaked), expected_unbaked)
         self.assertEqual(get_expected_dict(tl_baked), expected_baked)
 
+    def test_non_av_track_kind(self):
+        timeline = otio.adapters.read_from_file(AVID_DATA_TRACK_EXAMPLE_PATH)
+        self.assertEqual([t.kind for t in timeline.tracks],
+                         ["Video", "AAF_DataEssenceTrack"]
+                         )
+
 
 class AAFWriterTests(unittest.TestCase):
     def test_aaf_writer_gaps(self):