Skip to content

Commit f9cf8bb

Browse files
apetrynetreinecke
authored andcommitted
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]>
1 parent 36da908 commit f9cf8bb

24 files changed

+12
-2915
lines changed

.codecov.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ comment:
1818
require_changes: no
1919

2020
ignore:
21-
- "contrib/opentimelineio_contrib/adapters/tests/test_rvsession.py"
2221
- "*aaf2*"
2322
- "*pkg_resources*"
2423
- "*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

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/contrib_adapters.plugin_manifest.json

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

contrib/opentimelineio_contrib/adapters/tests/__init__.py

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

contrib/opentimelineio_contrib/adapters/tests/sample_data/gaps.otio

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

0 commit comments

Comments
 (0)