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

Updates for modern macOS dev (backport #4242) #4270

Merged
merged 2 commits into from
Apr 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 11, 2024

Latest version of pip is needed, as well as a few config flags to show where to find graphviz (pygraphviz/pygraphviz#11 is somehow still helpful / relevant this many years on...)


This is an automatic backport of pull request #4242 done by Mergify.

* Updates for modern macOS dev

Latest version of pip is needed, as well as a few config flags to show where to find graphviz (pygraphviz/pygraphviz#11 is somehow still helpful / relevant this many years on...)

Signed-off-by: Corey Quinn <QuinnyPig@users.noreply.github.com>
Co-authored-by: Chris Lalancette <clalancette@gmail.com>
(cherry picked from commit 1de6ff9)

# Conflicts:
#	source/Installation/Alternatives/macOS-Development-Setup.rst
Copy link
Contributor Author

mergify bot commented Apr 11, 2024

Cherry-pick of 1de6ff9 has failed:

On branch mergify/bp/iron/pr-4242
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit 1de6ff98.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Installation/Alternatives/macOS-Development-Setup.rst

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from clalancette as a code owner April 11, 2024 13:54
@mergify mergify bot added the conflicts label Apr 11, 2024
@mergify mergify bot requested a review from audrow as a code owner April 11, 2024 13:54
@mergify mergify bot mentioned this pull request Apr 11, 2024
Signed-off-by: Chris Lalancette <clalancette@gmail.com>

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
@clalancette clalancette merged commit d3ca3d8 into iron Apr 11, 2024
4 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/iron/pr-4242 branch April 11, 2024 14:06
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.

2 participants