Skip to content

Commit e10fdd2

Browse files
reineckeapetrynetmarkreidvfxrosborne132timlehr
authored
Remove non-core adapters (#1725)
* 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]>
1 parent 3d46584 commit e10fdd2

File tree

138 files changed

+2926
-57299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+2926
-57299
lines changed

‎.codecov.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ comment:
1818
require_changes: no
1919

2020
ignore:
21-
- "contrib/opentimelineio_contrib/adapters/tests/test_rvsession.py"
22-
- "contrib/opentimelineio_contrib/adapters/tests/test_maya_sequencer.py"
23-
- "contrib/opentimelineio_contrib/adapters/tests/test_burnins.py"
24-
- "contrib/opentimelineio_contrib/adapters/burnins.py"
2521
- "*aaf2*"
2622
- "*pkg_resources*"
2723
- "*pbr*"

‎MANIFEST.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
include README.md CHANGELOG.md LICENSE.txt NOTICE.txt CMakeLists.txt
1+
include README.md README_contrib.md CHANGELOG.md LICENSE.txt NOTICE.txt CMakeLists.txt
22
recursive-include examples *
3-
recursive-include contrib *
43
recursive-include src *
54
recursive-include tests *
65
prune .github
@@ -17,7 +16,6 @@ exclude CODE_OF_CONDUCT.md
1716
exclude CONTRIBUTING.md
1817
exclude CONTRIBUTORS.md
1918
exclude GOVERNANCE.md
20-
exclude contrib/opentimelineio_contrib/adapters/Makefile
2119
exclude Makefile
2220
exclude */.DS_Store
2321
exclude .clang-format

‎Makefile

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,12 @@ OTIO_DEFAULT_MEDIA_LINKER =
4646

4747

4848
# run all the unit tests
49-
test: test-core test-contrib
49+
test: test-core
5050

5151
test-core: python-version
5252
@echo "$(ccgreen)Running Core tests...$(ccend)"
5353
@python -m unittest discover -s tests $(TEST_ARGS)
5454

55-
test-contrib: python-version
56-
@echo "$(ccgreen)Running Contrib tests...$(ccend)"
57-
@${MAKE_PROG} -C contrib/opentimelineio_contrib/adapters test VERBOSE=$(VERBOSE)
58-
5955
# CI
6056
###################################
6157
ci-prebuild: manifest lint
@@ -65,10 +61,10 @@ ci-postbuild: coverage
6561
python-version:
6662
@python --version
6763

68-
coverage: coverage-core coverage-contrib coverage-report
64+
coverage: coverage-core coverage-report
6965

7066
coverage-report:
71-
@${COV_PROG} combine .coverage* contrib/opentimelineio_contrib/adapters/.coverage*
67+
@${COV_PROG} combine .coverage*
7268
@${COV_PROG} xml
7369
@${COV_PROG} report -m
7470

@@ -82,10 +78,7 @@ ifndef COV_PROG
8278
endif
8379
@${COV_PROG} run -p -m unittest discover tests
8480

85-
coverage-contrib: python-version
86-
@${MAKE_PROG} -C contrib/opentimelineio_contrib/adapters coverage VERBOSE=$(VERBOSE)
87-
88-
lcov:
81+
lcov:
8982
ifndef LCOV_PROG
9083
$(error $(newline)$(ccred) lcov is not available please see:$(newline)$(ccend)\
9184
$(ccblue) https://github.com/linux-test-project/lcov/blob/master/README $(ccend))
@@ -127,7 +120,6 @@ clean:
127120
ifdef COV_PROG
128121
@${COV_PROG} erase
129122
endif
130-
@${MAKE_PROG} -C contrib/opentimelineio_contrib/adapters clean VERBOSE=$(VERBOSE)
131123
rm -vf *.whl
132124
@cd docs; ${MAKE_PROG} clean
133125

‎README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ For more information: https://github.com/AcademySoftwareFoundation/OpenTimelineI
7373

7474
For more information about this, including supported formats, see: https://opentimelineio.readthedocs.io/en/latest/tutorials/adapters.html
7575

76-
Other Plugins
77-
-------------
78-
76+
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
7977
The OTIO python bindings also support several other kinds of plugins, for more information see:
8078

8179
* [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.

‎contrib/README.md renamed to ‎README_contrib.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The contrib area was a place to host adapters and application plugins submitted
44
by the OpenTimelineIO community. Those contributions may have involved challenging external
55
dependencies, and may not have the same level of support as the core.
66

7-
The team is in the process of phasing out this area in favor of using individual
7+
The adapters previously found in the contrib area have been moved to individual
88
repos within the
99
[OpenTimelineIO GitHub Organization](https://github.com/OpenTimelineIO/).
1010

‎contrib/opentimelineio_contrib/__init__.py

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎contrib/opentimelineio_contrib/adapters/Makefile

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎contrib/opentimelineio_contrib/adapters/__init__.py

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎contrib/opentimelineio_contrib/adapters/aaf_adapter/__init__.py

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)