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: Sync subrepo with spyder-kernels#327 #16532

Merged
merged 1 commit into from
Oct 5, 2021
Merged

PR: Sync subrepo with spyder-kernels#327 #16532

merged 1 commit into from
Oct 5, 2021

Conversation

impact27
Copy link
Contributor

@impact27 impact27 commented Oct 3, 2021 •
edited by ccordoba12
Loading

Description of Changes

  • Wrote at least one-line docstrings (for any new functions)
  • Added unit test(s) covering the changes (if testable)
  • Included a screenshot or animation (if affecting the UI, see Licecap)

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:

@pep8speaks

This comment has been minimized.

Sign in to view
@impact27 impact27 changed the title git subrepo clone --branch=fix_timeit --force https://github.com/impa… PR: test spyder-kernels #327 Oct 3, 2021
@ccordoba12
Copy link
Member

@impact27, I think the failure in our tests should be fixed if you rebase your spyder-kernels PR and then reclone your branch here.

@ccordoba12 ccordoba12 changed the title PR: test spyder-kernels #327 PR: Sync subrepo with spyder-kernels#327 Oct 4, 2021
@ccordoba12 ccordoba12 added this to the v5.2.0 milestone Oct 4, 2021
@ccordoba12
Copy link
Member

ccordoba12 commented Oct 4, 2021 •
edited
Loading

Hey @impact27, please remove your last commit and resync our subrepo after the suggestions I made on PR spyder-ide/spyder-kernels#327.

My plan is to merge this PR to keep testing the changes in that one here.

@ccordoba12
Copy link
Member

Thanks @impact27! Now please resync our subrepo with its 2.x branch so I can merge this one.

git subrepo clone (merge) --branch=2.x --force https://github.com/spy…
8f87d63 
…der-ide/spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "ac40350c9"
upstream:
  origin:   "https://github.com/spyder-ide/spyder-kernels.git"
  branch:   "2.x"
  commit:   "ac40350c9"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"
ccordoba12
ccordoba12 approved these changes Oct 5, 2021
View reviewed changes
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 80ad2b6 into spyder-ide:5.x Oct 5, 2021
ccordoba12 added a commit that referenced this pull request Oct 5, 2021
@ccordoba12
Merge from 5.x: PR #16532
7f18231
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ccordoba12 ccordoba12 ccordoba12 approved these changes

Assignees

@impact27 impact27

Labels
None yet
Projects
None yet
Milestone
v5.2.0
Development

Successfully merging this pull request may close these issues.
3 participants
@impact27 @pep8speaks @ccordoba12