Skip to content

numpy.distutils is removed in numpy 1.26 on Python 3.12.#24351

Merged
asmorkalov merged 1 commit intoopencv:4.xfrom
sergiomb2:master
Oct 3, 2023
Merged

numpy.distutils is removed in numpy 1.26 on Python 3.12.#24351
asmorkalov merged 1 commit intoopencv:4.xfrom
sergiomb2:master

Conversation

@sergiomb2
Copy link
Copy Markdown
Contributor

@sergiomb2 sergiomb2 commented Oct 2, 2023

so we don't use numpy.distutils to get includes dirs of python-numpy

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Oct 2, 2023

There are a lot of embedded platform users that cannot update Python or NumPy. The current approach was deprecated in NumPy 1.23. I propose to add condition and use old command for old Numpy versions.

@asmorkalov asmorkalov changed the base branch from master to 4.x October 2, 2023 16:14
@opencv-alalek
Copy link
Copy Markdown
Contributor

opencv-alalek commented Oct 3, 2023

Embedded boards usually processed through CMAKE_CROSSCOMPILING branch above.
Also there is workaround possible to pass PYTHON3_NUMPY_INCLUDE_DIRS to cmake.

I don't see issues with Ubuntu 16.04 builders.
numpy.get_include() is here for the last 17 years: https://github.com/numpy/numpy/blame/4a709238b22ece2d01de5e429ad11ae0f2611f7b/numpy/lib/_utils_impl.py#L74

opencv-alalek
opencv-alalek reviewed Oct 3, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@opencv-alalek opencv-alalek left a comment

Choose a reason for hiding this comment

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

@sergiomb2 Please rebase source branch on the latest 4.x upstream branch. This is necessary for enabling the latest GitHub Actions checks.

@sergiomb2
numpy.distutils is removed in numpy 1.26 on Python 3.12.
00ca8f4 
so we don't use numpy.distutils to get includes dirs of python-numpy
@sergiomb2
Copy link
Copy Markdown
Contributor Author

sergiomb2 commented Oct 3, 2023

@sergiomb2 Please rebase source branch on the latest 4.x upstream branch. This is necessary for enabling the latest GitHub Actions checks.

done !

@asmorkalov asmorkalov added this to the 4.9.0 milestone Oct 3, 2023
@asmorkalov asmorkalov merged commit 3d0e2cc into opencv:4.x Oct 3, 2023
@asmorkalov asmorkalov mentioned this pull request Oct 17, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@opencv-alalek opencv-alalek opencv-alalek approved these changes

Assignees

@opencv-alalek opencv-alalek

Labels

category: build/install category: python bindings

Projects

None yet

Milestone

4.9.0

Development

Successfully merging this pull request may close these issues.

3 participants

@sergiomb2 @asmorkalov @opencv-alalek