Skip to content

Commit 2b9c3a4

Browse files
reineckereinecke
authored
Release v0.16.0 changes (AcademySoftwareFoundation#1716)
* freeze runners to their current versions according to this: https://github.com/actions/runner-images * drop .dev1 suffix * check the README.md for any updates * update CONTRIBUTORS.md * Added note to the readme about OpenTimelineio-Plugins * c++ code formatted --------- Signed-off-by: Eric Reinecke <[email protected]>
1 parent abe8308 commit 2b9c3a4

18 files changed

+126
-89
lines changed

‎.github/workflows/python-package.yml

+12-12
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-latest
9+
GH_COV_OS: ubuntu-22.04
1010
GH_DEPENDABOT: dependabot
1111

1212
on:
@@ -24,15 +24,15 @@ jobs:
2424
runs-on: ${{ matrix.os }}
2525
strategy:
2626
matrix:
27-
os: [ubuntu-latest, windows-latest, macos-latest]
27+
os: [ubuntu-22.04, windows-2022, macos-12]
2828
# Unfortunately the CMake test target is OS dependent so we set it as
2929
# a variable here.
3030
include:
31-
- os: ubuntu-latest
31+
- os: ubuntu-22.04
3232
OTIO_TEST_TARGET: test
33-
- os: windows-latest
33+
- os: windows-2022
3434
OTIO_TEST_TARGET: RUN_TESTS
35-
- os: macos-latest
35+
- os: macos-12
3636
OTIO_TEST_TARGET: test
3737

3838
env:
@@ -92,13 +92,13 @@ jobs:
9292
runs-on: ${{ matrix.os }}
9393
strategy:
9494
matrix:
95-
os: [ubuntu-latest, windows-latest, macos-latest]
95+
os: [ubuntu-22.04, windows-2022, macos-12]
9696
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
9797
include:
98-
- { os: ubuntu-latest, shell: bash }
99-
- { os: macos-latest, shell: bash }
100-
- { os: windows-latest, shell: pwsh }
101-
- { os: windows-latest, shell: msys2, python-version: 'mingw64' }
98+
- { os: ubuntu-22.04, shell: bash }
99+
- { os: macos-12, shell: bash }
100+
- { os: windows-2022, shell: pwsh }
101+
- { os: windows-2022, shell: msys2, python-version: 'mingw64' }
102102

103103
defaults:
104104
run:
@@ -162,7 +162,7 @@ jobs:
162162
runs-on: ${{ matrix.os }}
163163
strategy:
164164
matrix:
165-
os: [ubuntu-latest, windows-latest, macos-latest]
165+
os: [ubuntu-22.04, windows-2022, macos-12]
166166
python-build: ['cp37*', 'cp38*', 'cp39*', 'cp310*', 'cp311*', 'cp312*']
167167
steps:
168168
- uses: actions/checkout@v3
@@ -184,7 +184,7 @@ jobs:
184184

185185
package_sdist:
186186
needs: py_build_test
187-
runs-on: ubuntu-latest
187+
runs-on: ubuntu-22.04
188188
steps:
189189
- uses: actions/checkout@v3
190190
with:

‎CONTRIBUTORS.md

+4
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ If you know of anyone missing from this list, please contact us: https://lists.a
2121
* Eric ([eric-with-a-c](https://github.com/eric-with-a-c))
2222
* Eric Desruisseaux ([desruie](https://github.com/desruie))
2323
* Eric Reinecke ([reinecke](https://github.com/reinecke))
24+
* Evan Blaudy ([EvanBldy](https://github.com/EvanBldy))
2425
* Flavian Liger ([flavienliger](https://github.com/flavienliger))
2526
* Fredrik Brännbacka ([smaragden](https://github.com/smaragden))
2627
* Freeson Wang ([freesonluxo](https://github.com/freesonluxo))
2728
* Félix Bourbonnais ([BadSingleton](https://github.com/BadSingleton))
2829
* Félix David ([Tilix4](https://github.com/Tilix4))
30+
* Gonzalo Garramuño ([ggarra13](https://github.com/ggarra13))
2931
* Henry Wilkes ([hwilkes-igalia](https://github.com/hwilkes-igalia))
3032
* Jean-Christophe Morin ([JeanChristopheMorinPerso](https://github.com/JeanChristopheMorinPerso))
3133
* Jeff Horrocks ([jhorrocks-tl](https://github.com/jhorrocks-tl))
@@ -38,6 +40,7 @@ If you know of anyone missing from this list, please contact us: https://lists.a
3840
* Joshua Minor ([jminor](https://github.com/jminor))
3941
* Julian Yu-Chung Chen ([jchen9](https://github.com/jchen9))
4042
* Karthik Ramesh Iyer ([KarthikRIyer](https://github.com/KarthikRIyer))
43+
* Konstantin Maslyuk ([kalemas](https://github.com/kalemas))
4144
* Laura Savidge ([lsavidge](https://github.com/lsavidge))
4245
* Mark Final ([foundry-markf](https://github.com/foundry-markf))
4346
* Mark Reid ([markreidvfx](https://github.com/markreidvfx))
@@ -47,6 +50,7 @@ If you know of anyone missing from this list, please contact us: https://lists.a
4750
* Michael Jefferies ([michaeljefferies](https://github.com/michaeljefferies))
4851
* Mike Koetter ([mikekoetter](https://github.com/mikekoetter))
4952
* Mike Mahony ([mikemahony](https://github.com/mikemahony))
53+
* Nicholas Bui LeTourneau ([nickblt](https://github.com/nickblt))
5054
* Nick Porcino ([meshula](https://github.com/meshula))
5155
* Pedro Labonia ([pedrolabonia](https://github.com/pedrolabonia))
5256
* Peter Targett ([peter-targett](https://github.com/peter-targett))

‎README.md

+4
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ To provide interoperability with other file formats or applications lacking a
6767
native integration, the opentimelineio community has built a number of python
6868
adapter plugins. This includes Final Cut Pro XML, AAF, CMX 3600 EDL, and more.
6969

70+
**Note: for releases after v0.16, the [OpenTimelineIO PyPI package](https://pypi.org/project/OpenTimelineIO/) will only include the core libraries and file formats. Users that need the full set of adapter plugins should use the [OpenTimelineIO-Plugins PyPI Package](https://pypi.org/project/OpenTimelineIO-Plugins/). Each OpenTimelineIO release will have a matching OpenTimelineIO-Plugins release.**
71+
72+
For more information: https://github.com/AcademySoftwareFoundation/OpenTimelineIO/issues/1386
73+
7074
For more information about this, including supported formats, see: https://opentimelineio.readthedocs.io/en/latest/tutorials/adapters.html
7175

7276
Other Plugins

‎setup.py

+1-1
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.16.0.dev1",
221+
"version": "0.16.0",
222222
"author": 'Contributors to the OpenTimelineIO project',
223223
"author_email": '[email protected]',
224224
"license": 'Apache 2.0 License',

‎src/opentimelineio/CORE_VERSION_MAP.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const label_to_schema_version_map CORE_VERSION_MAP{
7878
{ "Transition", 1 },
7979
{ "UnknownSchema", 1 },
8080
} },
81-
{ "0.16.0.dev1",
81+
{ "0.16.0",
8282
{
8383
{ "Adapter", 1 },
8484
{ "Clip", 2 },

‎src/opentimelineio/clip.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ class Clip : public Item
2323
using Parent = Item;
2424

2525
Clip(
26-
std::string const& name = std::string(),
27-
MediaReference* media_reference = nullptr,
28-
std::optional<TimeRange> const& source_range = std::nullopt,
29-
AnyDictionary const& metadata = AnyDictionary(),
30-
std::string const& active_media_reference_key = default_media_key);
26+
std::string const& name = std::string(),
27+
MediaReference* media_reference = nullptr,
28+
std::optional<TimeRange> const& source_range = std::nullopt,
29+
AnyDictionary const& metadata = AnyDictionary(),
30+
std::string const& active_media_reference_key = default_media_key);
3131

3232
void set_media_reference(MediaReference* media_reference);
3333
MediaReference* media_reference() const noexcept;

‎src/opentimelineio/composition.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -342,9 +342,9 @@ Composition::range_of_child(Composable const* child, ErrorStatus* error_status)
342342
}
343343

344344
return (reference_space != this) ? transformed_time_range(
345-
*result_range,
346-
reference_space,
347-
error_status)
345+
*result_range,
346+
reference_space,
347+
error_status)
348348
: *result_range;
349349
}
350350

‎src/opentimelineio/composition.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ class Composition : public Item
143143
int64_t _bisect_right(
144144
RationalTime const& tgt,
145145
std::function<RationalTime(Composable*)> const& key_func,
146-
ErrorStatus* error_status = nullptr,
147-
std::optional<int64_t> lower_search_bound = std::optional<int64_t>(0),
148-
std::optional<int64_t> upper_search_bound = std::nullopt) const;
146+
ErrorStatus* error_status = nullptr,
147+
std::optional<int64_t> lower_search_bound = std::optional<int64_t>(0),
148+
std::optional<int64_t> upper_search_bound = std::nullopt) const;
149149

150150
// Return the index of the last item in seq such that all e in seq[:index]
151151
// have key_func(e) < tgt, and all e in seq[index:] have key_func(e) >= tgt.
@@ -159,9 +159,9 @@ class Composition : public Item
159159
int64_t _bisect_left(
160160
RationalTime const& tgt,
161161
std::function<RationalTime(Composable*)> const& key_func,
162-
ErrorStatus* error_status = nullptr,
163-
std::optional<int64_t> lower_search_bound = std::optional<int64_t>(0),
164-
std::optional<int64_t> upper_search_bound = std::nullopt) const;
162+
ErrorStatus* error_status = nullptr,
163+
std::optional<int64_t> lower_search_bound = std::optional<int64_t>(0),
164+
std::optional<int64_t> upper_search_bound = std::nullopt) const;
165165

166166
std::vector<Retainer<Composable>> _children;
167167

‎src/opentimelineio/deserialization.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,8 @@ SerializableObject::Reader::_decode(_Resolver& resolver)
617617
{
618618
IMATH_NAMESPACE::V2d min, max;
619619
return _fetch("min", &min) && _fetch("max", &max)
620-
? std::any(IMATH_NAMESPACE::Box2d(std::move(min), std::move(max)))
620+
? std::any(
621+
IMATH_NAMESPACE::Box2d(std::move(min), std::move(max)))
621622
: std::any();
622623
}
623624
else
@@ -776,13 +777,17 @@ SerializableObject::Reader::_read_optional(
776777
return true;
777778
}
778779
bool
779-
SerializableObject::Reader::read(std::string const& key, std::optional<bool>* value)
780+
SerializableObject::Reader::read(
781+
std::string const& key,
782+
std::optional<bool>* value)
780783
{
781784
return _read_optional(key, value);
782785
}
783786

784787
bool
785-
SerializableObject::Reader::read(std::string const& key, std::optional<int>* value)
788+
SerializableObject::Reader::read(
789+
std::string const& key,
790+
std::optional<int>* value)
786791
{
787792
return _read_optional(key, value);
788793
}

‎src/opentimelineio/externalReference.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ class ExternalReference final : public MediaReference
2020
using Parent = MediaReference;
2121

2222
ExternalReference(
23-
std::string const& target_url = std::string(),
24-
std::optional<TimeRange> const& available_range = std::nullopt,
25-
AnyDictionary const& metadata = AnyDictionary(),
26-
std::optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = std::nullopt);
23+
std::string const& target_url = std::string(),
24+
std::optional<TimeRange> const& available_range = std::nullopt,
25+
AnyDictionary const& metadata = AnyDictionary(),
26+
std::optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds =
27+
std::nullopt);
2728

2829
std::string target_url() const noexcept { return _target_url; }
2930

‎src/opentimelineio/gap.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ Gap::Gap(
2121
std::vector<Marker*> const& markers,
2222
AnyDictionary const& metadata)
2323
: Parent(
24-
name,
25-
TimeRange(RationalTime(0, duration.rate()), duration),
26-
metadata,
27-
effects,
28-
markers)
24+
name,
25+
TimeRange(RationalTime(0, duration.rate()), duration),
26+
metadata,
27+
effects,
28+
markers)
2929
{}
3030

3131
Gap::~Gap()

‎src/opentimelineio/generatorReference.h

+7-6
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ class GeneratorReference final : public MediaReference
2020
using Parent = MediaReference;
2121

2222
GeneratorReference(
23-
std::string const& name = std::string(),
24-
std::string const& generator_kind = std::string(),
25-
std::optional<TimeRange> const& available_range = std::nullopt,
26-
AnyDictionary const& parameters = AnyDictionary(),
27-
AnyDictionary const& metadata = AnyDictionary(),
28-
std::optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = std::nullopt);
23+
std::string const& name = std::string(),
24+
std::string const& generator_kind = std::string(),
25+
std::optional<TimeRange> const& available_range = std::nullopt,
26+
AnyDictionary const& parameters = AnyDictionary(),
27+
AnyDictionary const& metadata = AnyDictionary(),
28+
std::optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds =
29+
std::nullopt);
2930

3031
std::string generator_kind() const noexcept { return _generator_kind; }
3132

‎src/opentimelineio/imageSequenceReference.h

+13-11
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,19 @@ class ImageSequenceReference final : public MediaReference
2727
using Parent = MediaReference;
2828

2929
ImageSequenceReference(
30-
std::string const& target_url_base = std::string(),
31-
std::string const& name_prefix = std::string(),
32-
std::string const& name_suffix = std::string(),
33-
int start_frame = 1,
34-
int frame_step = 1,
35-
double rate = 1,
36-
int frame_zero_padding = 0,
37-
MissingFramePolicy const missing_frame_policy = MissingFramePolicy::error,
38-
std::optional<TimeRange> const& available_range = std::nullopt,
39-
AnyDictionary const& metadata = AnyDictionary(),
40-
std::optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = std::nullopt);
30+
std::string const& target_url_base = std::string(),
31+
std::string const& name_prefix = std::string(),
32+
std::string const& name_suffix = std::string(),
33+
int start_frame = 1,
34+
int frame_step = 1,
35+
double rate = 1,
36+
int frame_zero_padding = 0,
37+
MissingFramePolicy const missing_frame_policy =
38+
MissingFramePolicy::error,
39+
std::optional<TimeRange> const& available_range = std::nullopt,
40+
AnyDictionary const& metadata = AnyDictionary(),
41+
std::optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds =
42+
std::nullopt);
4143

4244
std::string target_url_base() const noexcept { return _target_url_base; }
4345

‎src/opentimelineio/item.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ class Item : public Composable
3939

4040
void set_enabled(bool enabled) { _enabled = enabled; }
4141

42-
std::optional<TimeRange> source_range() const noexcept { return _source_range; }
42+
std::optional<TimeRange> source_range() const noexcept
43+
{
44+
return _source_range;
45+
}
4346

4447
void set_source_range(std::optional<TimeRange> const& source_range)
4548
{

‎src/opentimelineio/mediaReference.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ class MediaReference : public SerializableObjectWithMetadata
2424
using Parent = SerializableObjectWithMetadata;
2525

2626
MediaReference(
27-
std::string const& name = std::string(),
28-
std::optional<TimeRange> const& available_range = std::nullopt,
29-
AnyDictionary const& metadata = AnyDictionary(),
30-
std::optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = std::nullopt);
27+
std::string const& name = std::string(),
28+
std::optional<TimeRange> const& available_range = std::nullopt,
29+
AnyDictionary const& metadata = AnyDictionary(),
30+
std::optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds =
31+
std::nullopt);
3132

3233
std::optional<TimeRange> available_range() const noexcept
3334
{

‎src/opentimelineio/missingReference.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ class MissingReference final : public MediaReference
2020
using Parent = MediaReference;
2121

2222
MissingReference(
23-
std::string const& name = std::string(),
24-
std::optional<TimeRange> const& available_range = std::nullopt,
25-
AnyDictionary const& metadata = AnyDictionary(),
26-
std::optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = std::nullopt);
23+
std::string const& name = std::string(),
24+
std::optional<TimeRange> const& available_range = std::nullopt,
25+
AnyDictionary const& metadata = AnyDictionary(),
26+
std::optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds =
27+
std::nullopt);
2728

2829
bool is_missing_reference() const override;
2930

0 commit comments

Comments
 (0)