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

fix getting signatures in jedi 0.17 #12255

Merged
merged 2 commits into from Apr 22, 2020
Merged

Conversation

Carreau
Copy link
Member

@Carreau Carreau commented Apr 21, 2020

No description provided.

@Carreau
Copy link
Member Author

Carreau commented Apr 21, 2020

@davidhalter does that looks reasonable to you ? Or is there a cleaner way ?

@Carreau Carreau added this to the 7.14 milestone Apr 21, 2020
@davidhalter
Copy link

Looks reasonable, but I would handle the case of get_signatures() == [] as well. This makes it easier in the future, so you don't have to depend on type (which was a bad idea in the first place - my fault).

@Carreau
Copy link
Member Author

Carreau commented Apr 21, 2020

Thanks ! Hope all is well for you.

@@ -9,7 +9,7 @@
Syntax like magics.

Latex and Unicode completion
============================
====================:========

Choose a reason for hiding this comment

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

Probably not intentional :)

Otherwise, LGTM.

Copy link
Member Author

Choose a reason for hiding this comment

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

Doh.. force-pushed.

@Carreau Carreau merged commit 48b4dd0 into ipython:master Apr 22, 2020
@lumberbot-app
Copy link
Contributor

lumberbot-app bot commented Apr 22, 2020

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 7.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 48b4dd063a1c58a8af28953392a285063cfdb7ce
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #12255: fix getting signatures in jedi 0.17'
  1. Push to a named branch :
git push YOURFORK 7.x:auto-backport-of-pr-12255-on-7.x
  1. Create a PR against branch 7.x, I would have named this PR:

"Backport PR #12255 on branch 7.x"

And apply the correct labels and milestones.

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

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

@lumberbot-app lumberbot-app bot added the Still Needs Manual Backport Added My MrMeeseeks when a backport fails. Help by backporting it, solving conflicts, send PR. label Apr 22, 2020
@Carreau Carreau removed the Still Needs Manual Backport Added My MrMeeseeks when a backport fails. Help by backporting it, solving conflicts, send PR. label Apr 22, 2020
@Carreau
Copy link
Member Author

Carreau commented Apr 22, 2020

actually no need to backport, 7.x still use completions() and not complete()

@Carreau Carreau modified the milestones: 7.14, 8.0 Apr 22, 2020
Carreau added a commit to Carreau/ipython that referenced this pull request Feb 1, 2021
@Carreau Carreau deleted the fix-jedi-017 branch December 9, 2021 00:51
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.

None yet

2 participants