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.

Sign up for GitHub

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

Jump to bottom

Prepare baseline plugin_manifest.json for removal of the cmx_3600 adapter #1488

Merged
merged 3 commits into from
Dec 1, 2022
Merged

Prepare baseline plugin_manifest.json for removal of the cmx_3600 adapter #1488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0f17d8
Use "otio_json" instead of "cmx_3600" as it's no longer a part of the…
apetrynet Nov 30, 2022
d071eaa
add "extract_adapters" to CI triggers
apetrynet Dec 1, 2022
efe0871
use "otiod" as override example as otio_json failed
apetrynet Dec 1, 2022
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: 2 additions & 2 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: docs

on:
push:
branches: [ main ]
branches: [ main, extract_adapters ]
pull_request:
branches: [ main ]
branches: [ main, extract_adapters ]

jobs:
check-links:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ env:

on:
push:
branches: [ main ]
branches: [ main, extract_adapters ]
pull_request:
branches: [ main ]
branches: [ main, extract_adapters ]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/plugin_module/otio_override_adapter/plugin_manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"adapters": [
{
"OTIO_SCHEMA" : "Adapter.1",
"name" : "cmx_3600",
"name" : "otiod",
"filepath" : "adapter.py",
"suffixes" : ["edl"]
"suffixes" : ["otiod"]
}
]
}
6 changes: 3 additions & 3 deletions tests/test_plugin_detection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ def test_override_adapter(self):
# Test that entrypoint plugins load before builtin and contrib
man = otio.plugins.manifest.load_manifest()

# The override_adapter creates another cmx_3600 adapter
# The override_adapter creates another otiod adapter
adapters = [adapter for adapter in man.adapters
if adapter.name == "cmx_3600"]
if adapter.name == "otiod"]

# More then one cmx_3600 adapter should exist.
# More then one otiod adapter should exist.
self.assertTrue(len(adapters) > 1)

# Override adapter should be the first adapter found
Expand Down