Skip to content

bpo-42584: Update macOS installer to use SQLite 3.34.0 #23674

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

Merged
merged 3 commits into from
Jan 4, 2021

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented Dec 7, 2020

@ned-deily ned-deily merged commit c94ee13 into python:master Jan 4, 2021
@miss-islington
Copy link
Contributor

Thanks @erlend-aasland for the PR, and @ned-deily for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Thanks @erlend-aasland for the PR, and @ned-deily for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @erlend-aasland and @ned-deily, I could not cleanly backport this to 3.8 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c94ee13ad596d26d1859078bc09806aa59bb0000 3.8

@miss-islington
Copy link
Contributor

Sorry @erlend-aasland and @ned-deily, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker c94ee13ad596d26d1859078bc09806aa59bb0000 3.9

@erlend-aasland erlend-aasland deleted the sqlite-3.34/macos branch January 4, 2021 05:45
@erlend-aasland
Copy link
Contributor Author

Thanks, @ned-deily!

@erlend-aasland
Copy link
Contributor Author

BTW, I'm (currently) unable to open PR's for 3.8 and 3.9 using the cherry-picker bco. GitHub connection issues. You may have better luck, @ned-deily.

@ned-deily
Copy link
Member

ned-deily commented Jan 5, 2021

@erlend-aasland, are you able to use "git cherry-pick " from the command line? It's a useful skill for a maintainer :) What sort of problem are you having?

@erlend-aasland
Copy link
Contributor Author

@erlend-aasland, are you able to use "git cherry-pick " from the command line? It's a useful skill for a maintainer :) What sort of problem are you having?

I have no problem running the cherry-picker, thank you ;) As you see from the PR log, my backports reference this PR. However, if I try to create the PR's (from my fork to cpython), GH times out. At first I assumed it was a network issue, but I've been getting the same timeout error until today, so now I assume it's a permission error of some sort. I'll restore the branches and give it another shot.

erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Jan 5, 2021
…H-23674).

(cherry picked from commit c94ee13)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@bedevere-bot
Copy link

GH-24129 is a backport of this pull request to the 3.8 branch.

erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Jan 5, 2021
…H-23674)

(cherry picked from commit c94ee13)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@bedevere-bot
Copy link

GH-24130 is a backport of this pull request to the 3.9 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Jan 5, 2021
@ned-deily
Copy link
Member

Looking good! Cherry-picking from the commit in the cpython master branch is the way to go rather than from your own branches.

@erlend-aasland
Copy link
Contributor Author

Indeed. I'll remember not to use the --no-push option the next time.

miss-islington pushed a commit that referenced this pull request Jan 5, 2021
…. (GH-24129)

(cherry picked from commit c94ee13)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>

Automerge-Triggered-By: GH:ned-deily
miss-islington pushed a commit that referenced this pull request Jan 5, 2021
… (GH-24130)

(cherry picked from commit c94ee13)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>

Automerge-Triggered-By: GH:ned-deily
adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 13, 2021
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.

5 participants