Merge pull request #22370 from mrclary/issue-22353

PR: Limit sphinx version to `<7.4.0` to prevent bug with splash screen on Windows
spyder-ide · Aug 22, 2024 · 0193cf6 · 0193cf6
2 parents 30f977d + 22dc553
commit 0193cf6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -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

diff --git a/installers-conda/build_installers.py b/installers-conda/build_installers.py
@@ -144,7 +144,7 @@
     "python": f"={PY_VER}",
     "spyder": f"={SPYVER}",
     "cython": "",
-    "matplotlib": "",
+    "matplotlib-base": "",
     "numpy": "",
     "openpyxl": "",
     "pandas": "",

diff --git a/requirements/main.yml b/requirements/main.yml
@@ -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

diff --git a/setup.py b/setup.py
@@ -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',

diff --git a/spyder/dependencies.py b/spyder/dependencies.py
@@ -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'

diff --git a/spyder/plugins/help/confpage.py b/spyder/plugins/help/confpage.py
@@ -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:
@@ -70,4 +71,3 @@ def setup_page(self):
         vlayout.addWidget(sourcecode_group)
         vlayout.addStretch(1)
         self.setLayout(vlayout)
-