Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fix Circle merge on master branch.#20709

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
jklymak merged 1 commit intomatplotlib:masterfromQuLogic:fix-circle-merge
Jul 21, 2021

Conversation

QuLogic
Copy link
Member

PR Summary

There exists a PR on a random fork, which fills inCI_PULL_REQUEST, which we don't want to use as merge target when buildingmaster. Instead, checkCIRCLE_PR_NUMBER, which is set only on forked PRs. Also, check branch name (which is current, not thetarget) to be certain.

Followup to#20680,@larsoner

PR Checklist

  • [n/a] Has pytest style unit tests (andpytest passes).
  • IsFlake 8 compliant (runflake8 on changed files to check).
  • [n/a] New features are documented, with examples if plot related.
  • [n/a] Documentation is sphinx and numpydoc compliant (the docs shouldbuild without error).
  • [n/a] Conforms to Matplotlib style conventions (installflake8-docstrings and runflake8 --docstring-convention=all).
  • [n/a] New features have an entry indoc/users/next_whats_new/ (follow instructions in README.rst there).
  • [n/a] API changes documented indoc/api/next_api_changes/ (follow instructions in README.rst there).

There exists a PR on a random fork, which fills in `CI_PULL_REQUEST`,which we don't want to use as merge target when building `master`.Instead, check `CIRCLE_PR_NUMBER`, which is set only on forked PRs.Also, check branch name (which is current, not the _target_) to becertain.
@tacaswell
Copy link
Member

We should wait for circle to finish and then merge. We won't see if this actually fixed the problem until it lands on master.

Copy link
Member

@tacaswelltacaswell left a comment

Choose a reason for hiding this comment

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

anyone can merge when CircleCI is green.

@larsoner
Copy link
Contributor

There exists a PR on a random fork, which fills in CI_PULL_REQUEST, which we don't want to use as merge target when building master

Wow, I've never seen that crop up before! Your solution sounds reasonable to me

@timhoffm
Copy link
Member

Let's try this.

@jklymakjklymak merged commit1a8caa5 intomatplotlib:masterJul 21, 2021
@jklymak
Copy link
Member

jklymak commentedJul 21, 2021•
edited
Loading

ooops; sorry@timhoffm your message came in as I hit the Merge button

@timhoffm
Copy link
Member

GitHub is not thread-safe. 🤣

jklymak reacted with laugh emoji

@QuLogicQuLogic deleted the fix-circle-merge branchJuly 21, 2021 21:40
@QuLogic
Copy link
MemberAuthor

It was successful, I believe:this PR merged whilemaster didn't.

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

@tacaswelltacaswelltacaswell approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
v3.5.0
Development

Successfully merging this pull request may close these issues.

5 participants
@QuLogic@tacaswell@larsoner@timhoffm@jklymak
[8]ページ先頭
©2009-2025 Movatter.jp