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

Add Python 3.12 wheels #1898

Merged
merged 3 commits into from
Dec 5, 2023
Merged

Add Python 3.12 wheels #1898

merged 3 commits into from
Dec 5, 2023

Conversation

remia
Copy link
Collaborator

@remia remia commented Nov 6, 2023 •
edited
Loading

This adds support for Python 3.12 wheels. I'm considering removing Python 3.7 wheel generation given that this version is now EOL and studios relying on it would most likely not get it through PyPI, any thoughts?

@JeanChristopheMorinPerso
Copy link
Member

@remia I would recommend continuing to ship wheels for 3.7 for a little while if it doesn't add too much work/annoyances.

@remia
Copy link
Collaborator Author

remia commented Nov 13, 2023

Sure @JeanChristopheMorinPerso, I don't remember any issues beyond the growing number of Python version we generate wheels for, let's leave it then.

@doug-walker
Copy link
Collaborator

Remi, are you expecting the changes in here will fix the Wheel Actions failure?

@remia
Copy link
Collaborator Author

remia commented Nov 14, 2023

Remi, are you expecting the changes in here will fix the Wheel Actions failure?

Yes, but the rebase against main did bring new errors related to yaml-cpp which need fixing before merging.

@remia remia force-pushed the python-3.12-wheels branch 5 times, most recently from f60745a to f75b4d6 Compare November 14, 2023 09:56
@remia
Copy link
Collaborator Author

remia commented Nov 14, 2023

I believe the issue was that the Python setup.py currently calls CMake configure multiple times (used to get the version of the project) with conflicting OCIO_INSTALL_EXT_PACKAGES flags (no flag to extract the version so defaulting to MISSING then ALL for the actual build). Findyaml-cpp was creating a yaml-cpp::yaml-cpp target even if the package was not found which prevented correct installation of the package during the build.

I also took the liberty to have Installyaml-cpp directly create a yaml-cpp::yaml-cpp target for simplicity.

@tobim are you fine with those changes following your previous PR?

@tobim
Copy link
Contributor

tobim commented Nov 14, 2023

Of course, don't worry about me.

@remia
Add Python 3.12 wheels
7fb8beb 
Signed-off-by: Rémi Achard <[email protected]>
@remia
Copy link
Collaborator Author

remia commented Nov 16, 2023

I moved the yaml-cpp related fixes to #1907 so this PR should only be merged after it is merged.

@remia
Copy link
Collaborator Author

remia commented Nov 23, 2023

Ready for merge again now that #1907 was merged (pending review).

carolalynn
carolalynn approved these changes Dec 5, 2023
View reviewed changes
Copy link
Collaborator

@carolalynn carolalynn left a comment

Choose a reason for hiding this comment

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

Approving to get this in to 2.3.1

@doug-walker doug-walker merged commit f2cfec3 into AcademySoftwareFoundation:main Dec 5, 2023
54 checks passed
@KelSolaar
Copy link
Contributor

Sorry, haven't had time to look at this one like I said I would! Lot of work...

