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

Bump testing #300

Merged
merged 10 commits into from
Aug 17, 2021
Merged

Bump testing #300

merged 10 commits into from
Aug 17, 2021

Conversation

dopplershift
Copy link
Member

Checklist

  • Used a personal fork of the feedstock to propose changes
    * [ ] Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

@conda-forge-linter
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.

tacaswell
tacaswell reviewed Aug 13, 2021
View reviewed changes
recipe/pre-7.3.6-0001.patch
@@ -0,0 +1,25 @@
diff --git a/src/_c_internal_utils.c b/src/_c_internal_utils.c
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to apply this patch to upstream Matplotlib or is this really a transitory thing?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not sure, came in with #298. @mattip?

Copy link
Contributor

Choose a reason for hiding this comment

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

This is needed until PyPy can make a new release with the required fix. That should happen in a month or two.

Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like it will do no harm in any case though? What is the downside of pulling this upstream?

Copy link
Contributor

Choose a reason for hiding this comment

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

I can see no harm in discarding the return value since it will always return NULL anyway. Perhaps some future version of Python will start returning a value at some point, but I doubt it since this is in error-handling code.

@dopplershift dopplershift added the automerge Merge the PR when CI passes label Aug 16, 2021
@github-actions github-actions bot merged commit e43e825 into conda-forge:testing Aug 17, 2021
@github-actions
Copy link
Contributor

Hi! This is the friendly conda-forge automerge bot!

I considered the following status checks when analyzing this PR:

  • linter: passed
  • drone: passed
  • travis: passed
  • azure: passed

Thus the PR was passing and merged! Have a great day!

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

@mattip mattip mattip left review comments

@tacaswell tacaswell tacaswell approved these changes

@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

Assignees
No one assigned
Labels
automerge Merge the PR when CI passes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dopplershift @conda-forge-linter @tacaswell @mattip @ocefpaf @regro-cf-autotick-bot