Skip to content

Commit 453abfd

Browse files
committed
Merge branch 'main' into issue_1809_remove_otioview
2 parents db8f91d + 207d69f commit 453abfd

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ option(OTIO_PYTHON_INSTALL "Install the Python bindings" OFF)
3131
option(OTIO_DEPENDENCIES_INSTALL "Install OTIO's C++ header dependencies (Imath)" ON)
3232
option(OTIO_INSTALL_PYTHON_MODULES "Install OTIO pure Python modules/files" ON)
3333
option(OTIO_INSTALL_COMMANDLINE_TOOLS "Install the OTIO command line tools" ON)
34-
option(OTIO_INSTALL_CONTRIB "Install the opentimelineio_contrib Python package" ON)
3534
option(OTIO_FIND_IMATH "Find Imath using find_package" OFF)
3635
option(OTIO_FIND_RAPIDJSON "Find RapidJSON using find_package" OFF)
3736
set(OTIO_PYTHON_INSTALL_DIR "" CACHE STRING "Python installation dir (such as the site-packages dir)")

docs/tutorials/write-an-adapter.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,5 @@ def export_timeline(timeline):
240240

241241
## Examples
242242

243-
OTIO includes a number of "core" (supported by the core team) adapters in `opentimelineio/adapters` as well as a number of community supported adapters in `opentimelineio_contrib/adapters`.
243+
OTIO includes "core" adapters for `.otio`, `.otiod` and `otioz` files found in in `opentimelineio/adapters`.
244+
In addition to these you'll find many more adapters in the various repositories under the [OpenTimelineIO Organization](https://github.com/OpenTimelineIO)

setup.cfg

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description_file = README.md
88
# flake8
99
###############################################################################
1010
[flake8]
11-
exclude =
11+
exclude =
1212
.tox
1313
*.egg
1414
build
@@ -48,20 +48,19 @@ ignore-bad-ideas =
4848
###############################################################################
4949
[coverage:run]
5050
branch = True
51-
source =
51+
source =
5252
opentimelineio
53-
opentimelineio_contrib
5453
./tests
5554

5655
[coverage:paths]
57-
otio =
56+
otio =
5857
src/py-opentimelineio/opentimelineio
5958
*site-packages/opentimelineio
6059

6160
[coverage:report]
6261
include =*
6362
# Regexes for lines to exclude from consideration
64-
omit =
63+
omit =
6564
*aaf2*
6665
*pkg_resources*
6766
*pbr*

0 commit comments

Comments
 (0)