diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 455d05f6d7..209fe9a595 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -6,7 +6,7 @@ name: OpenTimelineIO # for configuring which build will be a C++ coverage build / coverage report env: GH_COV_PY: 3.7 - GH_COV_OS: ubuntu-20.04 + GH_COV_OS: ubuntu-latest GH_DEPENDABOT: dependabot on: @@ -24,15 +24,15 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2022, macos-11] + 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-20.04 + - os: ubuntu-latest OTIO_TEST_TARGET: test - - os: windows-2022 + - os: windows-latest OTIO_TEST_TARGET: RUN_TESTS - - os: macos-11 + - os: macos-latest OTIO_TEST_TARGET: test env: @@ -86,13 +86,13 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2022, macos-11] + os: [ubuntu-latest, windows-latest, macos-latest] python-version: ['2.7', '3.7', '3.8', '3.9', '3.10'] include: - - { os: ubuntu-20.04, shell: bash } - - { os: macos-11, shell: bash } - - { os: windows-2022, shell: pwsh } - - { os: windows-2022, shell: msys2, python-version: 'mingw64' } + - { os: ubuntu-latest, shell: bash } + - { os: macos-latest, shell: bash } + - { os: windows-latest, shell: pwsh } + - { os: windows-latest, shell: msys2, python-version: 'mingw64' } defaults: run: @@ -158,7 +158,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2022, macos-11] + os: [ubuntu-latest, windows-latest, macos-latest] python-build: ['cp27*', 'cp37*', 'cp38*', 'cp39*', 'cp310*'] steps: - uses: actions/checkout@v3 @@ -206,7 +206,7 @@ jobs: package_sdist: needs: py_build_test - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index 19df9d17fa..41f6781813 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.18.2) # TODO: read this information from a configuration file, here, and in setup.py set(OTIO_VERSION_MAJOR "0") -set(OTIO_VERSION_MINOR "15") +set(OTIO_VERSION_MINOR "16") set(OTIO_VERSION_PATCH "0") set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.${OTIO_VERSION_PATCH}) diff --git a/OTIO_VERSION.json b/OTIO_VERSION.json index bdef9208a3..42f1608fc7 100644 --- a/OTIO_VERSION.json +++ b/OTIO_VERSION.json @@ -1 +1 @@ -{"version": ["0", "15", "0"]} +{"version": ["0", "16", "0"]} \ No newline at end of file diff --git a/setup.py b/setup.py index f1b3a4abd6..49a198addd 100644 --- a/setup.py +++ b/setup.py @@ -201,7 +201,7 @@ def cmake_install(self): # Metadata that gets stamped into the __init__ files during the build phase. PROJECT_METADATA = { - "version": "0.15.0", + "version": "0.16.0.dev1", "author": 'Contributors to the OpenTimelineIO project', "author_email": 'otio-discussion@lists.aswf.io', "license": 'Modified Apache 2.0 License', diff --git a/src/opentimelineio/CORE_VERSION_MAP.cpp b/src/opentimelineio/CORE_VERSION_MAP.cpp index 1eee987c64..7a8c21aecb 100644 --- a/src/opentimelineio/CORE_VERSION_MAP.cpp +++ b/src/opentimelineio/CORE_VERSION_MAP.cpp @@ -78,6 +78,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{ { "Transition", 1 }, { "UnknownSchema", 1 }, } }, + { "0.16.0.dev1", + { + { "Adapter", 1 }, + { "Clip", 2 }, + { "Composable", 1 }, + { "Composition", 1 }, + { "Effect", 1 }, + { "ExternalReference", 1 }, + { "FreezeFrame", 1 }, + { "Gap", 1 }, + { "GeneratorReference", 1 }, + { "HookScript", 1 }, + { "ImageSequenceReference", 1 }, + { "Item", 1 }, + { "LinearTimeWarp", 1 }, + { "Marker", 2 }, + { "MediaLinker", 1 }, + { "MediaReference", 1 }, + { "MissingReference", 1 }, + { "PluginManifest", 1 }, + { "SchemaDef", 1 }, + { "SerializableCollection", 1 }, + { "SerializableObject", 1 }, + { "SerializableObjectWithMetadata", 1 }, + { "Stack", 1 }, + { "Test", 1 }, + { "TimeEffect", 1 }, + { "Timeline", 1 }, + { "Track", 1 }, + { "Transition", 1 }, + { "UnknownSchema", 1 }, + } }, // {next} }; diff --git a/src/opentimelineio/CORE_VERSION_MAP.last.cpp b/src/opentimelineio/CORE_VERSION_MAP.last.cpp index 713d9761a0..1eee987c64 100644 --- a/src/opentimelineio/CORE_VERSION_MAP.last.cpp +++ b/src/opentimelineio/CORE_VERSION_MAP.last.cpp @@ -46,6 +46,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{ { "Transition", 1 }, { "UnknownSchema", 1 }, } }, + { "0.15.0", + { + { "Adapter", 1 }, + { "Clip", 2 }, + { "Composable", 1 }, + { "Composition", 1 }, + { "Effect", 1 }, + { "ExternalReference", 1 }, + { "FreezeFrame", 1 }, + { "Gap", 1 }, + { "GeneratorReference", 1 }, + { "HookScript", 1 }, + { "ImageSequenceReference", 1 }, + { "Item", 1 }, + { "LinearTimeWarp", 1 }, + { "Marker", 2 }, + { "MediaLinker", 1 }, + { "MediaReference", 1 }, + { "MissingReference", 1 }, + { "PluginManifest", 1 }, + { "SchemaDef", 1 }, + { "SerializableCollection", 1 }, + { "SerializableObject", 1 }, + { "SerializableObjectWithMetadata", 1 }, + { "Stack", 1 }, + { "Test", 1 }, + { "TimeEffect", 1 }, + { "Timeline", 1 }, + { "Track", 1 }, + { "Transition", 1 }, + { "UnknownSchema", 1 }, + } }, // {next} };