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: Group kernel config calls (IPython console) #21320

Merged
merged 68 commits into from
Nov 16, 2023

Conversation

impact27
Copy link
Contributor

@impact27 impact27 commented Sep 9, 2023

Description of Changes

Issue(s) Resolved

Fixes #

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:

@impact27 impact27 changed the title Group config calls PR: Group config calls Sep 9, 2023
@ccordoba12 ccordoba12 changed the title PR: Group config calls PR: Group kernel config calls (IPython console) Nov 12, 2023
@impact27
Copy link
Contributor Author

@ccordoba12 there is something wrong with qdarkstyle 3.2.1, I had to fix to 3.2.0.
There is also a failure in test_environment_client but I think this Is because of the incompatible Spyder-kernels version installed in the coda environment (get_list_conda_envs()['conda: spytest-ž'][0])

Copy link
Member

@ccordoba12 ccordoba12 left a comment

Choose a reason for hiding this comment

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

Thanks @impact27!

binder/environment.yml Outdated Show resolved Hide resolved
requirements/main.yml Outdated Show resolved Hide resolved
setup.py Outdated Show resolved Hide resolved
spyder/dependencies.py Outdated Show resolved Hide resolved
spyder/plugins/ipythonconsole/confpage.py Outdated Show resolved Hide resolved
spyder/plugins/ipythonconsole/widgets/shell.py Outdated Show resolved Hide resolved
spyder/plugins/ipythonconsole/widgets/shell.py Outdated Show resolved Hide resolved
spyder/plugins/ipythonconsole/widgets/status.py Outdated Show resolved Hide resolved
spyder/plugins/ipythonconsole/widgets/status.py Outdated Show resolved Hide resolved
spyder/utils/programs.py Outdated Show resolved Hide resolved
@ccordoba12
Copy link
Member

@ccordoba12 there is something wrong with qdarkstyle 3.2.1, I had to fix to 3.2.0.

Fixed in PR #21517.

There is also a failure in test_environment_client but I think this Is because of the incompatible Spyder-kernels version installed in the coda environment.

For that please change these lines in our install.sh script to point to your branch in Spyder-kernels:

# `conda run` fails on Windows without a clear reason
if [ "$OS" = "win" ]; then
/c/Miniconda/envs/spytest-ž/python -m pip install git+https://github.com/spyder-ide/spyder-kernels.git@master
else
conda run -n spytest-ž python -m pip install git+https://github.com/spyder-ide/spyder-kernels.git@master
fi

Then you'll need to revert that change when this is ready to be merged.

Quentin Peter and others added 15 commits November 12, 2023 17:11
This reverts commit 4512721.
…com/impact27/spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "0a07259c3"
upstream:
  origin:   "https://github.com/impact27/spyder-kernels.git"
  branch:   "group_config_calls"
  commit:   "0a07259c3"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"
Co-authored-by: Carlos Cordoba <ccordoba12@gmail.com>
…com/impact27/spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "c7f38bbe7"
upstream:
  origin:   "https://github.com/impact27/spyder-kernels.git"
  branch:   "group_config_calls"
  commit:   "c7f38bbe7"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"
…com/impact27/spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "8297ac0d6"
upstream:
  origin:   "https://github.com/impact27/spyder-kernels.git"
  branch:   "group_config_calls"
  commit:   "8297ac0d6"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"
…com/impact27/spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "b7d8bdc91"
upstream:
  origin:   "https://github.com/impact27/spyder-kernels.git"
  branch:   "group_config_calls"
  commit:   "b7d8bdc91"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"
@ccordoba12
Copy link
Member

ccordoba12 commented Nov 14, 2023

@impact27, I pushed a commit with a similar fix to my suggestion above to see if it fixes test_environment_client.

In any case, I think it's the right thing to do for that test, so please don't remove it if it doesn't work at the end.

@ccordoba12
Copy link
Member

ccordoba12 commented Nov 15, 2023

@impact27, I think this one is ready, unless you think there are more things to address before merging.

But I'll try it manually to see if I can spot problems missed by our tests.

Quentin Peter added 2 commits November 15, 2023 07:38
…com/impact27/spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "3a6be2d02"
upstream:
  origin:   "https://github.com/impact27/spyder-kernels.git"
  branch:   "group_config_calls"
  commit:   "3a6be2d02"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"
@impact27
Copy link
Contributor Author

@impact27, I think this one is ready, unless you think there are more things to address before merging.

But I'll try it manually to see if I can spot problems missed by our tests.

I think this is ready

…r-kernels.git --branch=master --update --force external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "d28282944b"
upstream:
  origin:   "https://github.com/spyder-ide/spyder-kernels.git"
  branch:   "master"
  commit:   "d28282944b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
@ccordoba12
Copy link
Member

ccordoba12 commented Nov 15, 2023

Great! I merged your Spyder-kernels PR and resynced our subrepo here, so as soon as our tests pass I'll merge.

I also tested a couple of things manually (errors with special consoles and changing interactive backends) and everything seems to be working as expected. Great work!

Copy link
Member

@ccordoba12 ccordoba12 left a comment

Choose a reason for hiding this comment

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

Thanks @impact27!

@ccordoba12 ccordoba12 merged commit 193a59f into spyder-ide:master Nov 16, 2023
14 checks passed
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.

3 participants