Skip to content

Commit 5dff8be

Browse files
authored
Initialize v0.18 (#1775)
Signed-off-by: Eric Reinecke <[email protected]>
1 parent 4440afa commit 5dff8be

File tree

6 files changed

+83
-19
lines changed

6 files changed

+83
-19
lines changed

.github/workflows/python-package.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: OpenTimelineIO
66
# for configuring which build will be a C++ coverage build / coverage report
77
env:
88
GH_COV_PY: "3.10"
9-
GH_COV_OS: ubuntu-22.04
9+
GH_COV_OS: ubuntu-latest
1010
GH_DEPENDABOT: dependabot
1111

1212
on:
@@ -24,15 +24,15 @@ jobs:
2424
runs-on: ${{ matrix.os }}
2525
strategy:
2626
matrix:
27-
os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
27+
os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
2828
# Unfortunately the CMake test target is OS dependent so we set it as
2929
# a variable here.
3030
include:
31-
- os: ubuntu-22.04
31+
- os: ubuntu-latest
3232
OTIO_TEST_TARGET: test
33-
- os: windows-2022
33+
- os: windows-latest
3434
OTIO_TEST_TARGET: RUN_TESTS
35-
- os: macos-14
35+
- os: macos-latest
3636
OTIO_TEST_TARGET: test
3737
- os: macos-13
3838
OTIO_TEST_TARGET: test
@@ -94,18 +94,18 @@ jobs:
9494
runs-on: ${{ matrix.os }}
9595
strategy:
9696
matrix:
97-
os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
97+
os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
9898
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
9999
include:
100-
- { os: ubuntu-22.04, shell: bash }
101-
- { os: macos-14, shell: bash }
100+
- { os: ubuntu-latest, shell: bash }
101+
- { os: macos-latest, shell: bash }
102102
- { os: macos-13, shell: bash }
103-
- { os: windows-2022, shell: pwsh }
104-
- { os: windows-2022, shell: msys2, python-version: 'mingw64' }
103+
- { os: windows-latest, shell: pwsh }
104+
- { os: windows-latest, shell: msys2, python-version: 'mingw64' }
105105
exclude:
106-
- { os: macos-14, python-version: 3.7 }
107-
- { os: macos-14, python-version: 3.8 }
108-
- { os: macos-14, python-version: 3.9 }
106+
- { os: macos-latest, python-version: 3.7 }
107+
- { os: macos-latest, python-version: 3.8 }
108+
- { os: macos-latest, python-version: 3.9 }
109109

110110
defaults:
111111
run:
@@ -175,10 +175,10 @@ jobs:
175175
runs-on: ${{ matrix.os }}
176176
strategy:
177177
matrix:
178-
os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
178+
os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
179179
python-build: ['cp37*', 'cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*']
180180
exclude:
181-
- { os: macos-14, python-build: 'cp37*' }
181+
- { os: macos-latest, python-build: 'cp37*' }
182182
steps:
183183
- uses: actions/checkout@v4
184184

@@ -199,7 +199,7 @@ jobs:
199199

200200
package_sdist:
201201
needs: py_build_test
202-
runs-on: ubuntu-22.04
202+
runs-on: ubuntu-latest
203203
steps:
204204
- uses: actions/checkout@v4
205205
with:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.18.2)
77
# TODO: read this information from a configuration file, here, and in setup.py
88

99
set(OTIO_VERSION_MAJOR "0")
10-
set(OTIO_VERSION_MINOR "17")
10+
set(OTIO_VERSION_MINOR "18")
1111
set(OTIO_VERSION_PATCH "0")
1212
set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.${OTIO_VERSION_PATCH})
1313

OTIO_VERSION.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version": ["0", "17", "0"]}
1+
{"version": ["0", "18", "0"]}

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def cmake_install(self):
218218

219219
# Metadata that gets stamped into the __init__ files during the build phase.
220220
PROJECT_METADATA = {
221-
"version": "0.17.0",
221+
"version": "0.18.0.dev1",
222222
"author": 'Contributors to the OpenTimelineIO project',
223223
"author_email": '[email protected]',
224224
"license": 'Apache 2.0 License',

src/opentimelineio/CORE_VERSION_MAP.cpp

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{
142142
{ "Transition", 1 },
143143
{ "UnknownSchema", 1 },
144144
} },
145+
{ "0.18.0.dev1",
146+
{
147+
{ "Adapter", 1 },
148+
{ "Clip", 2 },
149+
{ "Composable", 1 },
150+
{ "Composition", 1 },
151+
{ "Effect", 1 },
152+
{ "ExternalReference", 1 },
153+
{ "FreezeFrame", 1 },
154+
{ "Gap", 1 },
155+
{ "GeneratorReference", 1 },
156+
{ "HookScript", 1 },
157+
{ "ImageSequenceReference", 1 },
158+
{ "Item", 1 },
159+
{ "LinearTimeWarp", 1 },
160+
{ "Marker", 2 },
161+
{ "MediaLinker", 1 },
162+
{ "MediaReference", 1 },
163+
{ "MissingReference", 1 },
164+
{ "PluginManifest", 1 },
165+
{ "SchemaDef", 1 },
166+
{ "SerializableCollection", 1 },
167+
{ "SerializableObject", 1 },
168+
{ "SerializableObjectWithMetadata", 1 },
169+
{ "Stack", 1 },
170+
{ "Test", 1 },
171+
{ "TimeEffect", 1 },
172+
{ "Timeline", 1 },
173+
{ "Track", 1 },
174+
{ "Transition", 1 },
175+
{ "UnknownSchema", 1 },
176+
} },
145177
// {next}
146178
};
147179

src/opentimelineio/CORE_VERSION_MAP.last.cpp

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{
110110
{ "Transition", 1 },
111111
{ "UnknownSchema", 1 },
112112
} },
113+
{ "0.17.0",
114+
{
115+
{ "Adapter", 1 },
116+
{ "Clip", 2 },
117+
{ "Composable", 1 },
118+
{ "Composition", 1 },
119+
{ "Effect", 1 },
120+
{ "ExternalReference", 1 },
121+
{ "FreezeFrame", 1 },
122+
{ "Gap", 1 },
123+
{ "GeneratorReference", 1 },
124+
{ "HookScript", 1 },
125+
{ "ImageSequenceReference", 1 },
126+
{ "Item", 1 },
127+
{ "LinearTimeWarp", 1 },
128+
{ "Marker", 2 },
129+
{ "MediaLinker", 1 },
130+
{ "MediaReference", 1 },
131+
{ "MissingReference", 1 },
132+
{ "PluginManifest", 1 },
133+
{ "SchemaDef", 1 },
134+
{ "SerializableCollection", 1 },
135+
{ "SerializableObject", 1 },
136+
{ "SerializableObjectWithMetadata", 1 },
137+
{ "Stack", 1 },
138+
{ "Test", 1 },
139+
{ "TimeEffect", 1 },
140+
{ "Timeline", 1 },
141+
{ "Track", 1 },
142+
{ "Transition", 1 },
143+
{ "UnknownSchema", 1 },
144+
} },
113145
// {next}
114146
};
115147

0 commit comments

Comments
 (0)