diff --git a/CMakeLists.txt b/CMakeLists.txt index e53f335c7..0fb070512 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,6 @@ option(OTIO_PYTHON_INSTALL "Install the Python bindings" OFF) option(OTIO_DEPENDENCIES_INSTALL "Install OTIO's C++ header dependencies (Imath)" ON) option(OTIO_INSTALL_PYTHON_MODULES "Install OTIO pure Python modules/files" ON) option(OTIO_INSTALL_COMMANDLINE_TOOLS "Install the OTIO command line tools" ON) -option(OTIO_INSTALL_CONTRIB "Install the opentimelineio_contrib Python package" ON) option(OTIO_FIND_IMATH "Find Imath using find_package" OFF) option(OTIO_FIND_RAPIDJSON "Find RapidJSON using find_package" OFF) set(OTIO_PYTHON_INSTALL_DIR "" CACHE STRING "Python installation dir (such as the site-packages dir)") diff --git a/docs/tutorials/write-an-adapter.md b/docs/tutorials/write-an-adapter.md index bae913e03..b37675ad9 100644 --- a/docs/tutorials/write-an-adapter.md +++ b/docs/tutorials/write-an-adapter.md @@ -240,4 +240,5 @@ def export_timeline(timeline): ## Examples -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`. +OTIO includes "core" adapters for `.otio`, `.otiod` and `otioz` files found in in `opentimelineio/adapters`. +In addition to these you'll find many more adapters in the various repositories under the [OpenTimelineIO Organization](https://github.com/OpenTimelineIO) diff --git a/setup.cfg b/setup.cfg index 88fec56b3..784459168 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ description_file = README.md # flake8 ############################################################################### [flake8] -exclude = +exclude = .tox *.egg build @@ -48,20 +48,19 @@ ignore-bad-ideas = ############################################################################### [coverage:run] branch = True -source = +source = opentimelineio - opentimelineio_contrib ./tests [coverage:paths] -otio = +otio = src/py-opentimelineio/opentimelineio *site-packages/opentimelineio [coverage:report] include =* # Regexes for lines to exclude from consideration -omit = +omit = *aaf2* *pkg_resources* *pbr*