Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extracted CMX3600 adapter and related sample data and tests #1487

Conversation

apetrynet
Copy link
Contributor

Link the Issue(s) this Pull Request is related to.
This PR is related to issue #1386

Summarize your change.
This PR removes the cmx_3600 adapter and related sample files and tests.
There might still be some bits and pieces left, like in the documentation.

@jminor
Copy link
Collaborator

jminor commented Nov 30, 2022

This looks pretty good to me. If you want to be really clean about this change we could separate the imp -> importlib change out and land that into main before the adapter switchero. Same for the tests that use otio_json instead of cmx_3600. That would make this PR just the removal of the EDL adapter.

@apetrynet
Copy link
Contributor Author

Yeah, I noticed the imortlib one made it's way in there after a rebase.
I'll try and revert that.

@apetrynet apetrynet marked this pull request as ready for review November 30, 2022 20:23
@apetrynet
Copy link
Contributor Author

What do we do about references to the cmx adapter in the documentation? Should we do that in this PR or do a proper doc overhaul when we're done with all the adapters?

@jminor
Copy link
Collaborator

jminor commented Nov 30, 2022

Lets do the documentation change after we have the adapters split out, but before landing the extract_adapters branch into main.

@apetrynet
Copy link
Contributor Author

apetrynet commented Dec 1, 2022

Looks like we need to update some of the docs after all to pass the tests.
I missed some EDL related tests and functions. Working though them now

@codecov-commenter
Copy link

Codecov Report

Merging #1487 (9bc9d52) into extract_adapters (33e0d1a) will decrease coverage by 0.73%.
The diff coverage is 85.25%.

Additional details and impacted files

Impacted file tree graph

@@                 Coverage Diff                  @@
##           extract_adapters    #1487      +/-   ##
====================================================
- Coverage             80.09%   79.35%   -0.74%     
====================================================
  Files                   198      193       -5     
  Lines                 21703    20617    -1086     
  Branches               4298     4152     -146     
