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

Remove non-core adapters #1725

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Remove non-core adapters #1725

wants to merge 14 commits into from

Conversation

reinecke
Copy link
Collaborator

If there is an associated issue, link it in the form:

This PR covers the major work of #1386.

Use one line for each Issue. This allows auto-closing the related issue when the fix is merged.

Summarize your change.

This PR applies core repo cleanup after creating separate repos for adapters in the OpenTimelineIO GitHub org.

  • Removes contrib adapters and tree
  • Removes all but the "native" OTIO adapters from py-opentimelineio/opentimelineio/adapters
  • Updates to plugin system and documentation to support adapter removal

This PR is the result of contributions from the broad community including:

@reinecke reinecke added this to the Public Beta 17 milestone Apr 11, 2024
@reinecke reinecke added python Pull requests that update Python code Adapters Relating to the adapters that live in the separate repos labels Apr 11, 2024
Comment on lines -5 to +7
branches: [ main ]
branches: [ main, extract_adapters ]
pull_request:
branches: [ main ]
branches: [ main, extract_adapters ]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What would be best to do here?
"extract_adapters" is due for removal and it won't reflect changes we do to this PR as we're on another branch.

Should we just revert the changes to this file and leave only "main"

Comment on lines -14 to +16
branches: [ main ]
branches: [ main, extract_adapters ]
pull_request:
branches: [ main ]
branches: [ main, extract_adapters ]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same thought as in docs.yaml. I think we should only keep "main"

Comment on lines +76 to 81
The **AAF Adapter** has been **relocated** to a separate repository and is located here:
https://github.com/OpenTimelineIO/otio-aaf-adapter

Other Plugins
-------------

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
The **AAF Adapter** has been **relocated** to a separate repository and is located here:
https://github.com/OpenTimelineIO/otio-aaf-adapter
Other Plugins
-------------
All adapters except the native `.otio`, `.otioz` and `.otiod` have been relocated to separate repositories under the OpenTimelineIO organization located here: https://github.com/OpenTimelineIO

@@ -2,82 +2,3 @@

OpenTimelineIO supports, or plans to support, conversion adapters for many
existing file formats.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's not much left of this file.. do we still need it or should we at least flesh it out a bit?

Perhaps add links to each adapter repo?

@@ -12,11 +12,10 @@ file should be regenerated.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need this file?
Most of what's left are links to the "how to write ..." pages

Comment on lines +21 to 22
In order to get access to the "contrib" adapters (which includes rv and others), please consult the
[Adapters documentation page for details](./adapters).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless we flesh out adapters.md a bit this makes little sense

setup.py Show resolved Hide resolved
@reinecke
Copy link
Collaborator Author

Build failing due to scikit-build/cmake-python-distributions/pull/490

@reinecke reinecke force-pushed the extract_adapters_post_beta_16 branch from 38b8edb to fbe098e Compare April 12, 2024 05:20
apetrynet and others added 14 commits April 11, 2024 22:22
* add "extract_adapters" to CI triggers
* use "otiod" as override example

Signed-off-by: apetrynet <flehnerheener@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
* 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 <flehnerheener@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
…1348)

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

Signed-off-by: Mark Reid <mindmark@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
* 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 <flehnerheener@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
* removed svg adapter and related test files
* updated auto documentation

Signed-off-by: apetrynet <flehnerheener@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
* Remove maya adapter related files
* Update docs

Signed-off-by: rosborne132 <ozborne132@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
* remove fcp x xml adapter files
* update docs

Signed-off-by: rosborne132 <ozborne132@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
Signed-off-by: rosborne132 <ozborne132@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
* remove ale adapter related files

Signed-off-by: rosborne132 <ozborne132@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
* extract burnin files
* remove test

Signed-off-by: rosborne132 <ozborne132@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
* extract xges adapter files

Signed-off-by: rosborne132 <ozborne132@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
* 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 <flehnerheener@gmail.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
Signed-off-by: Tim Lehr <tim.lehr@disneyanimation.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
…tions (#1704)

Signed-off-by: Tim Lehr <tim.lehr@disneyanimation.com>
Signed-off-by: Eric Reinecke <reinecke.eric@gmail.com>
@reinecke reinecke force-pushed the extract_adapters_post_beta_16 branch from fbe098e to 7f09945 Compare April 12, 2024 05:22
@@ -342,8 +341,7 @@ def run(self):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't comment on the line, but should we remove opentimelineio_contrib from package_data?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I must have missed that one.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Adapters Relating to the adapters that live in the separate repos python Pull requests that update Python code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants