Skip to content

Conversation

JeanChristopheMorinPerso
Copy link
Member

Fixes #1250

#1238 introduced a regression where it overwrote Python modules where modified by setuptools.

This PR disables copying python files from CMake if OTIO_PYTHON_INSTALL_DIR is not set. AFAIK, OTIO_PYTHON_INSTALL_DIR is only used when running from setuptools. Or I think.

I've also set BUILD_TESTING to OFF when building from setuptools since there is no point of building the C++ tests when building the Python extension.

@codecov-commenter
Copy link

codecov-commenter commented Mar 23, 2022

Codecov Report

Merging #1251 (8554d19) into main (e9c0b5a) will decrease coverage by 0.00%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1251      +/-   ##
==========================================
- 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% <ø> (-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% <0.00%> (-1.31%) ⬇️
...-opentimelineio/opentimelineio/plugins/manifest.py 86.56% <0.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...8554d19. 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.

Thanks for figuring out where the problem lay! Some comments in line

@meshula meshula merged commit 0f133ba into AcademySoftwareFoundation:main Mar 27, 2022
@meshula
Copy link
Collaborator

meshula commented Mar 27, 2022

Thanks for the fix!

@JeanChristopheMorinPerso JeanChristopheMorinPerso deleted the fix_missing_init_metadata branch March 27, 2022 00:49
@JeanChristopheMorinPerso
Copy link
Member Author

It's a pleasure :)

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
* fix a regression where the dunder attributes weren't being preprended to __init__.py.

* Don't install Python files from cmake if building with setuptools

* Don't build C++ tests if building from setuptools

* Add new OTIO_INSTALL_PYTHON_MODULES CMake variable to control when to install pure Python modules/files/packages

Co-authored-by: Nick Porcino <[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.

module level dunder names not appearing in __init__.py
4 participants