Skip to content

Commit d7a60db

Browse files
authored
Merge pull request OpenAssetIO#43 from foundrytom/work/removeExperimentalTraits
[Traits] Remove speculative timeline traits
2 parents 99de210 + dc65c49 commit d7a60db

File tree

4 files changed

+7
-58
lines changed

4 files changed

+7
-58
lines changed

RELEASE_NOTES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Release Notes
22
=============
33

4+
v1.0.0-alpha.x
5+
--------------
6+
7+
### Breaking changes
8+
9+
- Removed speculative timeline traits pending real-world use cases.
10+
411
v1.0.0-alpha.5
512
--------------
613

tests/cpp/test.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
#include <openassetio_mediacreation/traits/managementPolicy.hpp>
1212
#include <openassetio_mediacreation/traits/managementPolicy/ManagedTrait.hpp>
1313
#include <openassetio_mediacreation/traits/managementPolicy/ResolvesFutureEntitiesTrait.hpp>
14-
#include <openassetio_mediacreation/traits/timeline.hpp>
15-
#include <openassetio_mediacreation/traits/timeline/ClipTrait.hpp>
16-
#include <openassetio_mediacreation/traits/timeline/TimelineTrait.hpp>
17-
#include <openassetio_mediacreation/traits/timeline/TrackTrait.hpp>
1814
#include <openassetio_mediacreation/traits/traits.hpp>
1915

2016
using namespace openassetio_mediacreation;

tests/python/openassetio_mediacreation/test_imports.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,9 @@ def test_importing_openassetio_mediacreation_succeeds(self):
2929
def test_importing_traits_succeeds(self):
3030
from openassetio_mediacreation import traits
3131

32-
def test_importing_timeline_succeeds(self):
33-
from openassetio_mediacreation.traits import timeline
34-
3532
def test_importing_content_succeeds(self):
3633
from openassetio_mediacreation.traits import content
3734

38-
def test_importing_ClipTrait_succeeds(self):
39-
from openassetio_mediacreation.traits.timeline import ClipTrait
40-
41-
def test_importing_TimelineTrait_succeeds(self):
42-
from openassetio_mediacreation.traits.timeline import TimelineTrait
43-
44-
def test_importing_TrackTrait_succeeds(self):
45-
from openassetio_mediacreation.traits.timeline import TrackTrait
46-
4735
def test_importing_LocatableContentTrait_succeeds(self):
4836
from openassetio_mediacreation.traits.content import LocatableContentTrait
4937

traits.yml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,6 @@ description: Well-known Traits and Specifications for use in OpenAssetIO
66
hosts and managers.
77

88
traits:
9-
timeline:
10-
description: Traits related to timelines.
11-
members:
12-
Timeline:
13-
description: >
14-
This trait characterizes a collection of tracks that evaluate
15-
concurrently to form layers of references to media. Frequently
16-
used in non-linear editing environments such as Video and
17-
Audio post production tools.
18-
usage:
19-
- entity
20-
- locale
21-
22-
Track:
23-
description: >
24-
This trait characterizes a lane or collection of media,
25-
arranged temporally such that only a single item in the
26-
collection is active at any given time. Frequently used in
27-
non-linear editing environments such as Video and Audio post
28-
production tools.
29-
usage:
30-
- entity
31-
- locale
32-
33-
Clip:
34-
description: >
35-
This trait characterizes the use of some range of external
36-
media, commonly on a track or timeline. Frequently used in
37-
non-linear editing environments such as Video and Audio
38-
production tools.
39-
40-
41-
TODO(TC) Define any additional properties, and companion
42-
traits such as 'frameRange' and 'handles'.
43-
usage:
44-
- entity
45-
- locale
46-
properties:
47-
name:
48-
type: string
49-
description: The name of the clip.
50-
519
content:
5210
description: Traits related to abstract content.
5311
members:

0 commit comments

Comments
 (0)