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.

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

PR: Fix out-of-order insertion of mixed stdin and stdout streams on macOS (IPython console) #19947

Merged
merged 3 commits into from
Oct 30, 2022
Merged

PR: Fix out-of-order insertion of mixed stdin and stdout streams on macOS (IPython console) #19947

merged 3 commits into from
Oct 30, 2022

Conversation

ccordoba12
Copy link
Member

@ccordoba12 ccordoba12 commented Oct 29, 2022 •
edited
Loading

Description of Changes

Issue(s) Resolved

Fixes #19888

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

@ccordoba12
git subrepo clone --branch=fix-print-input-mac --force https://github…
976dc03 
….com/ccordoba12/qtconsole.git external-deps/qtconsole

subrepo:
  subdir:   "external-deps/qtconsole"
  merged:   "03af73738"
upstream:
  origin:   "https://github.com/ccordoba12/qtconsole.git"
  branch:   "fix-print-input-mac"
  commit:   "03af73738"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
@ccordoba12
Testing: Add QTCONSOLE_TESTING env var to our CIs
ae01913 
This avoids or runs certain things while testing on Qtconsole.
@ccordoba12 ccordoba12 added this to the v5.4.0 milestone Oct 29, 2022
@ccordoba12 ccordoba12 self-assigned this Oct 29, 2022
@ccordoba12
Copy link
Member Author

@mrclary, could you check if this PR fixes issue #19888? It should, but I'd like to be sure. Thanks!

mrclary
mrclary approved these changes Oct 29, 2022
View reviewed changes
Copy link
Contributor

@mrclary mrclary left a comment

Choose a reason for hiding this comment

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

@ccordoba12, It does appear to be resolve for macOS with this PR.

@mrclary
Copy link
Contributor

mrclary commented Oct 29, 2022

@ccordoba12, don't worry about the failing conda-based installer workflows. After this PR is merged, I'll investigate those separately.

@mrclary
Copy link
Contributor

mrclary commented Oct 29, 2022 •
edited
Loading

Aahh! I see what's happening. the qtconsole build is failing because the commit 03af737 does not exist on the remote https://github.com/jupyter/qtconsole.git. git-subrepo updates the commit but not the remote (which should be https://github.com/ccordoba12/qtconsole.git).

Is there a way to ensure that git-subrepo updates the remote as well?

[subrepo]
 	remote = https://github.com/jupyter/qtconsole.git
 	branch = fix-print-input-mac                       # <- does not exist on remote
 	commit = 03af737385baa58bea6c9b17ce3e2df6c56cb16c  # <- does not exist on remote
 	parent = 6b211843a99a534331d443ffe17cb2a72458da83

Of course, after the relevant PR is merged in qtconsole and our subrepo is updated accordingly, then this will go away. But every time we have parallel PRs in qtconsole, spyder-kernels, python-lsp-server, or qdarkstyle, this will happen.

@ccordoba12
git subrepo clone (merge) --branch=master --force https://github.com/…
49d5f25 
…jupyter/qtconsole.git external-deps/qtconsole

subrepo:
  subdir:   "external-deps/qtconsole"
  merged:   "cce3b656e"
upstream:
  origin:   "https://github.com/jupyter/qtconsole.git"
  branch:   "master"
  commit:   "cce3b656e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
@ccordoba12
Copy link
Member Author

Is there a way to ensure that git-subrepo updates the remote as well?

I don't know, but I guess it should be. Please consult the git-subrepo docs and update our Contributing guide if you find one.

@ccordoba12 ccordoba12 merged commit 29d54b8 into spyder-ide:5.x Oct 30, 2022
@ccordoba12 ccordoba12 deleted the issue-19888 branch October 30, 2022 03:45
ccordoba12 added a commit that referenced this pull request Oct 30, 2022
@ccordoba12
Merge from 5.x: PR #19947
c2dc1da 
Fixes #19888
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrclary mrclary mrclary approved these changes

Assignees

@ccordoba12 ccordoba12

Labels
None yet
Projects
None yet
Milestone
v5.4.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ccordoba12 @mrclary