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: Configure spyder-remote-services as an external dependency for the remote client tests #22692

Merged

Conversation

hlouzada
Copy link
Contributor

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)

Added spyder-remote-services to external-deps so it can be used to run the server tests from withing remoteclient tests.

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: @hlouzada

…external-deps/spyder-remote-services

subrepo:
  subdir:   "external-deps/spyder-remote-services"
  merged:   "8eb6fb334"
upstream:
  origin:   "https://github.com/spyder-ide/spyder-remote-services"
  branch:   "main"
  commit:   "8eb6fb334"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "cce3d93"
subrepo:
  subdir:   "external-deps/spyder-remote-services"
  merged:   "d425e769d"
upstream:
  origin:   "https://github.com/spyder-ide/spyder-remote-services"
  branch:   "main"
  commit:   "d425e769d"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "cce3d93"
@pep8speaks

This comment was marked as off-topic.

@hlouzada hlouzada changed the title Add spyder remote services subrepo PR: Configure spyder-remote-services external dep for the remoteclient tests Oct 18, 2024
@ccordoba12 ccordoba12 added this to the v6.0.2 milestone Oct 19, 2024
@ccordoba12 ccordoba12 changed the title PR: Configure spyder-remote-services external dep for the remoteclient tests PR: Configure spyder-remote-services external dep for the remote client tests Oct 19, 2024
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 @hlouzada for your work on this!

@ccordoba12 ccordoba12 changed the title PR: Configure spyder-remote-services external dep for the remote client tests PR: Configure spyder-remote-services as an external dependency for the remote client tests Oct 19, 2024
@ccordoba12 ccordoba12 merged commit 275814c into spyder-ide:master Oct 19, 2024
17 checks passed
@ccordoba12
Copy link
Member

@meeseeksdev please backport to 6.x

Copy link

lumberbot-app bot commented Oct 19, 2024

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 6.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 275814c137dbaa0f4952796f8d16e5b5482294cb
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #22692: PR: Configure `spyder-remote-services` as an external dependency for the remote client tests'
  1. Push to a named branch:
git push YOURFORK 6.x:auto-backport-of-pr-22692-on-6.x
  1. Create a PR against branch 6.x, I would have named this PR:

"Backport PR #22692 on branch 6.x (PR: Configure spyder-remote-services as an external dependency for the remote client tests)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

ccordoba12 added a commit to ccordoba12/spyder that referenced this pull request Oct 19, 2024
…as an external dependency for the remote client tests
ccordoba12 added a commit that referenced this pull request Oct 19, 2024
…s as an external dependency for the remote client tests) (#22695)
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