Initialize v0.18 (#1775)

Signed-off-by: Eric Reinecke <[email protected]>
AcademySoftwareFoundation · Jul 1, 2024 · 5dff8be · 5dff8be
1 parent 4440afa
commit 5dff8be
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 19 deletions.
diff --git 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.10"
-  GH_COV_OS: ubuntu-22.04
+  GH_COV_OS: ubuntu-latest
   GH_DEPENDABOT: dependabot
 
 on:
@@ -24,15 +24,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
         # Unfortunately the CMake test target is OS dependent so we set it as
         # a variable here.
         include:
-        - os: ubuntu-22.04
+        - os: ubuntu-latest
           OTIO_TEST_TARGET: test
-        - os: windows-2022
+        - os: windows-latest
           OTIO_TEST_TARGET: RUN_TESTS
-        - os: macos-14
+        - os: macos-latest
           OTIO_TEST_TARGET: test
         - os: macos-13
           OTIO_TEST_TARGET: test
@@ -94,18 +94,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
         python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         include:
-          - { os: ubuntu-22.04, shell: bash }
-          - { os: macos-14, shell: bash }
+          - { os: ubuntu-latest, shell: bash }
+          - { os: macos-latest, shell: bash }
           - { os: macos-13, shell: bash }
-          - { os: windows-2022, shell: pwsh }
-          - { os: windows-2022, shell: msys2, python-version: 'mingw64' }
+          - { os: windows-latest, shell: pwsh }
+          - { os: windows-latest, shell: msys2, python-version: 'mingw64' }
         exclude:
-          - { os: macos-14, python-version: 3.7 }
-          - { os: macos-14, python-version: 3.8 }
-          - { os: macos-14, python-version: 3.9 }
+          - { os: macos-latest, python-version: 3.7 }
+          - { os: macos-latest, python-version: 3.8 }
+          - { os: macos-latest, python-version: 3.9 }
 
     defaults:
       run:
@@ -175,10 +175,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
         python-build: ['cp37*', 'cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*']
         exclude:
-          - { os: macos-14, python-build: 'cp37*' }
+          - { os: macos-latest, python-build: 'cp37*' }
     steps:
       - uses: actions/checkout@v4
 
@@ -199,7 +199,7 @@ jobs:
 
   package_sdist:
     needs: py_build_test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
       with:

diff --git 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 "17")
+set(OTIO_VERSION_MINOR "18")
 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
@@ -1 +1 @@
-{"version": ["0", "17", "0"]}
+{"version": ["0", "18", "0"]}
diff --git a/setup.py b/setup.py
@@ -218,7 +218,7 @@ def cmake_install(self):
 
 # Metadata that gets stamped into the __init__ files during the build phase.
 PROJECT_METADATA = {
-    "version": "0.17.0",
+    "version": "0.18.0.dev1",
     "author": 'Contributors to the OpenTimelineIO project',
     "author_email": '[email protected]',
     "license": 'Apache 2.0 License',

diff --git a/src/opentimelineio/CORE_VERSION_MAP.cpp b/src/opentimelineio/CORE_VERSION_MAP.cpp
@@ -142,6 +142,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{
           { "Transition", 1 },
           { "UnknownSchema", 1 },
       } },
+    { "0.18.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
@@ -110,6 +110,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{
           { "Transition", 1 },
           { "UnknownSchema", 1 },
       } },
+    { "0.17.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}
 };