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

BLD: Update numpy.i, CI: unlink deprecated pkg-config in macOS #1271

Merged
merged 2 commits into from
Nov 25, 2024

Conversation

mferrera
Copy link
Collaborator

@mferrera mferrera commented Nov 25, 2024

Resolves #1269

  1. SWIG 4.3.0 was released, causing the numpy bindings to need updating else compiling fails.
  2. brew pkg-config was renamed to pkgconf but macOS GH Runners are imaged with pkg-config.

SWIG 4.3.0 was released, causing the numpy bindings to need updating
else compiling fails.
@codecov-commenter
Copy link

codecov-commenter commented Nov 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.14%. Comparing base (0375fed) to head (45d60b3).
Report is 48 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1271      +/-   ##
==========================================
+ Coverage   80.02%   81.14%   +1.12%     
==========================================
  Files          98       94       -4     
  Lines       13680    12435    -1245     
  Branches     2203     1874     -329     
==========================================
- Hits        10948    10091     -857     
+ Misses       1999     1685     -314     
+ Partials      733      659      -74     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.


🚨 Try these New Features:

# pkg-config formula is deprecated but it's still installed
# in GitHub Actions runner now. We can remove this once
# pkg-config formula is removed from GitHub Actions runner.
brew unlink [email protected]
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

https://github.com/actions/runner-images/blob/ffd458e26366fb9f0e99222020cbaf8bce86a254/images/macos/macos-15-Readme.md?plain=1#L68

brew apparently needs a specific version to unlink from. This version came from here.

@mferrera mferrera changed the title BLD: Update numpy.i BLD: Update numpy.i, CI: unlink deprecated pkg-config in macOS Nov 25, 2024
macOS GitHub Action Runners come with pkg-config installed, but this
package is deprecated in brew. Replace it with pkgconf.

This can be reverted when Action Runners are no longer imaged with
pkg-config.
Copy link
Contributor

@berland berland left a comment

Choose a reason for hiding this comment

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

It builds and passes test, that makes me sufficiently happy :)

@mferrera mferrera merged commit af8d0ae into equinor:main Nov 25, 2024
39 checks passed
@mferrera mferrera deleted the fix-ci branch November 25, 2024 10:20
@berland
Copy link
Contributor

berland commented Nov 27, 2024

I don't get why, but this change is responsible for this failure: https://github.com/equinor/res2df/actions/runs/12049771698/job/33597222979?pr=513

(there solved by pinning "xtgeo < 4.3.2" for py38.

@mferrera
Copy link
Collaborator Author

I'll take a look at it. Nobody really understands the swig bindings. This change was simply to copy them from https://github.com/numpy/numpy/blob/main/tools/swig/numpy.i so it's less likely to contain the bug, but maybe numpy has already deprecated some 3.8 compatibility stuff in doing so.

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.

Resolve CI failures
3 participants