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: Fix error when plugins required for tabification are unavailable (Layout) #22199

Merged
merged 2 commits into from
Jul 9, 2024

Conversation

hmaarrfk
Copy link
Contributor

in developing #22196 I found that this was a useful backport

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:

Mark Harfouche - hmaarrfk

@hmaarrfk hmaarrfk marked this pull request as ready for review June 22, 2024 17:08
@ccordoba12 ccordoba12 changed the base branch from master to 5.x June 24, 2024 15:14
@ccordoba12 ccordoba12 changed the title Layout: Fix error when plugins required for tabification are unavailable PR: Fix error when plugins required for tabification are unavailable (Layout) Jul 8, 2024
@ccordoba12 ccordoba12 added this to the v5.5.6 milestone Jul 8, 2024
@ccordoba12
Copy link
Member

This is the right fix but there's one additional problem: Help is listed as the plugin to which many other plugins need to tabified next to. For instance:

class Pylint(SpyderDockablePlugin):
NAME = "pylint"
WIDGET_CLASS = PylintWidget
CONF_SECTION = NAME
CONF_WIDGET_CLASS = PylintConfigPage
REQUIRES = [Plugins.Preferences, Plugins.Editor]
OPTIONAL = [Plugins.MainMenu, Plugins.Projects]
TABIFY = [Plugins.Help]

So, please look for all those instances and add Plugins.VariableExplorer to that list. And if it's not a list, please make it one.

Finally, after doing that please rebase on top of the latest 5.x to get the fixes to our tests.

@hmaarrfk
Copy link
Contributor Author

hmaarrfk commented Jul 9, 2024

Finally, after doing that please rebase on top of the latest 5.x to get the fixes to our tests.

Sorry about that i thought i rebased earlier today, but maybe my branch didn't pull in correctly.

@hmaarrfk
Copy link
Contributor Author

hmaarrfk commented Jul 9, 2024

PS. i feel like i am updated on the 5.x branch
image

@hmaarrfk hmaarrfk force-pushed the 5.x_backport_of_layout_fixes branch from 1c4ae66 to 429a07f Compare July 9, 2024 00:27
@hmaarrfk
Copy link
Contributor Author

hmaarrfk commented Jul 9, 2024

I pulled in #22237 to let the tests run successfully

@ccordoba12
Copy link
Member

I pulled in #22237 to let the tests run successfully

Sorry, I forgot we didn't apply the Numpy 2.0 fix to this branch.

@hmaarrfk hmaarrfk force-pushed the 5.x_backport_of_layout_fixes branch from d03d09e to d24f8f8 Compare July 9, 2024 01:52
@hmaarrfk
Copy link
Contributor Author

hmaarrfk commented Jul 9, 2024

3 distinct commits.

Let me know if you need other things on this branch.

@ccordoba12
Copy link
Member

ccordoba12 commented Jul 9, 2024

Let me know if you need other things on this branch.

Please rebase on top of the latest 5.x to remove from here the commit in PR #22237.

@hmaarrfk hmaarrfk force-pushed the 5.x_backport_of_layout_fixes branch from d24f8f8 to 1f9f1c6 Compare July 9, 2024 03:53
@hmaarrfk
Copy link
Contributor Author

hmaarrfk commented Jul 9, 2024

done.

@hmaarrfk
Copy link
Contributor Author

hmaarrfk commented Jul 9, 2024

and fyi, forward port here: #22238

@ccordoba12
Copy link
Member

and fyi, forward port here: #22238

Thanks, but the PRs against 5.x are merged to master as well. So, your extra PR wasn't really necessary (sorry if I wasn't clear enough about that).

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 @hmaarrfk!

@ccordoba12 ccordoba12 merged commit c295479 into spyder-ide:5.x Jul 9, 2024
23 checks passed
ccordoba12 added a commit that referenced this pull request Jul 9, 2024
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.

2 participants