Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for find_children() with stacks #1755

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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*"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ jobs:
mingw-w64-x86_64-cmake
make
git
- name: Ensure MSYS2 pip is updated
if: matrix.python-version == 'mingw64'
run: curl -sS https://bootstrap.pypa.io/get-pip.py | python
- name: Set up Python ${{ matrix.python-version }}
if: matrix.python-version != 'mingw64'
uses: actions/[email protected]
Expand Down
4 changes: 1 addition & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
16 changes: 4 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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))
Expand Down Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion contrib/README.md → README_contrib.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).

Expand Down
12 changes: 0 additions & 12 deletions contrib/opentimelineio_contrib/__init__.py

This file was deleted.

27 changes: 0 additions & 27 deletions contrib/opentimelineio_contrib/adapters/Makefile

This file was deleted.

2 changes: 0 additions & 2 deletions contrib/opentimelineio_contrib/adapters/__init__.py

This file was deleted.

This file was deleted.

Loading
Loading