doug-walker added a commit to autodesk-forks/OpenColorIO that referenced this pull request Dec 6, 2023
@remia @doug-walker
Add Python 3.12 wheels (AcademySoftwareFoundation#1898)
e2b7b08 
Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
doug-walker added a commit to autodesk-forks/OpenColorIO that referenced this pull request Dec 6, 2023
@remia @doug-walker
Add Python 3.12 wheels (AcademySoftwareFoundation#1898)
29ef7f0 
Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit f2cfec3)
Signed-off-by: Doug Walker <[email protected]>
doug-walker added a commit that referenced this pull request Dec 8, 2023
@doug-walker @markreidvfx
@KevinJW @cedrik-fuoco-adsk @licy183 @num3ric @michdolan @mdecaria @KelSolaar @AbhineshJha @remia @pennelee @tobim
Integrate main into RB-2.3 branch and update library version (#1918)
92db29b 
* Fix support for X86 32-bit (#1842)

Signed-off-by: Mark Reid <[email protected]>
(cherry picked from commit 16b3157)
Signed-off-by: Doug Walker <[email protected]>

* Add some small arm neon optimizations (#1847)

* Remove unused includes

Signed-off-by: Mark Reid <[email protected]>

* Use neon hardware support for f16 conversions

Signed-off-by: Mark Reid <[email protected]>

* Add some small neon optimizations
use blendv,floor and fma intrinsics were possible

Signed-off-by: Mark Reid <[email protected]>

---------

Signed-off-by: Mark Reid <[email protected]>
(cherry picked from commit 14f0afa)
Signed-off-by: Doug Walker <[email protected]>

* Add links to new release notes documentation (#1848)

Signed-off-by: Kevin Wheatley <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 87126fa)
Signed-off-by: Doug Walker <[email protected]>

* Changing version to 2.4.0 (#1852)

Signed-off-by: Cédrik Fuoco <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 381d1fc)
Signed-off-by: Doug Walker <[email protected]>

* Correctly recover CXX_FLAGS in CheckSupportSSE2.cmake (#1861)

Signed-off-by: Chongyun Lee <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit c429400)
Signed-off-by: Doug Walker <[email protected]>

* Fix regression in cccid handling when no value is supplied (#1855)

In v1 of OCIO FileTransforms are able to load .cc files
without specifying a cccid. In v2 this broke causing an
exception to be raised instead of using the first cc found
in the file.

Signed-off-by: Kevin Wheatley <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit c7ad353)
Signed-off-by: Doug Walker <[email protected]>

* Fix missing cache id reset on look update. (#1873)

Signed-off-by: Eric Renaud-Houde <[email protected]>
(cherry picked from commit dddbee0)
Signed-off-by: Doug Walker <[email protected]>

* ocioview: Curve Inspector improvements (#1845)

* Curve inspector improvements

- Move README to root app folder
- Change curve inspector grid to always render as a square with 10 segments.
- Add transform init callback to set new transform subscriptions to the current viewer if set to passthrough.

Signed-off-by: Michael Dolan <[email protected]>

* Improve log range calculation

Signed-off-by: Michael Dolan <[email protected]>

* Improve channel sample comparison

Signed-off-by: Michael Dolan <[email protected]>

* Update src/apps/ocioview/ocioview/inspect/curve_inspector.py

Signed-off-by: Michael Dolan <[email protected]>

Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: Michael Dolan <[email protected]>

---------

Signed-off-by: Michael Dolan <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 8add374)
Signed-off-by: Doug Walker <[email protected]>

* Fix missing Default View Transform on equal operator (#1886)

Add the missing assignment of the the default view transform when a config is copied using the equal operator

Signed-off-by: Michael De Caria <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit bc8569b)
Signed-off-by: Doug Walker <[email protected]>

* Remove circular import caused by typing annotations. (#1882)

Signed-off-by: Thomas Mansencal <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 1fad466)
Signed-off-by: Doug Walker <[email protected]>

* fix(grammatical): Spelling mistakes (#1892)

Signed-off-by: AbhineshJha <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 0d00b2c)
Signed-off-by: Doug Walker <[email protected]>

* Improve ocioview mac support and simplify dependencies (#1853)

* PySide 6, remove imath, add imageio support

Signed-off-by: Rémi Achard <[email protected]>

Remove Imath

Signed-off-by: Rémi Achard <[email protected]>

Support imageio as fallback for openimageio

Signed-off-by: Rémi Achard <[email protected]>

Further adjustments following latest updates

Signed-off-by: Rémi Achard <[email protected]>

Fix pixel probe

Signed-off-by: Remi Achard <[email protected]>

Add OpenColorIO to requirements

Signed-off-by: Remi Achard <[email protected]>

* Fix rebase issue

Signed-off-by: Remi Achard <[email protected]>

---------

Signed-off-by: Remi Achard <[email protected]>
Signed-off-by: Thomas Mansencal <[email protected]>
Signed-off-by: Michael Dolan <[email protected]>
Co-authored-by: Thomas Mansencal <[email protected]>
Co-authored-by: Michael Dolan <[email protected]>
(cherry picked from commit 45544ce)
Signed-off-by: Doug Walker <[email protected]>

* Issue #1874 Cast to unsigned char for isspace. (#1888)

* Issue #1874 Cast to unsigned char for isspace.

Signed-off-by: pylee <[email protected]>

* Add unit test.

Signed-off-by: pylee <[email protected]>

* Add test comment as suggested in code review.

Signed-off-by: pylee <[email protected]>

---------

Signed-off-by: pylee <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit ed85207)
Signed-off-by: Doug Walker <[email protected]>

* Tentative fix for the doxygen installation in the CI (Windows) (#1890)

Signed-off-by: Cédrik Fuoco <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit b94a184)
Signed-off-by: Doug Walker <[email protected]>

* Simplify the Findyaml-cpp module (#1891)

This fixes compatibility with yaml-cpp 0.8, which previously failed
because of a `get_property` call with the wrong target name.
I took the liberty to add a few simplifications along the way.

Signed-off-by: Tobias Mayer <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 1d3b695)
Signed-off-by: Doug Walker <[email protected]>

* Skip processor concatenation if the display color space is also data. (#1896)

* Skip processor concatenation if the display view transform is also data.

Signed-off-by: Eric Renaud-Houde <[email protected]>

* Moved missing display color space exception before processor creation.

Signed-off-by: Eric Renaud-Houde <[email protected]>

---------

Signed-off-by: Eric Renaud-Houde <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 52b4965)
Signed-off-by: Doug Walker <[email protected]>

* Restore GPU workflow and minor updates to CI (#1899)

* Restore GPU workflow runs

Signed-off-by: Rémi Achard <[email protected]>

* Enable undefined behaviour sanitizer

Signed-off-by: Rémi Achard <[email protected]>

* Fix SIMD option for platform_latest

Signed-off-by: Rémi Achard <[email protected]>

* Fix install_docs_env on CI workflow (not used at the moment)

Signed-off-by: Rémi Achard <[email protected]>

* Fix OpenEXR build flag

Signed-off-by: Rémi Achard <[email protected]>

---------

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 382dcb6)
Signed-off-by: Doug Walker <[email protected]>

* Improve handling of pystring include dir (#1901)

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 9078753)
Signed-off-by: Doug Walker <[email protected]>

* Improve compatibility with minizip-ng COMPAT mode (#1902)

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit ffd0f70)
Signed-off-by: Doug Walker <[email protected]>

* Fix NamedTransform context var issue (#1905)

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit 4d64b32)
Signed-off-by: Doug Walker <[email protected]>

* Fix env serialization for v1 configs (#1904)

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit 4f4f30e)
Signed-off-by: Doug Walker <[email protected]>

* Fix yaml-cpp build issues (#1907)

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 41441bb)
Signed-off-by: Doug Walker <[email protected]>

* Adsk Contrib - Improve heuristics for finding known color spaces (#1913)

* Improve heuristics

Signed-off-by: Doug Walker <[email protected]>

* Add some comments

Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit d8852b5)
Signed-off-by: Doug Walker <[email protected]>

* Add Python 3.12 wheels (#1898)

Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit f2cfec3)
Signed-off-by: Doug Walker <[email protected]>

* Increment library version to 2.3.1

Signed-off-by: Doug Walker <[email protected]>

* Fix wrong RPATH being injected into Python bindings DSO (#1849)

Signed-off-by: Kevin Wheatley <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit ba2b41e)
Signed-off-by: Doug Walker <[email protected]>

---------

Signed-off-by: Mark Reid <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Signed-off-by: Kevin Wheatley <[email protected]>
Signed-off-by: Cédrik Fuoco <[email protected]>
Signed-off-by: Chongyun Lee <[email protected]>
Signed-off-by: Eric Renaud-Houde <[email protected]>
Signed-off-by: Michael Dolan <[email protected]>
Signed-off-by: Michael De Caria <[email protected]>
Signed-off-by: Doug Walker <[email protected]>
Signed-off-by: Thomas Mansencal <[email protected]>
Signed-off-by: AbhineshJha <[email protected]>
Signed-off-by: Remi Achard <[email protected]>
Signed-off-by: pylee <[email protected]>
Signed-off-by: Tobias Mayer <[email protected]>
Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Mark Reid <[email protected]>
Co-authored-by: Kevin Wheatley <[email protected]>
Co-authored-by: Cédrik Fuoco <[email protected]>
Co-authored-by: Uchiha Kakashi <[email protected]>
Co-authored-by: Éric Renaud-Houde <[email protected]>
Co-authored-by: Michael Dolan <[email protected]>
Co-authored-by: Michael De Caria <[email protected]>
Co-authored-by: Thomas Mansencal <[email protected]>
Co-authored-by: Abhinesh <[email protected]>
Co-authored-by: Rémi Achard <[email protected]>
Co-authored-by: PenneLee <[email protected]>
Co-authored-by: tobim <[email protected]>
chandyn pushed a commit to chandyn/OpenColorIO that referenced this pull request Dec 8, 2023
@remia @doug-walker @chandyn
Add Python 3.12 wheels (AcademySoftwareFoundation#1898)
820f6e1 
Signed-off-by: Rémi Achard <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
Signed-off-by: chandyn <[email protected]>
@remia remia deleted the python-3.12-wheels branch April 8, 2024 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@doug-walker doug-walker doug-walker approved these changes

@carolalynn carolalynn carolalynn approved these changes

@KelSolaar KelSolaar Awaiting requested review from KelSolaar

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@remia @JeanChristopheMorinPerso @doug-walker @tobim @KelSolaar @carolalynn