Skip to content

Commit

Permalink
Limit sphinx version to <7.4.0. <=7.4.0 causes issue with Spyder's sp…
Browse files Browse the repository at this point in the history
…lash screen.
  • Loading branch information
mrclary committed Aug 22, 2024
1 parent ac00af1 commit 2c411df
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies:
- qtpy >=2.4.0
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- sphinx >=0.6.6,<7.4.0
- spyder-kernels >=3.0.0b9,<3.0.0b10
- superqt >=0.6.2,<1.0.0
- textdistance >=4.2.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies:
- qtpy >=2.4.0
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- sphinx >=0.6.6,<7.4.0
- spyder-kernels >=3.0.0b9,<3.0.0b10
- superqt >=0.6.2,<1.0.0
- textdistance >=4.2.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def run(self):
'qtpy>=2.4.0',
'rtree>=0.9.7',
'setuptools>=49.6.0',
'sphinx>=0.6.6',
'sphinx>=0.6.6,<7.4.0',
'spyder-kernels>=3.0.0b9,<3.0.0b10',
'superqt>=0.6.2,<1.0.0',
'textdistance>=4.2.0',
Expand Down
2 changes: 1 addition & 1 deletion spyder/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
QTPY_REQVER = '>=2.4.0'
RTREE_REQVER = '>=0.9.7'
SETUPTOOLS_REQVER = '>=49.6.0'
SPHINX_REQVER = '>=0.6.6'
SPHINX_REQVER = '>=0.6.6,<7.4.0'
SPYDER_KERNELS_REQVER = '>=3.0.0b9,<3.0.0b10'
SUPERQT_REQVER = '>=0.6.2,<1.0.0'
TEXTDISTANCE_REQVER = '>=4.2.0'
Expand Down
2 changes: 1 addition & 1 deletion spyder/plugins/help/confpage.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def setup_page(self):
features_group = QGroupBox(_("Additional features"))
math_box = self.create_checkbox(_("Render mathematical equations"),
'math')
# ??? Do we want to increase minimum sphinx requirement for Spyder?
req_sphinx = programs.is_module_installed('sphinx', '>=1.1')
math_box.setEnabled(req_sphinx)
if not req_sphinx:
Expand Down Expand Up @@ -70,4 +71,3 @@ def setup_page(self):
vlayout.addWidget(sourcecode_group)
vlayout.addStretch(1)
self.setLayout(vlayout)

0 comments on commit 2c411df

Please sign in to comment.