Skip to content

PR: Add support for Jedi 0.20#26186

Merged
ccordoba12 merged 5 commits into
spyder-ide:masterfrom
ccordoba12:support-jedi-0.20
Jul 20, 2026
Merged

PR: Add support for Jedi 0.20#26186
ccordoba12 merged 5 commits into
spyder-ide:masterfrom
ccordoba12:support-jedi-0.20

Conversation

@ccordoba12

@ccordoba12 ccordoba12 commented Jul 19, 2026

Copy link
Copy Markdown
Member

Description of Changes

Issue(s) Resolved

Fixes #26033.

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

…rver.git --branch=support-jedi-0.20 --update --force external-deps/python-lsp-server

subrepo:
  subdir:   "external-deps/python-lsp-server"
  merged:   "78e291530f"
upstream:
  origin:   "https://github.com/ccordoba12/python-lsp-server.git"
  branch:   "support-jedi-0.20"
  commit:   "78e291530f"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "ea10886"
We were using an older version before and without this pin neither conda
nor pip install that version (don't know why).
@ccordoba12 ccordoba12 changed the title PR: Add support for Jedi 0.20 (Completions) PR: Add support for Jedi 0.20 Jul 20, 2026
…rver.git --branch=develop --update --force external-deps/python-lsp-server

subrepo:
  subdir:   "external-deps/python-lsp-server"
  merged:   "40e66dba5f"
upstream:
  origin:   "https://github.com/python-lsp/python-lsp-server.git"
  branch:   "develop"
  commit:   "40e66dba5f"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "ea10886"
@ccordoba12
ccordoba12 merged commit 3d47e37 into spyder-ide:master Jul 20, 2026
34 checks passed
@ccordoba12
ccordoba12 deleted the support-jedi-0.20 branch July 20, 2026 15:59
@ccordoba12

Copy link
Copy Markdown
Member Author

@meeseeksdev please backport to 6.x

@lumberbot-app

lumberbot-app Bot commented Jul 20, 2026

Copy link
Copy Markdown

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 3d47e37edbd17f28af92c31d78957fe8e61596cb
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #26186: PR: Add support for Jedi 0.20'
  1. Push to a named branch:
git push YOURFORK 6.x:auto-backport-of-pr-26186-on-6.x
  1. Create a PR against branch 6.x, I would have named this PR:

"Backport PR #26186 on branch 6.x (PR: Add support for Jedi 0.20)"

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.

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.

Support Jedi 0.20.0

1 participant