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

PR: Remove extra blank lines when running statements with input() (IPython console) #17559

Merged
merged 8 commits into from
Mar 28, 2022

Conversation

ccordoba12
Copy link
Member

@ccordoba12 ccordoba12 commented Mar 27, 2022

Description of Changes

  • The main change in this PR is removing extra blank lines when running statements with input() in the IPython console.
  • Add subrepo for Qtconsole because this introduces a breaking change in one of the methods overrode by us in RichJupyterWidget.
  • Update our requirement on Qtpy because the next Qtconsole will require 2.0.1+
  • Update contributing and release instructions to account for this new subrepo.
  • Depends on Don't write separator for input prompts jupyter/qtconsole#501

Issue(s) Resolved

Fixes #16504

Affirmation

By submitting this Pull Request or typing my (user)name below,
I affirm the Developer Certificate of Origin
with respect to all commits and content included in this PR,
and understand I am releasing the same under Spyder's MIT (Expat) license.

I certify the above statement is true and correct: @ccordoba12

…ternal-deps/qtconsole

subrepo:
  subdir:   "external-deps/qtconsole"
  merged:   "e8c16bfd5"
upstream:
  origin:   "https://github.com/jupyter/qtconsole.git"
  branch:   "master"
  commit:   "e8c16bfd5"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
…ithub.com/ccordoba12/qtconsole.git external-deps/qtconsole

subrepo:
  subdir:   "external-deps/qtconsole"
  merged:   "0cc9c0bff"
upstream:
  origin:   "https://github.com/ccordoba12/qtconsole.git"
  branch:   "input-prompt-sep"
  commit:   "0cc9c0bff"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
That's because the next qtconsole release will depend on it
@ccordoba12 ccordoba12 added this to the v5.3.0 milestone Mar 27, 2022
@ccordoba12 ccordoba12 self-assigned this Mar 27, 2022
@ccordoba12 ccordoba12 force-pushed the issue-16504 branch 4 times, most recently from 9e9e4d3 to b066fef Compare March 27, 2022 23:13
dalthviz
dalthviz previously approved these changes Mar 28, 2022
Copy link
Member

@dalthviz dalthviz left a comment

Choose a reason for hiding this comment

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

Thanks @ccordoba12 ! This LGTM 👍

Also, I guess first jupyter/qtconsole#501 needs to be merged and then the subrepo here updated for this to be finished, right?

@ccordoba12
Copy link
Member Author

Yes, let me do that so you can merge this one.

…jupyter/qtconsole.git external-deps/qtconsole

subrepo:
  subdir:   "external-deps/qtconsole"
  merged:   "bcab5aaf8"
upstream:
  origin:   "https://github.com/jupyter/qtconsole.git"
  branch:   "master"
  commit:   "bcab5aaf8"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

[ci skip]
@dalthviz dalthviz merged commit 52b26b8 into spyder-ide:5.x Mar 28, 2022
@ccordoba12 ccordoba12 deleted the issue-16504 branch March 28, 2022 16:48
dalthviz added a commit that referenced this pull request Mar 28, 2022
@dalthviz dalthviz mentioned this pull request Mar 28, 2022
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants