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.

Sign up for GitHub

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

Jump to bottom

PR: Limit sphinx version to <7.4.0 to prevent bug with splash screen on Windows #22370

Merged
merged 2 commits into from
Aug 22, 2024
Merged

PR: Limit sphinx version to <7.4.0 to prevent bug with splash screen on Windows #22370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
349b02d
Limit sphinx version to <7.4.0. <=7.4.0 causes issue with Spyder's sp…
mrclary Aug 22, 2024
22dc553
Change runtime matplotlib requirement to matplotlib-base in order to …
mrclary Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion binder/environment.yml
View file
Open in desktop
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 installers-conda/build_installers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"python": f"={PY_VER}",
"spyder": f"={SPYVER}",
"cython": "",
"matplotlib": "",
"matplotlib-base": "",
"numpy": "",
"openpyxl": "",
"pandas": "",
Expand Down
2 changes: 1 addition & 1 deletion requirements/main.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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?
Copy link
Member

Choose a reason for hiding this comment

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

Yeah, this is a good idea. Perhaps increasing it to Sphinx 4 or 5 would be better, but I don't know enough about it to take an informed decision.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know enough either. It may be best to leave the lower limit where it currently is, at least for now.

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)