Skip to content

bpo-28791: Update Windows installer to use SQLite 3.21.0. #4246

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
Merged
merged 2 commits into from
Nov 7, 2017
Merged

bpo-28791: Update Windows installer to use SQLite 3.21.0. #4246

merged 2 commits into from
Nov 7, 2017

Conversation

Mariatta
Copy link
Member

@Mariatta Mariatta commented Nov 3, 2017 •
edited by bedevere-bot
Loading

@Mariatta Mariatta requested a review from a team as a code owner November 3, 2017 03:32
zooba
zooba approved these changes Nov 3, 2017
View reviewed changes
Copy link
Member

@zooba zooba left a comment

Choose a reason for hiding this comment

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

The change here is fine, but we need the sources uploaded to https://github.com/python/cpython-source-deps and a successful AppVeyor build before merging.

Misc/NEWS.d/next/Build/2017-11-02-20-30-57.bpo-28791.VaE3o8.rst Outdated
@@ -0,0 +1 @@
Update Windows installer to use SQLite 3.21.0.
Copy link
Member

Choose a reason for hiding this comment

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

I would make this "Windows builds" - the installer doesn't have anything to do with SQLite.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated.

PCbuild/get_externals.bat
@@ -50,7 +50,7 @@ echo.Fetching external libraries...
set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0f
set libraries=%libraries% sqlite-3.14.2.0
set libraries=%libraries% sqlite-3.21.0.0
Copy link
Member

Choose a reason for hiding this comment

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

@zware Have you pushed sources up here yet? I haven't.

Copy link
Member

Choose a reason for hiding this comment

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

I have not. @Mariatta, if you'd like to do so, the undocumented process is:

  1. clone cpython-source-deps
  2. check out the sqlite branch
  3. download the sqlite source from sqlite.org
  4. unzip it into the cpython-source-deps checkout
  5. commit, push (as a PR if you'd like confirmation from @zooba or me; base the PR on the sqlite branch)
  6. tag the commit as sqlite-<full version specified in PCbuild/get_externals.bat`

After that, convince AppVeyor to run it again and all should be good. This can all be done from non-Windows.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks @zware and @zooba. I made the PR in cpython-source-deps repo.
🤔 Where should the above steps be documented? Dev Guide?

Copy link
Member

Choose a reason for hiding this comment

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

Devguide would be the right place, but where in the devguide I have no idea :)

@Mariatta Mariatta mentioned this pull request Nov 4, 2017
Merged
Mariatta added a commit to python/cpython-source-deps that referenced this pull request Nov 4, 2017
@Mariatta
Add SQLite 3.21.0 for CPython bpo-28791. (GH-2)
f0cba0c 
bpo: https://bugs.python.org/issue28791
Related CPython PR: python/cpython#4246
@Mariatta Mariatta closed this Nov 4, 2017
@Mariatta Mariatta reopened this Nov 4, 2017
@Mariatta
Copy link
Member Author

Mariatta commented Nov 4, 2017

Hmm now appveyor didn't run..

@Mariatta Mariatta mentioned this pull request Nov 4, 2017
Open
@Mariatta Mariatta closed this Nov 5, 2017
@Mariatta Mariatta reopened this Nov 5, 2017
zware
zware approved these changes Nov 6, 2017
View reviewed changes
Copy link
Member

@zware zware left a comment

Choose a reason for hiding this comment

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

AppVeyor is happy; I'm happy :)

It is unfortunate that AppVeyor only checks the latest commit for what has changed; I had to manually start the build.

@Mariatta
Copy link
Member Author

Mariatta commented Nov 7, 2017

Thanks @zooba and @zware. I'll go ahead and merge this :) 🎉

@Mariatta Mariatta merged commit 31af650 into python:master Nov 7, 2017
@Mariatta Mariatta deleted the bpo-28791-windows branch November 7, 2017 03:31
embray pushed a commit to embray/cpython that referenced this pull request Nov 9, 2017
@Mariatta @embray
bpo-28791: Update Windows builds to use SQLite 3.21.0. (pythonGH-4246)
5dc225d
@miss-islington
Copy link
Contributor

Thanks @Mariatta for the PR 🌮🎉.. I'm working now to backport this PR to: 3.6.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @Mariatta, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 31af650ee25f65794b75d4dfefed6fe4758781c1 3.6

Mariatta added a commit to Mariatta/cpython that referenced this pull request Dec 5, 2017
@Mariatta
[3.6] bpo-28791: Update Windows builds to use SQLite 3.21.0. (pythonG…
17d2336 
…H-4246).

(cherry picked from commit 31af650)
@bedevere-bot
Copy link

GH-4717 is a backport of this pull request to the 3.6 branch.

Mariatta added a commit that referenced this pull request Dec 5, 2017
@Mariatta
bpo-28791: Update Windows builds to use SQLite 3.21.0. (GH-4246). (GH…
e2ba552 
…-4717)

(cherry picked from commit 31af650)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zooba zooba zooba approved these changes

@zware zware zware approved these changes

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

Successfully merging this pull request may close these issues.
6 participants
@Mariatta @miss-islington @bedevere-bot @zooba @zware @the-knights-who-say-ni