Merge branch 'main' into pure_python_install

Author: michdolan

.github/workflows/python-package.yml

@@ -21,20 +21,63 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+        # Unfortunately the CMake test target is OS dependent so we set it as
+        # a variable here.
+        include:
+        - os: ubuntu-latest
+          OTIO_TEST_TARGET: test
+        - os: windows-latest
+          OTIO_TEST_TARGET: RUN_TESTS
+        - os: macos-latest
+          OTIO_TEST_TARGET: test
+
+    env:
+      OTIO_BUILD_CONFIG: Release
+      OTIO_BUILD_DIR: ${{ github.workspace }}/build
+      OTIO_INSTALL_DIR: ${{ github.workspace }}/install
 
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v3
       with:
         submodules: 'recursive'
-
-    - name: compile c++
+    - name: Install coverage dependency
+      if: matrix.os == env.GH_COV_OS && github.actor != env.GH_DEPENDABOT
+      run: |
+        sudo apt-get install lcov
+    - name: Build
+      run: |
+        cmake -E make_directory ${{ env.OTIO_BUILD_DIR }}
+        cd ${{ env.OTIO_BUILD_DIR }}
+        cmake ${{ github.workspace }} -DCMAKE_INSTALL_PREFIX=${{ env.OTIO_INSTALL_DIR }} -DOTIO_SHARED_LIBS=OFF -DOTIO_CXX_COVERAGE=ON
+        cmake --build . --config ${{ env.OTIO_BUILD_CONFIG }}
+    - name: Run tests
+      run: |
+        cd ${{ env.OTIO_BUILD_DIR }}
+        cmake --build . --target ${{ matrix.OTIO_TEST_TARGET }} --config ${{ env.OTIO_BUILD_CONFIG }}
+    - name: Collect code coverage
+      if: matrix.os == env.GH_COV_OS && github.actor != env.GH_DEPENDABOT
       run: |
-        mkdir build
-        mkdir test_otio_inst_dir
-        cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=test_otio_inst_dir
-        cmake --build . --target install --config release
- 
+        cd ${{ env.OTIO_BUILD_DIR }}
+        lcov --capture -b . --directory . --output-file=coverage.info -q
+        cat coverage.info | sed "s/SF:.*src/SF:src/g" > coverage.filtered.info
+        lcov --remove coverage.filtered.info '*/usr/*' --output-file=coverage.filtered.info -q
+        lcov --remove coverage.filtered.info '*/deps/*' --output-file=coverage.filtered.info -q
+        lcov --remove coverage.filtered.info '*/tests/*' --output-file=coverage.filtered.info -q
+        lcov --list coverage.filtered.info
+# \todo Should the Codecov web pages show the results of the C++ or Python tests?
+#    - name: Upload coverage to Codecov
+#      if: matrix.os == env.GH_COV_OS && github.actor != env.GH_DEPENDABOT
+#      uses: codecov/[email protected]
+#      with:
+#        files: ${{ env.OTIO_BUILD_DIR }}/coverage.filtered.info
+#        flags: unittests
+#        name: opentimelineio-codecov
+#        fail_ci_if_error: true
+    - name: Install
+      run: |
+        cd ${{ env.OTIO_BUILD_DIR }}
+        cmake --build . --target install --config ${{ env.OTIO_BUILD_CONFIG }}
+
   py_build_test:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -47,11 +90,11 @@ jobs:
       OTIO_CXX_BUILD_TMP_DIR: ${{ github.workspace }}/build
 
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v3
       with:
         submodules: 'recursive'
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.2.2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install coverage dependency
@@ -80,8 +123,8 @@ jobs:
       if: matrix.python-version == env.GH_COV_PY && matrix.os == env.GH_COV_OS && github.actor != env.GH_DEPENDABOT
       uses: codecov/[email protected]
       with:
-        flags: unittests
-        name: opentimelineio-codecov
+        flags: py-unittests
+        name: py-opentimelineio-codecov
         fail_ci_if_error: true
 
   package_wheels:
@@ -92,7 +135,7 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
         python-build: [cp27*, cp37*, cp38*, cp39*]
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v3
 
       # cibuildwheel 1.12.0 gates Python 2.7 wheels builds
       # by using two environment variables, DISTUTILS_USE_SDK and MSSdk.
@@ -126,11 +169,11 @@ jobs:
     needs: py_build_test
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v3
       with:
         submodules: 'recursive'
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v3
 
     - name: Install pypa/build
       run: python -m pip install build --user

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "src/deps/any"]
 	path = src/deps/any
 	url = https://github.com/thelink2012/any.git
+[submodule "src/deps/Imath"]
+	path = src/deps/Imath
+	url = https://github.com/AcademySoftwareFoundation/Imath

CMakeLists.txt

@@ -15,6 +15,8 @@ set(OTIO_AUTHOR       "Contributors to the OpenTimelineIO project")
 set(OTIO_AUTHOR_EMAIL "[email protected]")
 set(OTIO_LICENSE      "Modified Apache 2.0 License")
 
+set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "")
+
 project(OpenTimelineIO VERSION ${OTIO_VERSION} LANGUAGES C CXX)
 
 #------------------------------------------------------------------------------
@@ -217,13 +219,23 @@ if (OTIO_AUTOMATIC_SUBMODULES AND NOT DEFINED ENV{TRAVIS})
     endif()
 endif()
 
+#------------------------------------------------------------------------------
+# Setup tests
+
+include(CTest)
+set(CTEST_OUTPUT_ON_FAILURE ON)
+
 #------------------------------------------------------------------------------
 # Build the dependencies and components
 
 add_subdirectory(src/deps)
 add_subdirectory(src/opentime)
 add_subdirectory(src/opentimelineio)
 
+if(BUILD_TESTING)
+	add_subdirectory(tests)
+endif()
+
 if(OTIO_PYTHON_INSTALL)
     add_subdirectory(src/py-opentimelineio)
 endif()

contrib/opentimelineio_contrib/adapters/kdenlive.py

@@ -92,6 +92,16 @@ def read_from_string(input_str):
         name=mlt.get('name', 'Kdenlive imported timeline'))
 
     maintractor = mlt.find("tractor[@global_feed='1']")
+    # global_feed is no longer set in newer kdenlive versions
+    if maintractor is None:
+        alltractors = mlt.findall("tractor")
+        # the last tractor is the main tractor
+        maintractor = alltractors[-1]
+        # check all other tractors are used as tracks
+        for tractor in alltractors[:-1]:
+            if maintractor.find("track[@producer='%s']" % tractor.attrib['id']) is None:
+                raise RuntimeError("Can't find main tractor")
+
     for maintrack in maintractor.findall('track'):
         if maintrack.get('producer') == 'black_track':
             continue