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

Support OTIO_PLUGIN_MANIFEST_PATH being set to an empty string #1253

Merged

Conversation

avrata
Copy link
Contributor

@avrata avrata commented Mar 24, 2022

This restores the ability to set OTIO_PLUGIN_MANIFEST_PATH to an empty string
to indicate no local custom manifest file.

Link the Issue(s) this Pull Request is related to.

Fixes #1252

Summarize your change.

This changes a truthy check on the env var OTIO_PLUGIN_MANIFEST_PATH to skip any false value and not explicitly is None. This will allow OTIO_PLUGIN_MANIFEST_PATH='' to be equivalent to that env var not being set.

Reference associated tests.

Added a test specifically for this. Also updated all tests in test_adapter_plugin.py to always un-set custom env vars or manifests on exceptions due to test failures so as to not pollute subsequent tests.

This restores the ability to set OTIO_PLUGIN_MANIFEST_PATH to an empty string
to indicate no local custom manifest file.
@avrata avrata changed the title Support OTIO_PLUGIN_MANIFEST_PATH being set to an emptry string Support OTIO_PLUGIN_MANIFEST_PATH being set to an empty string Mar 24, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #1253 (f2b31a7) into main (e9c0b5a) will decrease coverage by 0.00%.
The diff coverage is 75.92%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1253      +/-   ##
==========================================
- Coverage   86.10%   86.09%   -0.01%     
==========================================
  Files         196      196              
  Lines       19647    19665      +18     
  Branches     2305     2308       +3     
==========================================
+ Hits        16917    16931      +14     
- Misses       2171     2173       +2     
- Partials      559      561       +2     
Flag Coverage Δ
py-unittests 86.09% <75.92%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
tests/test_adapter_plugin.py 87.41% <75.47%> (-1.31%) ⬇️
...-opentimelineio/opentimelineio/plugins/manifest.py 86.56% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e9c0b5a...f2b31a7. Read the comment docs.

Copy link
Collaborator

@meshula meshula left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@meshula meshula merged commit f74081b into AcademySoftwareFoundation:main Mar 24, 2022
andrewmoore-nz added a commit to thecargocultnz/OpenTimelineIO that referenced this pull request Apr 5, 2022
* main:
  Add Python 3.10 to CI (AcademySoftwareFoundation#1256)
  Fix missing init metadata (AcademySoftwareFoundation#1251)
  Support OTIO_PLUGIN_MANIFEST_PATH being set to an emptry string (AcademySoftwareFoundation#1253)
  Add ALE adapter argument `ale_name_column_key` (AcademySoftwareFoundation#1248)
  AAF Adapter: Mob transcription heuristics (AcademySoftwareFoundation#1249)
  Bump src/deps/Imath from `bd6f74c` to `bd254da` (AcademySoftwareFoundation#1245)
  clang notices that constexpr can't be used on a mutating function (AcademySoftwareFoundation#1242)
jminor pushed a commit that referenced this pull request May 2, 2022
This restores the ability to set OTIO_PLUGIN_MANIFEST_PATH to an empty string
to indicate no local custom manifest file.

Co-authored-by: Robyn Rindge <[email protected]>
@ssteinbach ssteinbach added this to the Public Beta 15 milestone Sep 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Setting OTIO_PLUGIN_MANIFEST_PATH to "" causes load_manifest() error
4 participants