Skip to content

Commit

Permalink
Use qtconsole rather than qtconsole-base.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mrclary committed Dec 11, 2024
1 parent 139d0ce commit f444f46
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def run(self):
'qtconsole>=5.6.1,<5.7.0',
],
'conda-forge': [
'qtconsole-base>=5.6.1,<5.7.0',
'qtconsole>=5.6.1,<5.7.0',
]
}

Expand Down Expand Up @@ -325,10 +325,7 @@ def run(self):
if req.split(">")[0] not in reqs_to_loosen]

install_requires.append('python-lsp-server[all]>=1.12.0,<1.14.0')
base = ''
if os.getenv('SPYDER_QT_BINDING', 'pyqt5').lower() == 'conda-forge':
base = '-base'
install_requires.append(f'qtconsole{base}>=5.5.1,<5.7.0')
install_requires.append('qtconsole>=5.5.1,<5.7.0')

extras_require = {
'test:platform_system == "Windows"': ['pywin32'],
Expand Down

0 comments on commit f444f46

Please sign in to comment.