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: Sync spyder-kernels subrepo with the 2.x branch #15125

Merged
merged 1 commit into from
Apr 5, 2021

Conversation

ccordoba12
Copy link
Member

Description of Changes

  • This syncs our 5.x branch with the new 2.x branch in spyder-kernels.
  • This is also necessary to avoid showing our Dependencies dialog when running Spyder from bootstrap.py.

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

…spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "126c46c79"
upstream:
  origin:   "https://github.com/spyder-ide/spyder-kernels.git"
  branch:   "2.x"
  commit:   "126c46c79"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
@ccordoba12 ccordoba12 added this to the v5.0.1 milestone Apr 5, 2021
@ccordoba12 ccordoba12 self-assigned this Apr 5, 2021
@ccordoba12 ccordoba12 changed the title PR: Sync spyder-kernels subrepo with 2.x branch PR: Sync spyder-kernels subrepo with the 2.x branch Apr 5, 2021
@ccordoba12 ccordoba12 merged commit 533370b into spyder-ide:5.x Apr 5, 2021
@ccordoba12 ccordoba12 deleted the sync-subrepo branch April 5, 2021 23:28
ccordoba12 added a commit that referenced this pull request Apr 5, 2021
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.

1 participant