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

Backport PR #11401 on branch 5.x (Added skipif for sqlite3 version > 3.24.0) #11470

Merged
merged 1 commit into from Nov 3, 2018

Conversation

ellert
Copy link

@ellert ellert commented Oct 30, 2018

Backport PR #11401: Added skipif for sqlite3 version > 3.24.0

@Carreau
Copy link
Member

Carreau commented Nov 1, 2018

There is something weird happening in the test, we probably need to pin the pip version on old version of Python.

@ellert
Copy link
Author

ellert commented Nov 2, 2018

Are you blocking the PR due to unrelated issues with the travis CI testing?

@Carreau
Copy link
Member

Carreau commented Nov 2, 2018

Are you blocking the PR due to unrelated issues with the travis CI testing?

Blocking is a strong word, I'd like to get it fix, either by someone, or me, to make sure there is no other regressions. But there is just so much hours in days, and I only working on IPython as volunteer. So I'll get to it when I have time. Getting this release will also take some time. I'll see if I can work on that this week-end.

BTW, we have a bot to do backport if necessary, so usually you can either just as a commiter to mention the bot, or we can whitelist people to be able to mention the bot.

@ellert
Copy link
Author

ellert commented Nov 3, 2018

There is a "from IPython.utils import py3compat" (that was removed on master) close to one of the changes in this backport so the cherry-pick of the commit from master required a manual merge conflict resolution. But maybe your bot uses some clever flags to overcome that.

@Carreau
Copy link
Member

Carreau commented Nov 3, 2018

from master required a manual merge conflict resolution...But maybe your bot uses some clever flags to overcome that.

Ah ok, so manual backport is fine. The bot does not do anything fancy. I was just mentioning it just in case.

I've rebased as I should have fix the testing issue on master, to make sure the test are passing.

Once it's green I can merge.

@Carreau
Copy link
Member

Carreau commented Nov 3, 2018

Test green, getting that in. Thanks.

@Carreau Carreau merged commit ede2d27 into ipython:5.x Nov 3, 2018
@ellert ellert deleted the backport-11401 branch November 4, 2018 03:42
@Carreau Carreau added this to the 5.9 milestone Jan 6, 2019
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.

None yet

3 participants