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

Lift meson cap, remove conda-build work-arounds #398

Merged
merged 5 commits into from
Aug 2, 2024
Merged

Lift meson cap, remove conda-build work-arounds #398

merged 5 commits into from
Aug 2, 2024

Conversation

h-vetinari
Copy link
Member

@conda-forge-webservices
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@h-vetinari h-vetinari mentioned this pull request Jul 11, 2024
Closed
@h-vetinari h-vetinari force-pushed the meson branch 2 times, most recently from 0350674 to dc22e8d Compare July 12, 2024 02:20
@h-vetinari h-vetinari mentioned this pull request Jul 12, 2024
Merged
3 tasks
@h-vetinari h-vetinari changed the title debug osx-arm issues with meson 1.5 debug osx-arm issues with meson 1.5 & ppc issues with conda-build Jul 12, 2024
@h-vetinari h-vetinari mentioned this pull request Jul 12, 2024
Closed
2 tasks
@h-vetinari h-vetinari changed the title debug osx-arm issues with meson 1.5 & ppc issues with conda-build Lift meson cap Aug 1, 2024
@conda-forge-webservices
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe/meta.yaml) and found it was in an excellent condition.

@h-vetinari
Copy link
Member Author

@conda-forge/matplotlib
This removes a couple of work-arounds now that the respective fixes have landed in meson & conda-build. It also switches over the build invocation to go through meson-python, as invoking meson directly and then meson-python is not a supported operation. PTAL :)

@h-vetinari h-vetinari changed the title Lift meson cap Lift meson cap, remove conda-build work-arounds Aug 2, 2024
@tacaswell tacaswell merged commit 668f3b6 into conda-forge:main Aug 2, 2024
31 checks passed
@h-vetinari h-vetinari deleted the meson branch August 2, 2024 04:41
jakirkham
jakirkham reviewed Aug 2, 2024
View reviewed changes
recipe/build_base.sh
Comment on lines +10 to +12
# meson-python already sets up a -Dbuildtype=release argument to meson, so
# we need to strip --buildtype out of MESON_ARGS or fail due to redundancy
MESON_ARGS_REDUCED="$(echo $MESON_ARGS | sed 's/--buildtype release //g')"
Copy link
Member

Choose a reason for hiding this comment

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

Do we have an issue tracking removing this flag from MESON_ARGS upstream?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, it's their default. Our compilers need to change, and they did as of clang 17 / GCC 13

Copy link
Member

Choose a reason for hiding this comment

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

Sorry I meant raise a conda-forge issue, but it sounds like that already was fixed. Do you have a link?

Copy link
Member Author

Choose a reason for hiding this comment

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

There are two links in my comment...? 🤔

Copy link
Member

Choose a reason for hiding this comment

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

Oh oops. Sorry was on my phone, which didn't make this clear. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakirkham jakirkham jakirkham left review comments

@dopplershift dopplershift Awaiting requested review from dopplershift dopplershift is a code owner

@mdboom mdboom Awaiting requested review from mdboom mdboom is a code owner

@ocefpaf ocefpaf Awaiting requested review from ocefpaf ocefpaf is a code owner

@pelson pelson Awaiting requested review from pelson pelson is a code owner

@tacaswell tacaswell Awaiting requested review from tacaswell tacaswell is a code owner

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

Successfully merging this pull request may close these issues.
3 participants
@h-vetinari @jakirkham @tacaswell