Remove non-core adapters (AcademySoftwareFoundation#1725)

* 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]>
darbyjohnston · Jun 14, 2024 · 15eac94 · 15eac94
1 parent 8d63602
commit 15eac94
Show file tree

Hide file tree

Showing 138 changed files with 2,926 additions and 57,299 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -18,10 +18,6 @@ comment:
   require_changes: no
 
 ignore:
-  - "contrib/opentimelineio_contrib/adapters/tests/test_rvsession.py"
-  - "contrib/opentimelineio_contrib/adapters/tests/test_maya_sequencer.py"
-  - "contrib/opentimelineio_contrib/adapters/tests/test_burnins.py"
-  - "contrib/opentimelineio_contrib/adapters/burnins.py"
   - "*aaf2*"
   - "*pkg_resources*"
   - "*pbr*"

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,5 @@
-include README.md CHANGELOG.md LICENSE.txt NOTICE.txt CMakeLists.txt
+include README.md README_contrib.md CHANGELOG.md LICENSE.txt NOTICE.txt CMakeLists.txt
 recursive-include examples *
-recursive-include contrib *
 recursive-include src *
 recursive-include tests *
 prune .github
@@ -17,7 +16,6 @@ exclude CODE_OF_CONDUCT.md
 exclude CONTRIBUTING.md
 exclude CONTRIBUTORS.md
 exclude GOVERNANCE.md
-exclude contrib/opentimelineio_contrib/adapters/Makefile
 exclude Makefile
 exclude */.DS_Store
 exclude .clang-format

diff --git a/Makefile b/Makefile
@@ -46,16 +46,12 @@ OTIO_DEFAULT_MEDIA_LINKER =
 
 
 # run all the unit tests
-test: test-core test-contrib
+test: test-core
 
 test-core: python-version
 	@echo "$(ccgreen)Running Core tests...$(ccend)"
 	@python -m unittest discover -s tests $(TEST_ARGS)
 
-test-contrib: python-version
-	@echo "$(ccgreen)Running Contrib tests...$(ccend)"
-	@${MAKE_PROG} -C contrib/opentimelineio_contrib/adapters test VERBOSE=$(VERBOSE)
-
 # CI
 ###################################
 ci-prebuild: manifest lint
@@ -65,10 +61,10 @@ ci-postbuild: coverage
 python-version:
 	@python --version
 
-coverage: coverage-core coverage-contrib coverage-report
+coverage: coverage-core coverage-report
 
 coverage-report:
-	@${COV_PROG} combine .coverage* contrib/opentimelineio_contrib/adapters/.coverage*
+	@${COV_PROG} combine .coverage*
 	@${COV_PROG} xml
 	@${COV_PROG} report -m
 
@@ -82,10 +78,7 @@ ifndef COV_PROG
 endif
 	@${COV_PROG} run -p -m unittest discover tests
 
-coverage-contrib: python-version
-	@${MAKE_PROG} -C contrib/opentimelineio_contrib/adapters coverage VERBOSE=$(VERBOSE)
-
-lcov: 
+lcov:
 ifndef LCOV_PROG
 	$(error $(newline)$(ccred) lcov is not available please see:$(newline)$(ccend)\
 	$(ccblue)	https://github.com/linux-test-project/lcov/blob/master/README $(ccend))
@@ -127,7 +120,6 @@ clean:
 ifdef COV_PROG
 	@${COV_PROG} erase
 endif
-	@${MAKE_PROG} -C contrib/opentimelineio_contrib/adapters clean VERBOSE=$(VERBOSE)
 	rm -vf *.whl
 	@cd docs; ${MAKE_PROG} clean
 

diff --git a/README.md b/README.md
@@ -73,9 +73,7 @@ For more information: https://github.com/AcademySoftwareFoundation/OpenTimelineI
 
 For more information about this, including supported formats, see: https://opentimelineio.readthedocs.io/en/latest/tutorials/adapters.html
 
-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
 The OTIO python bindings also support several other kinds of plugins, for more information see:
 
 * [Media Linkers](https://opentimelineio.readthedocs.io/en/latest/tutorials/write-a-media-linker.html) - Generate media references to local media according to your local conventions.

diff --git a/contrib/README.md → README_contrib.md b/contrib/README.md → README_contrib.md
@@ -4,7 +4,7 @@ The contrib area was a place to host adapters and application plugins submitted
 by the OpenTimelineIO community. Those contributions may have involved challenging external 
 dependencies, and may not have the same level of support as the core.
 
-The team is in the process of phasing out this area in favor of using individual
+The adapters previously found in the contrib area have been moved to individual
 repos within the
 [OpenTimelineIO GitHub Organization](https://github.com/OpenTimelineIO/).
 

diff --git a/contrib/opentimelineio_contrib/__init__.py b/contrib/opentimelineio_contrib/__init__.py
diff --git a/contrib/opentimelineio_contrib/adapters/Makefile b/contrib/opentimelineio_contrib/adapters/Makefile
diff --git a/contrib/opentimelineio_contrib/adapters/__init__.py b/contrib/opentimelineio_contrib/adapters/__init__.py
diff --git a/contrib/opentimelineio_contrib/adapters/aaf_adapter/__init__.py b/contrib/opentimelineio_contrib/adapters/aaf_adapter/__init__.py