Skip to content

Commit ad449d8

Browse files
authored
Setting version to 0.19.0.dev1 (#1976)
* 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 <[email protected]> * Bumping version to 0.19.0.dev1 to start collecting next release features Signed-off-by: Eric Reinecke <[email protected]> * Removed commented out lines Signed-off-by: Eric Reinecke <[email protected]> --------- Signed-off-by: Eric Reinecke <[email protected]>
1 parent 4423671 commit ad449d8

File tree

7 files changed

+88
-24
lines changed

7 files changed

+88
-24
lines changed

.github/workflows/python-package.yml

Lines changed: 15 additions & 18 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-24.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-24.04, windows-2025, macos-14, macos-15]
27+
os: [ubuntu-latest, windows-latest, macos-14, 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-24.04
31+
- os: ubuntu-latest
3232
OTIO_TEST_TARGET: test
33-
- os: windows-2025
33+
- os: windows-latest
3434
OTIO_TEST_TARGET: RUN_TESTS
35-
- os: macos-15
35+
- os: macos-latest
3636
OTIO_TEST_TARGET: test
3737
- os: macos-14
3838
OTIO_TEST_TARGET: test
@@ -92,16 +92,16 @@ jobs:
9292
runs-on: ${{ matrix.os }}
9393
strategy:
9494
matrix:
95-
os: [ubuntu-24.04, windows-2025, macos-14, macos-15]
95+
os: [ubuntu-latest, windows-latest, macos-14, macos-latest]
9696
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
9797
include:
98-
- { os: ubuntu-24.04, shell: bash }
99-
- { os: macos-15, shell: bash }
98+
- { os: ubuntu-latest, shell: bash }
99+
- { os: macos-latest, shell: bash }
100100
- { os: macos-14, shell: bash }
101-
- { os: windows-2025, shell: pwsh }
102-
- { os: windows-2025, shell: msys2, python-version: "mingw64" }
101+
- { os: windows-latest, shell: pwsh }
102+
- { os: windows-latest, shell: msys2, python-version: "mingw64" }
103103
exclude:
104-
- { os: macos-15, python-version: 3.9 }
104+
- { os: macos-latest, python-version: 3.9 }
105105

106106
defaults:
107107
run:
@@ -173,16 +173,13 @@ jobs:
173173
matrix:
174174
os:
175175
[
176-
ubuntu-24.04,
176+
ubuntu-latest,
177177
ubuntu-24.04-arm,
178-
windows-2025,
178+
windows-latest,
179179
macos-14,
180-
macos-15,
180+
macos-latest,
181181
]
182182
python-build: ["cp39", "cp310", "cp311", "cp312", "cp313"]
183-
#exclude:
184-
# none currently
185-
# - { os: macos-15, python-build: 'cp37' }
186183
steps:
187184
- uses: actions/checkout@v4
188185

@@ -205,7 +202,7 @@ jobs:
205202

206203
package_sdist:
207204
needs: py_build_test
208-
runs-on: ubuntu-24.04
205+
runs-on: ubuntu-latest
209206
steps:
210207
- uses: actions/checkout@v4
211208
with:

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ 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 "18")
11-
set(OTIO_VERSION_PATCH "1")
10+
set(OTIO_VERSION_MINOR "19")
11+
set(OTIO_VERSION_PATCH "0")
1212
set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.${OTIO_VERSION_PATCH})
1313

1414
set(OTIO_AUTHOR "Contributors to the OpenTimelineIO project")

OTIO_VERSION.json

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

maintainers/freeze_ci_versions.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"https://raw.githubusercontent.com/actions/runner-images/main/README.md"
1818
)
1919
PLATFORMS = ["ubuntu", "macos", "windows"]
20+
NOT_DASH_RE_SUFFIX = r"(?!-)"
2021

2122

2223
def _parsed_args():
@@ -150,15 +151,17 @@ def unfreeze_ci(plat_map, dryrun=False):
150151

151152
for plat, plat_current in plat_map.items():
152153
plat_latest = plat + "-latest"
153-
if plat_current not in output_content:
154+
plat_latest_re = re.compile(plat_latest + NOT_DASH_RE_SUFFIX)
155+
if plat_latest_re.search(output_content) is not None:
154156
print(
155157
"Platform {} appears to already be set to -latest.".format(
156158
plat
157159
)
158160
)
159161
continue
160162

161-
output_content = output_content.replace(plat_current, plat_latest)
163+
plat_current_re = re.compile(plat_current + NOT_DASH_RE_SUFFIX)
164+
output_content = plat_current_re.sub(plat_latest, output_content)
162165
modified = True
163166
print(f"Platform {plat} unfrozen back to: {plat_latest}")
164167

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.18.1",
221+
"version": "0.19.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
@@ -206,6 +206,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{
206206
{ "Transition", 1 },
207207
{ "UnknownSchema", 1 },
208208
} },
209+
{ "0.19.0.dev1",
210+
{
211+
{ "Adapter", 1 },
212+
{ "Clip", 2 },
213+
{ "Composable", 1 },
214+
{ "Composition", 1 },
215+
{ "Effect", 1 },
216+
{ "ExternalReference", 1 },
217+
{ "FreezeFrame", 1 },
218+
{ "Gap", 1 },
219+
{ "GeneratorReference", 1 },
220+
{ "HookScript", 1 },
221+
{ "ImageSequenceReference", 1 },
222+
{ "Item", 1 },
223+
{ "LinearTimeWarp", 1 },
224+
{ "Marker", 2 },
225+
{ "MediaLinker", 1 },
226+
{ "MediaReference", 1 },
227+
{ "MissingReference", 1 },
228+
{ "PluginManifest", 1 },
229+
{ "SchemaDef", 1 },
230+
{ "SerializableCollection", 1 },
231+
{ "SerializableObject", 1 },
232+
{ "SerializableObjectWithMetadata", 1 },
233+
{ "Stack", 1 },
234+
{ "Test", 1 },
235+
{ "TimeEffect", 1 },
236+
{ "Timeline", 1 },
237+
{ "Track", 1 },
238+
{ "Transition", 1 },
239+
{ "UnknownSchema", 1 },
240+
} },
209241
// {next}
210242
};
211243

src/opentimelineio/CORE_VERSION_MAP.last.cpp

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{
174174
{ "Transition", 1 },
175175
{ "UnknownSchema", 1 },
176176
} },
177+
{ "0.18.1",
178+
{
179+
{ "Adapter", 1 },
180+
{ "Clip", 2 },
181+
{ "Composable", 1 },
182+
{ "Composition", 1 },
183+
{ "Effect", 1 },
184+
{ "ExternalReference", 1 },
185+
{ "FreezeFrame", 1 },
186+
{ "Gap", 1 },
187+
{ "GeneratorReference", 1 },
188+
{ "HookScript", 1 },
189+
{ "ImageSequenceReference", 1 },
190+
{ "Item", 1 },
191+
{ "LinearTimeWarp", 1 },
192+
{ "Marker", 2 },
193+
{ "MediaLinker", 1 },
194+
{ "MediaReference", 1 },
195+
{ "MissingReference", 1 },
196+
{ "PluginManifest", 1 },
197+
{ "SchemaDef", 1 },
198+
{ "SerializableCollection", 1 },
199+
{ "SerializableObject", 1 },
200+
{ "SerializableObjectWithMetadata", 1 },
201+
{ "Stack", 1 },
202+
{ "Test", 1 },
203+
{ "TimeEffect", 1 },
204+
{ "Timeline", 1 },
205+
{ "Track", 1 },
206+
{ "Transition", 1 },
207+
{ "UnknownSchema", 1 },
208+
} },
177209
// {next}
178210
};
179211

0 commit comments

Comments
 (0)