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: Update setup.py to accommodate the Conda-forge package split (Installation) #23141

Merged
merged 4 commits into from
Dec 13, 2024

Conversation

mrclary
Copy link
Contributor

@mrclary mrclary commented Dec 2, 2024

Description of Changes

conda-forge/spyder-feedstock#203 splits Spyder's conda package into two packages. This PR updates setup.py to accommodate this change when building Spyder conda packages for PRs.

This should only affect the installer workflow, so can be merged any time.

@mrclary mrclary self-assigned this Dec 2, 2024
@mrclary mrclary force-pushed the spyder-base branch 3 times, most recently from d195c4b to 690bc4b Compare December 6, 2024 04:52
@mrclary mrclary marked this pull request as ready for review December 6, 2024 07:25
@mrclary mrclary requested a review from ccordoba12 December 6, 2024 07:25
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.

A couple of small suggestions, the rest looks good to me @mrclary.

setup.py Outdated Show resolved Hide resolved
setup.py Outdated Show resolved Hide resolved
@mrclary mrclary added this to the v6.1.0 milestone Dec 6, 2024
@mrclary mrclary force-pushed the spyder-base branch 5 times, most recently from c53167a to 538b26d Compare December 6, 2024 21:03
@mrclary mrclary marked this pull request as draft December 7, 2024 15:45
@mrclary mrclary modified the milestones: v6.1.0, v6.0.4 Dec 9, 2024
@mrclary mrclary force-pushed the spyder-base branch 3 times, most recently from 5953a10 to f3e798f Compare December 10, 2024 04:24
'qtconsole>=5.6.1,<5.7.0',
],
'conda-forge': [
'qtconsole>=5.6.1,<5.7.0',
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be qtconsole-base instead of qtconsole, as you have it before?

Otherwise, qtconsole will bring pyqt5, won't it?

Copy link
Contributor Author

@mrclary mrclary Dec 12, 2024

Choose a reason for hiding this comment

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

So this is a bit nuanced.
When qtconsole-base is installed by conda, conda list shows qtconsole-base 5.6.1, but pip list shows qtconsole 5.6.1. If setup.py specifies qtconsole-base, pip --check fails with spyder 6.1.0a1.dev0 requires qtconsole-base, which is not installed.. See this pipline failure.

Specifying qtconsole in setup.py will only introduce pyqt5 if Spyder is built with SPYDER_QT_BINDING=conda-forge and the resulting package is installed using pip. I don't know how to install qtconsole-base and also have pip see it as such.

Copy link
Member

Choose a reason for hiding this comment

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

Understood, thanks for the clarification @mrclary! Let's leave things like this then.

@mrclary mrclary marked this pull request as ready for review December 12, 2024 20:48
The conda build test environment uses the requirements in meta.yaml and pip check uses the METADATA in the egg-info populated by this setup.py. However, qtconsole-base shows up in the environment as qtconsole, so pip check doesn't think qtconsole-base is installed.
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.

Looks good to me now, thanks @mrclary!

@ccordoba12 ccordoba12 changed the title PR: Update CI local build of Spyder conda package to accommodate the package split PR: Update setup.py to accommodate the Conda-forge package split Dec 13, 2024
@ccordoba12 ccordoba12 changed the title PR: Update setup.py to accommodate the Conda-forge package split PR: Update setup.py to accommodate the Conda-forge package split (Installation) Dec 13, 2024
@ccordoba12 ccordoba12 merged commit 80f6954 into spyder-ide:master Dec 13, 2024
17 checks passed
@ccordoba12
Copy link
Member

@meeseeksdev please backport to 6.x

meeseeksmachine pushed a commit to meeseeksmachine/spyder that referenced this pull request Dec 13, 2024
…e Conda-forge package split (Installation)
ccordoba12 pushed a commit that referenced this pull request Dec 13, 2024
…e the Conda-forge package split (Installation)) (#23270)
@mrclary mrclary deleted the spyder-base branch December 14, 2024 03:03
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