====================================================
- Hits                  17382    16361    -1021     
+ Misses                 2174     2145      -29     
+ Partials               2147     2111      -36     
Flag Coverage Δ
py-unittests 79.35% <85.25%> (-0.74%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/opentimelineio/track.h 100.00% <ø> (ø)
...timelineio/opentimelineio/algorithms/stack_algo.py 64.28% <0.00%> (ø)
...-opentimelineio/opentimelineio/core/composition.py 100.00% <ø> (ø)
...y-opentimelineio/opentimelineio/schema/__init__.py 100.00% <ø> (ø)
...o/opentimelineio/schema/serializable_collection.py 100.00% <ø> (ø)
...y-opentimelineio/opentimelineio/schema/timeline.py 100.00% <ø> (ø)
tests/test_item.py 98.66% <ø> (ø)
tests/test_plugin_detection.py 91.46% <ø> (ø)
src/opentimelineio/stack.cpp 57.35% <33.33%> (ø)
...entimelineio-bindings/otio_serializableObjects.cpp 36.09% <44.82%> (ø)
... and 37 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 33e0d1a...9bc9d52. Read the comment docs.

@apetrynet apetrynet requested a review from jminor December 4, 2022 12:55
@apetrynet apetrynet merged commit d1608c7 into AcademySoftwareFoundation:extract_adapters Dec 5, 2022
rosborne132 pushed a commit to rosborne132/OpenTimelineIO that referenced this pull request Jan 19, 2023
…oftwareFoundation#1487)

* Removed the cmx_3600 adapter
* Removed sample data only used by the cmx_3600 adapter
* Add "extract_adapters" to CI triggers
* otioz test called for an edl we removed. Replaced with an otio file
* Converted screening_example.edl to screening_example.otio and used it in tests
* Removed other adapter suffixes from plugin tests as they belong to adapters soon to be extracted
* Autogenerated docs for CMX3600 removed

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Robert Osborne <[email protected]>
reinecke pushed a commit that referenced this pull request Oct 6, 2023
* Removed the cmx_3600 adapter
* Removed sample data only used by the cmx_3600 adapter
* Add "extract_adapters" to CI triggers
* otioz test called for an edl we removed. Replaced with an otio file
* Converted screening_example.edl to screening_example.otio and used it in tests
* Removed other adapter suffixes from plugin tests as they belong to adapters soon to be extracted
* Autogenerated docs for CMX3600 removed

Signed-off-by: apetrynet <[email protected]>
reinecke pushed a commit that referenced this pull request Oct 6, 2023
* Removed the cmx_3600 adapter
* Removed sample data only used by the cmx_3600 adapter
* Add "extract_adapters" to CI triggers
* otioz test called for an edl we removed. Replaced with an otio file
* Converted screening_example.edl to screening_example.otio and used it in tests
* Removed other adapter suffixes from plugin tests as they belong to adapters soon to be extracted
* Autogenerated docs for CMX3600 removed

Signed-off-by: apetrynet <[email protected]>
reinecke pushed a commit that referenced this pull request Apr 4, 2024
* Removed the cmx_3600 adapter
* Removed sample data only used by the cmx_3600 adapter
* Add "extract_adapters" to CI triggers
* otioz test called for an edl we removed. Replaced with an otio file
* Converted screening_example.edl to screening_example.otio and used it in tests
* Removed other adapter suffixes from plugin tests as they belong to adapters soon to be extracted
* Autogenerated docs for CMX3600 removed

Signed-off-by: apetrynet <[email protected]>
reinecke pushed a commit that referenced this pull request Apr 12, 2024
* Removed the cmx_3600 adapter
* Removed sample data only used by the cmx_3600 adapter
* Add "extract_adapters" to CI triggers
* otioz test called for an edl we removed. Replaced with an otio file
* Converted screening_example.edl to screening_example.otio and used it in tests
* Removed other adapter suffixes from plugin tests as they belong to adapters soon to be extracted
* Autogenerated docs for CMX3600 removed

Signed-off-by: apetrynet <[email protected]>
reinecke pushed a commit that referenced this pull request Apr 12, 2024
* Removed the cmx_3600 adapter
* Removed sample data only used by the cmx_3600 adapter
* Add "extract_adapters" to CI triggers
* otioz test called for an edl we removed. Replaced with an otio file
* Converted screening_example.edl to screening_example.otio and used it in tests
* Removed other adapter suffixes from plugin tests as they belong to adapters soon to be extracted
* Autogenerated docs for CMX3600 removed

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
reinecke pushed a commit that referenced this pull request Jun 12, 2024
* Removed the cmx_3600 adapter
* Removed sample data only used by the cmx_3600 adapter
* Add "extract_adapters" to CI triggers
* otioz test called for an edl we removed. Replaced with an otio file
* Converted screening_example.edl to screening_example.otio and used it in tests
* Removed other adapter suffixes from plugin tests as they belong to adapters soon to be extracted
* Autogenerated docs for CMX3600 removed

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
reinecke pushed a commit that referenced this pull request Jun 12, 2024
* Removed the cmx_3600 adapter
* Removed sample data only used by the cmx_3600 adapter
* Add "extract_adapters" to CI triggers
* otioz test called for an edl we removed. Replaced with an otio file
* Converted screening_example.edl to screening_example.otio and used it in tests
* Removed other adapter suffixes from plugin tests as they belong to adapters soon to be extracted
* Autogenerated docs for CMX3600 removed

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
reinecke pushed a commit that referenced this pull request Jun 12, 2024
* Removed the cmx_3600 adapter
* Removed sample data only used by the cmx_3600 adapter
* Add "extract_adapters" to CI triggers
* otioz test called for an edl we removed. Replaced with an otio file
* Converted screening_example.edl to screening_example.otio and used it in tests
* Removed other adapter suffixes from plugin tests as they belong to adapters soon to be extracted
* Autogenerated docs for CMX3600 removed

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
reinecke added a commit that referenced this pull request Jun 12, 2024
* Prepare plugin detection for removal of the cmx_3600 adapter (#1488)

* add "extract_adapters" to CI triggers
* use "otiod" as override example

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Extracted CMX3600 adapter and related sample data and tests (#1487)

* Removed the cmx_3600 adapter
* Removed sample data only used by the cmx_3600 adapter
* Add "extract_adapters" to CI triggers
* otioz test called for an edl we removed. Replaced with an otio file
* Converted screening_example.edl to screening_example.otio and used it in tests
* Removed other adapter suffixes from plugin tests as they belong to adapters soon to be extracted
* Autogenerated docs for CMX3600 removed

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Extract AAF Adapter from OTIO core and establish separate git repo (#1348)

* Remove AAF adapter
* Add Note about the AAF adapter being moved

Signed-off-by: Mark Reid <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove fcp adapter (#1501)

* removing the fcp adapter and it's test files
* replaced premiere_example.xml with premiere_example.otio to pass console tests.
* updated auto generated docs

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove svg adapter (#1502)

* removed svg adapter and related test files
* updated auto documentation

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove maya sequencer adapter related files (#1520)

* Remove maya adapter related files
* Update docs

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove fcp x xml adapter related files (#1529)

* remove fcp x xml adapter files
* update docs

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* remove hls adapter related files (#1535)

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* remove ale adapter related files (#1536)

* remove ale adapter related files

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove burnins adapter related files (#1537)

* extract burnin files
* remove test

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* extract xges adapter files (#1538)

* extract xges adapter files

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove the remains of "contrib"

* Removed the "contrib" directory tree and all references to the contrib adapters.
* Plugin system, setup and auto doc scripts no longer rely on contrib files.
* Also removed some entries on other adapters left behind in the adapters.md file.
* add README_contrib.md to the manifest

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* fixed `doc-plugins-update` when custom hooks are in environment (#1644)

Signed-off-by: Tim Lehr <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* added support for pathlib.Path filepath arguments for adapter IO functions (#1704)

Signed-off-by: Tim Lehr <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Removed orphaned FCP XML adapter post-rebase.

Signed-off-by: Eric Reinecke <[email protected]>

* Update README.md to point users to the adapter repos

Co-authored-by: Daniel Flehner Heen <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Updated documentation about adapters to better reflect the current landscape

Signed-off-by: Eric Reinecke <[email protected]>

* Removed contrib plugin manifest from package data

Signed-off-by: Eric Reinecke <[email protected]>

* Removed extract_adapters branch from CI references

Signed-off-by: Eric Reinecke <[email protected]>

---------

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Mark Reid <[email protected]>
Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Tim Lehr <[email protected]>
Co-authored-by: Daniel Flehner Heen <[email protected]>
Co-authored-by: Mark Reid <[email protected]>
Co-authored-by: Rob Osborne <[email protected]>
Co-authored-by: Tim Lehr <[email protected]>
darbyjohnston pushed a commit to darbyjohnston/OpenTimelineIO that referenced this pull request Jun 14, 2024
* Prepare plugin detection for removal of the cmx_3600 adapter (AcademySoftwareFoundation#1488)

* add "extract_adapters" to CI triggers
* use "otiod" as override example

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Extracted CMX3600 adapter and related sample data and tests (AcademySoftwareFoundation#1487)

* Removed the cmx_3600 adapter
* Removed sample data only used by the cmx_3600 adapter
* Add "extract_adapters" to CI triggers
* otioz test called for an edl we removed. Replaced with an otio file
* Converted screening_example.edl to screening_example.otio and used it in tests
* Removed other adapter suffixes from plugin tests as they belong to adapters soon to be extracted
* Autogenerated docs for CMX3600 removed

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Extract AAF Adapter from OTIO core and establish separate git repo (AcademySoftwareFoundation#1348)

* Remove AAF adapter
* Add Note about the AAF adapter being moved

Signed-off-by: Mark Reid <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove fcp adapter (AcademySoftwareFoundation#1501)

* removing the fcp adapter and it's test files
* replaced premiere_example.xml with premiere_example.otio to pass console tests.
* updated auto generated docs

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove svg adapter (AcademySoftwareFoundation#1502)

* removed svg adapter and related test files
* updated auto documentation

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove maya sequencer adapter related files (AcademySoftwareFoundation#1520)

* Remove maya adapter related files
* Update docs

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove fcp x xml adapter related files (AcademySoftwareFoundation#1529)

* remove fcp x xml adapter files
* update docs

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* remove hls adapter related files (AcademySoftwareFoundation#1535)

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* remove ale adapter related files (AcademySoftwareFoundation#1536)

* remove ale adapter related files

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove burnins adapter related files (AcademySoftwareFoundation#1537)

* extract burnin files
* remove test

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* extract xges adapter files (AcademySoftwareFoundation#1538)

* extract xges adapter files

Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Remove the remains of "contrib"

* Removed the "contrib" directory tree and all references to the contrib adapters.
* Plugin system, setup and auto doc scripts no longer rely on contrib files.
* Also removed some entries on other adapters left behind in the adapters.md file.
* add README_contrib.md to the manifest

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* fixed `doc-plugins-update` when custom hooks are in environment (AcademySoftwareFoundation#1644)

Signed-off-by: Tim Lehr <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* added support for pathlib.Path filepath arguments for adapter IO functions (AcademySoftwareFoundation#1704)

Signed-off-by: Tim Lehr <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Removed orphaned FCP XML adapter post-rebase.

Signed-off-by: Eric Reinecke <[email protected]>

* Update README.md to point users to the adapter repos

Co-authored-by: Daniel Flehner Heen <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>

* Updated documentation about adapters to better reflect the current landscape

Signed-off-by: Eric Reinecke <[email protected]>

* Removed contrib plugin manifest from package data

Signed-off-by: Eric Reinecke <[email protected]>

* Removed extract_adapters branch from CI references

Signed-off-by: Eric Reinecke <[email protected]>

---------

Signed-off-by: apetrynet <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Eric Reinecke <[email protected]>
Signed-off-by: Mark Reid <[email protected]>
Signed-off-by: rosborne132 <[email protected]>
Signed-off-by: Tim Lehr <[email protected]>
Co-authored-by: Daniel Flehner Heen <[email protected]>
Co-authored-by: Mark Reid <[email protected]>
Co-authored-by: Rob Osborne <[email protected]>
Co-authored-by: Tim Lehr <[email protected]>
Signed-off-by: Darby Johnston <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants