Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -173,16 +173,13 @@ 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' }
steps:
- uses: actions/checkout@v4

Expand All @@ -205,7 +202,7 @@ jobs:

package_sdist:
needs: py_build_test
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion OTIO_VERSION.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version": ["0", "18", "1"]}
{"version": ["0", "19", "0"]}
7 changes: 5 additions & 2 deletions maintainers/freeze_ci_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down Expand Up @@ -150,15 +151,17 @@ 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
)
)
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}")

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
32 changes: 32 additions & 0 deletions src/opentimelineio/CORE_VERSION_MAP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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}
};

Expand Down
32 changes: 32 additions & 0 deletions src/opentimelineio/CORE_VERSION_MAP.last.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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}
};

Expand Down
Loading