-
Notifications
You must be signed in to change notification settings - Fork 289
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
Move AAF Adapter to separate git repo #1348
Move AAF Adapter to separate git repo #1348
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## extract_adapters #1348 +/- ##
====================================================
- Coverage 79.35% 78.24% -1.12%
====================================================
Files 193 190 -3
Lines 20617 18816 -1801
Branches 4152 3846 -306
====================================================
- Hits 16361 14722 -1639
+ Misses 2145 2031 -114
+ Partials 2111 2063 -48
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
It's nice to see that it was easily separable! Thanks for getting the ball rolling. Perhaps it would make sense to also add a line to Readme.md in the "Adapters" section, that tells where to find the relocated AAF adapter. When this is ready to land, we could update the Readme.md to point to a fork of your adapter work into the OpenTimelineIO org, as my working assumption is that this adapter will fall in the "officially supported by the OTIO project" umbrella. |
Good idea. The api docs for adapter aren't being generated anywhere yet either. I'm looking into next too. |
It looks like the coverage decreases with this PR. For example https://app.codecov.io/gh/AcademySoftwareFoundation/OpenTimelineIO/compare/1348?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr%20comments&utm_term=None#D8L191 isn't covered anymore. https://app.codecov.io/gh/AcademySoftwareFoundation/OpenTimelineIO/compare/1348?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr%20comments&utm_term=None#D1L172 too. When moving adapters, wi'll have to be carefull to keep the code coverage at a good level since some code seems to be only covered by adapter tests. |
Every decrease noted indicates a missing unit test on the C/C++ side of things. Some strategies are to (1) add unit tests as part of the change, (2) start an Issue that lists with checkboxes missing unit tests corresponding to items identified by the CI, and start a separate effort to improve test coverage, (3) leave test coverage for future us. I'm personally inclined to (2), but would be interested in hearing other people's thoughts about it. The reason I'm inclined to (2) is that my preference would be that good unit tests are written, rather than letter of the law unit tests that simply satisfy a bot, and good unit tests could stall things indefinitely until someone has time to devote to it. |
It looks pretty straight forward to add a few tests to restore coverage. I will send a pull request. |
7e36ec0
to
3aa2155
Compare
This (and the forked repo you created) is really great! On the adapter precedence front - this is an issue I've run into as well. In my case I was able to work around it by giving the adapter a different name and using |
I did add the unit tests that restore the coverage lost from the adapter removal. I was hoping to remove it from this pull and create separate pull request, but first wanted to demonstrate it fixes the issue. |
3aa2155
to
4fb04b0
Compare
I'm unsure why the EDL adapter has shown up in the Codecov report? I think its something to do with the recent EDL commits. The Codecov website can be pretty frustrating to use :p. By my account though, the added unit tests should restore the coverage lost from the adapters removal and even add a bit more. |
I think codecov is just confused. Codecov is unfortunately quite easy to confuse. |
Tests are awesome :) Why don't we go ahead and PR/land them separately, per your suggestion? I think they're ready. |
Will do |
403a51b
to
35f5b16
Compare
The separated AAF Adapter is now located here I created a task list of things that need to happen before this pull request could safely be applied Please let me know if there are any other blocking issues to add to this task list. |
35f5b16
to
602dae5
Compare
@markreidvfx could you aim this PR at the newly created |
602dae5
to
746f9c0
Compare
3812f5a
to
1d15fc6
Compare
@markreidvfx, would you mind rebasing on top of or merging the latest changes in the "extract_adapters"? It might kick off the CI so we can see that everything is still good to go. |
Signed-off-by: Mark Reid <[email protected]>
Signed-off-by: Mark Reid <[email protected]>
1d15fc6
to
2f3d0de
Compare
@apetrynet rebased and all tests pass! |
Thanks @markreidvfx! |
…cademySoftwareFoundation#1348) * Remove AAF adapter * Add Note about the AAF adapter being moved Signed-off-by: Mark Reid <[email protected]> Signed-off-by: rosborne132 <[email protected]> Signed-off-by: Robert Osborne <[email protected]>
…1348) * Remove AAF adapter * Add Note about the AAF adapter being moved Signed-off-by: Mark Reid <[email protected]>
…1348) * Remove AAF adapter * Add Note about the AAF adapter being moved Signed-off-by: Mark Reid <[email protected]>
…1348) * Remove AAF adapter * Add Note about the AAF adapter being moved Signed-off-by: Mark Reid <[email protected]>
…1348) * Remove AAF adapter * Add Note about the AAF adapter being moved Signed-off-by: Mark Reid <[email protected]>
…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]>
…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]>
…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]>
…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]>
* 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]>
* 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]>
Here is a first attempt to move the AAF Adapter to separate git repo.
This started out as a test but turned out to be pretty straightforward,
since I already did most of the work with my AVB adapter.
The extracted AAF Adapter plugin is currently here https://github.com/OpenTimelineIO/otio-aaf-adapter
I did some git magic to preserve the original commit history of the adapter files.
You can use the external adapter without applying this pull request.
Unfortunately using the pkg_resources method doesn't seem to override the contrib plugin.
The
OTIO_PLUGIN_MANIFEST_PATH
env variable is needed in that case.The adapter also uses features that aren't in the 0.14 release, and doesn't work with a pypi wheel.