Skip to content

Commit 0757653

Browse files
authored
initialize v0.16 using make start-dev-new-minor-version (#1424)
Co-authored-by: ssteinbach <[email protected]>
1 parent ef13578 commit 0757653

File tree

6 files changed

+79
-15
lines changed

6 files changed

+79
-15
lines changed

.github/workflows/python-package.yml

Lines changed: 12 additions & 12 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.7
9-
GH_COV_OS: ubuntu-20.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-20.04, windows-2022, macos-11]
27+
os: [ubuntu-latest, windows-latest, 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-20.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-11
35+
- os: macos-latest
3636
OTIO_TEST_TARGET: test
3737

3838
env:
@@ -86,13 +86,13 @@ jobs:
8686
runs-on: ${{ matrix.os }}
8787
strategy:
8888
matrix:
89-
os: [ubuntu-20.04, windows-2022, macos-11]
89+
os: [ubuntu-latest, windows-latest, macos-latest]
9090
python-version: ['2.7', '3.7', '3.8', '3.9', '3.10']
9191
include:
92-
- { os: ubuntu-20.04, shell: bash }
93-
- { os: macos-11, shell: bash }
94-
- { os: windows-2022, shell: pwsh }
95-
- { os: windows-2022, shell: msys2, python-version: 'mingw64' }
92+
- { os: ubuntu-latest, shell: bash }
93+
- { os: macos-latest, shell: bash }
94+
- { os: windows-latest, shell: pwsh }
95+
- { os: windows-latest, shell: msys2, python-version: 'mingw64' }
9696

9797
defaults:
9898
run:
@@ -158,7 +158,7 @@ jobs:
158158
runs-on: ${{ matrix.os }}
159159
strategy:
160160
matrix:
161-
os: [ubuntu-20.04, windows-2022, macos-11]
161+
os: [ubuntu-latest, windows-latest, macos-latest]
162162
python-build: ['cp27*', 'cp37*', 'cp38*', 'cp39*', 'cp310*']
163163
steps:
164164
- uses: actions/checkout@v3
@@ -206,7 +206,7 @@ jobs:
206206

207207
package_sdist:
208208
needs: py_build_test
209-
runs-on: ubuntu-20.04
209+
runs-on: ubuntu-latest
210210
steps:
211211
- uses: actions/checkout@v3
212212
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 "15")
10+
set(OTIO_VERSION_MINOR "16")
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", "15", "0"]}
1+
{"version": ["0", "16", "0"]}

setup.py

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

202202
# Metadata that gets stamped into the __init__ files during the build phase.
203203
PROJECT_METADATA = {
204-
"version": "0.15.0",
204+
"version": "0.16.0.dev1",
205205
"author": 'Contributors to the OpenTimelineIO project',
206206
"author_email": '[email protected]',
207207
"license": 'Modified Apache 2.0 License',

src/opentimelineio/CORE_VERSION_MAP.cpp

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{
7878
{ "Transition", 1 },
7979
{ "UnknownSchema", 1 },
8080
} },
81+
{ "0.16.0.dev1",
82+
{
83+
{ "Adapter", 1 },
84+
{ "Clip", 2 },
85+
{ "Composable", 1 },
86+
{ "Composition", 1 },
87+
{ "Effect", 1 },
88+
{ "ExternalReference", 1 },
89+
{ "FreezeFrame", 1 },
90+
{ "Gap", 1 },
91+
{ "GeneratorReference", 1 },
92+
{ "HookScript", 1 },
93+
{ "ImageSequenceReference", 1 },
94+
{ "Item", 1 },
95+
{ "LinearTimeWarp", 1 },
96+
{ "Marker", 2 },
97+
{ "MediaLinker", 1 },
98+
{ "MediaReference", 1 },
99+
{ "MissingReference", 1 },
100+
{ "PluginManifest", 1 },
101+
{ "SchemaDef", 1 },
102+
{ "SerializableCollection", 1 },
103+
{ "SerializableObject", 1 },
104+
{ "SerializableObjectWithMetadata", 1 },
105+
{ "Stack", 1 },
106+
{ "Test", 1 },
107+
{ "TimeEffect", 1 },
108+
{ "Timeline", 1 },
109+
{ "Track", 1 },
110+
{ "Transition", 1 },
111+
{ "UnknownSchema", 1 },
112+
} },
81113
// {next}
82114
};
83115

src/opentimelineio/CORE_VERSION_MAP.last.cpp

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,38 @@ const label_to_schema_version_map CORE_VERSION_MAP{
4646
{ "Transition", 1 },
4747
{ "UnknownSchema", 1 },
4848
} },
49+
{ "0.15.0",
50+
{
51+
{ "Adapter", 1 },
52+
{ "Clip", 2 },
53+
{ "Composable", 1 },
54+
{ "Composition", 1 },
55+
{ "Effect", 1 },
56+
{ "ExternalReference", 1 },
57+
{ "FreezeFrame", 1 },
58+
{ "Gap", 1 },
59+
{ "GeneratorReference", 1 },
60+
{ "HookScript", 1 },
61+
{ "ImageSequenceReference", 1 },
62+
{ "Item", 1 },
63+
{ "LinearTimeWarp", 1 },
64+
{ "Marker", 2 },
65+
{ "MediaLinker", 1 },
66+
{ "MediaReference", 1 },
67+
{ "MissingReference", 1 },
68+
{ "PluginManifest", 1 },
69+
{ "SchemaDef", 1 },
70+
{ "SerializableCollection", 1 },
71+
{ "SerializableObject", 1 },
72+
{ "SerializableObjectWithMetadata", 1 },
73+
{ "Stack", 1 },
74+
{ "Test", 1 },
75+
{ "TimeEffect", 1 },
76+
{ "Timeline", 1 },
77+
{ "Track", 1 },
78+
{ "Transition", 1 },
79+
{ "UnknownSchema", 1 },
80+
} },
4981
// {next}
5082
};
5183

0 commit comments

Comments
 (0)