From 86c3fd7d1534616f6471df7a1fd99bd14eebee8a Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Sun, 9 Nov 2025 10:13:13 -0800 Subject: [PATCH 1/3] Updated freeze_ci_versions script so that it won't replace ubuntu-24.04-arm with invalid ubuntu-latest-arm Signed-off-by: Eric Reinecke --- maintainers/freeze_ci_versions.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/maintainers/freeze_ci_versions.py b/maintainers/freeze_ci_versions.py index bd1ddbb242..09606dc54e 100644 --- a/maintainers/freeze_ci_versions.py +++ b/maintainers/freeze_ci_versions.py @@ -17,6 +17,7 @@ "https://raw.githubusercontent.com/actions/runner-images/main/README.md" ) PLATFORMS = ["ubuntu", "macos", "windows"] +NOT_DASH_RE_SUFFIX = r"(?!-)" def _parsed_args(): @@ -150,7 +151,8 @@ def unfreeze_ci(plat_map, dryrun=False): for plat, plat_current in plat_map.items(): plat_latest = plat + "-latest" - if plat_current not in output_content: + plat_latest_re = re.compile(plat_latest + NOT_DASH_RE_SUFFIX) + if plat_latest_re.search(output_content) is not None: print( "Platform {} appears to already be set to -latest.".format( plat @@ -158,7 +160,8 @@ def unfreeze_ci(plat_map, dryrun=False): ) continue - output_content = output_content.replace(plat_current, plat_latest) + plat_current_re = re.compile(plat_current + NOT_DASH_RE_SUFFIX) + output_content = plat_current_re.sub(plat_latest, output_content) modified = True print(f"Platform {plat} unfrozen back to: {plat_latest}") From 2a2617d437c7d2711232263e67a6e585a144a64e Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Sun, 9 Nov 2025 10:14:16 -0800 Subject: [PATCH 2/3] Bumping version to 0.19.0.dev1 to start collecting next release features Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 32 ++++++++++---------- CMakeLists.txt | 4 +-- OTIO_VERSION.json | 2 +- setup.py | 2 +- src/opentimelineio/CORE_VERSION_MAP.cpp | 32 ++++++++++++++++++++ src/opentimelineio/CORE_VERSION_MAP.last.cpp | 32 ++++++++++++++++++++ 6 files changed, 84 insertions(+), 20 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6d37dd1a32..4d5d780745 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.10" - GH_COV_OS: ubuntu-24.04 + GH_COV_OS: ubuntu-latest GH_DEPENDABOT: dependabot on: @@ -24,15 +24,15 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-24.04, windows-2025, macos-14, macos-15] + os: [ubuntu-latest, windows-latest, macos-14, macos-latest] # Unfortunately the CMake test target is OS dependent so we set it as # a variable here. include: - - os: ubuntu-24.04 + - os: ubuntu-latest OTIO_TEST_TARGET: test - - os: windows-2025 + - os: windows-latest OTIO_TEST_TARGET: RUN_TESTS - - os: macos-15 + - os: macos-latest OTIO_TEST_TARGET: test - os: macos-14 OTIO_TEST_TARGET: test @@ -92,16 +92,16 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-24.04, windows-2025, macos-14, macos-15] + os: [ubuntu-latest, windows-latest, macos-14, macos-latest] python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] include: - - { os: ubuntu-24.04, shell: bash } - - { os: macos-15, shell: bash } + - { os: ubuntu-latest, shell: bash } + - { os: macos-latest, shell: bash } - { os: macos-14, shell: bash } - - { os: windows-2025, shell: pwsh } - - { os: windows-2025, shell: msys2, python-version: "mingw64" } + - { os: windows-latest, shell: pwsh } + - { os: windows-latest, shell: msys2, python-version: "mingw64" } exclude: - - { os: macos-15, python-version: 3.9 } + - { os: macos-latest, python-version: 3.9 } defaults: run: @@ -173,16 +173,16 @@ jobs: matrix: os: [ - ubuntu-24.04, + ubuntu-latest, ubuntu-24.04-arm, - windows-2025, + windows-latest, macos-14, - macos-15, + macos-latest, ] python-build: ["cp39", "cp310", "cp311", "cp312", "cp313"] #exclude: # none currently - # - { os: macos-15, python-build: 'cp37' } + # - { os: macos-latest, python-build: 'cp37' } steps: - uses: actions/checkout@v4 @@ -205,7 +205,7 @@ jobs: package_sdist: needs: py_build_test - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: diff --git a/CMakeLists.txt b/CMakeLists.txt index ca7f097976..cc99810542 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ 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 "18") -set(OTIO_VERSION_PATCH "1") +set(OTIO_VERSION_MINOR "19") +set(OTIO_VERSION_PATCH "0") set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.${OTIO_VERSION_PATCH}) set(OTIO_AUTHOR "Contributors to the OpenTimelineIO project") diff --git a/OTIO_VERSION.json b/OTIO_VERSION.json index 069be1984d..e63b366355 100644 --- a/OTIO_VERSION.json +++ b/OTIO_VERSION.json @@ -1 +1 @@ -{"version": ["0", "18", "1"]} \ No newline at end of file +{"version": ["0", "19", "0"]} \ No newline at end of file diff --git a/setup.py b/setup.py index e2685c9260..05f41963fc 100644 --- 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.18.1", + "version": "0.19.0.dev1", "author": 'Contributors to the OpenTimelineIO project', "author_email": 'otio-discussion@lists.aswf.io', "license": 'Apache 2.0 License', diff --git a/src/opentimelineio/CORE_VERSION_MAP.cpp b/src/opentimelineio/CORE_VERSION_MAP.cpp index 2b7eb8d0e4..80234fe6be 100644 --- a/src/opentimelineio/CORE_VERSION_MAP.cpp +++ b/src/opentimelineio/CORE_VERSION_MAP.cpp @@ -206,6 +206,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{ { "Transition", 1 }, { "UnknownSchema", 1 }, } }, + { "0.19.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 0dc98d4b11..2b7eb8d0e4 100644 --- a/src/opentimelineio/CORE_VERSION_MAP.last.cpp +++ b/src/opentimelineio/CORE_VERSION_MAP.last.cpp @@ -174,6 +174,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{ { "Transition", 1 }, { "UnknownSchema", 1 }, } }, + { "0.18.1", + { + { "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} }; From f5544dab20385cfe750acb0bdf82b6f6a5b10075 Mon Sep 17 00:00:00 2001 From: Eric Reinecke Date: Sun, 9 Nov 2025 10:24:45 -0800 Subject: [PATCH 3/3] Removed commented out lines Signed-off-by: Eric Reinecke --- .github/workflows/python-package.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 4d5d780745..a4843353cb 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -180,9 +180,6 @@ jobs: macos-latest, ] python-build: ["cp39", "cp310", "cp311", "cp312", "cp313"] - #exclude: - # none currently - # - { os: macos-latest, python-build: 'cp37' } steps: - uses: actions/checkout@v4