Merge from 5.x: PR #19978

Fixes #19893

.github/scripts/install.sh

@@ -38,9 +38,6 @@ if [ "$USE_CONDA" = "true" ]; then
     else
         mamba install 'numpy<1.23'
     fi
-
-    # Install docstring-to-markdown until we release PyLSP 1.6.0
-    mamba install docstring-to-markdown
 else
     # Update pip and setuptools
     python -m pip install -U pip setuptools wheel build
@@ -65,9 +62,6 @@ else
         pip uninstall pyqt5 pyqt5-qt5 pyqt5-sip pyqtwebengine pyqtwebengine-qt5 -q -y
         pip install pyqt5==5.12.* pyqtwebengine==5.12.*
     fi
-
-    # Install docstring-to-markdown until we release PyLSP 1.6.0
-    pip install docstring-to-markdown
 fi
 
 # Install subrepos from source

.github/workflows/test-files.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ['3.7', '3.9']
+        PYTHON_VERSION: ['3.9']
     timeout-minutes: 30
     steps:
       - name: Checkout Pull Requests

.github/workflows/test-linux.yml

@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         INSTALL_TYPE: ['pip', 'conda']
-        PYTHON_VERSION: ['3.7', '3.9']
+        PYTHON_VERSION: ['3.9']
         TEST_TYPE: ['fast', 'slow']
     timeout-minutes: 120
     steps:

RELEASE.md

@@ -111,7 +111,7 @@ To release a new version of Spyder you need to follow these steps:
   - `spyder/dependencies.py`
   - `requirements/{main,windows,macos,linux}.yml`
   - `binder/environment.yml`
-  - `spyder/plugins/ipythonconsole/widgets/__init__.py` (look up for the constants `SPYDER_KERNELS_MIN_VERSION` and `SPYDER_KERNELS_MAX_VERSION`)
+  - `spyder/plugins/ipythonconsole/__init__.py` (look up for the constants `SPYDER_KERNELS_MIN_VERSION` and `SPYDER_KERNELS_MAX_VERSION`)
 
 **Note**: Usually, the version of `spyder-kernels` for validation in the IPython Console only needs to be updated for minor or major releases of that package. For bugfix releases the value should remain the same to not hassle users using custom interpreters into updating `spyder-kernels` in their environments. However, this depends on the type of bugs resolved and if it's worthy to reinforce the need of an update even for those versions.
 

binder/environment.yml

@@ -31,18 +31,18 @@ dependencies:
 - pyqt <5.16
 - pyqtwebengine <5.16
 - python-lsp-black >=1.2.0
-- python-lsp-server >=1.5.0,<1.6.0
+- python-lsp-server >=1.6.0,<1.7.0
 - pyxdg >=0.26
 - pyzmq >=22.1.0
 - qdarkstyle >=3.0.2,<3.1.0
 - qstylizer >=0.2.2
 - qtawesome >=1.2.1
-- qtconsole >=5.3.2,<5.4.0
+- qtconsole >=5.4.0,<5.5.0
 - qtpy >=2.1.0
 - rtree >=0.9.7
 - setuptools >=49.6.0
 - sphinx >=0.6.6
-- spyder-kernels >=2.3.3,<2.4.0
+- spyder-kernels >=2.4.0,<2.5.0
 - textdistance >=4.2.0
 - three-merge >=0.1.1
 - watchdog >=0.10.3

installers-conda/build_conda_pkgs.py

@@ -34,6 +34,7 @@
 # Standard library imports
 import os
 import re
+import sys
 from argparse import ArgumentParser
 from configparser import ConfigParser
 from datetime import timedelta
@@ -61,6 +62,11 @@
 RESOURCES = HERE / "resources"
 EXTDEPS = HERE.parent / "external-deps"
 SPECS = DIST / "specs.yaml"
+REQUIREMENTS = HERE.parent / "requirements"
+REQ_MAIN = REQUIREMENTS / 'main.yml'
+REQ_WINDOWS = REQUIREMENTS / 'windows.yml'
+REQ_MAC = REQUIREMENTS / 'macos.yml'
+REQ_LINUX = REQUIREMENTS / 'linux.yml'
 
 DIST.mkdir(exist_ok=True)
 
@@ -156,7 +162,7 @@ def patch_meta(self):
         self.yaml = self._yaml.load(text)
 
         self.yaml['source'] = {'path': str(self.src_path)}
-
+        
         self.yaml.pop('test', None)
         if 'outputs' in self.yaml:
             for out in self.yaml['outputs']:
@@ -166,6 +172,9 @@ def patch_meta(self):
 
         self._yaml.dump_all([self.yaml], file)
 
+        self.logger.info("Patched 'meta.yaml'...")
+        self.logger.info(file.read_text())
+
         self._patched_meta = True
 
     def _patch_build(self):
@@ -210,11 +219,30 @@ class SpyderCondaPkg(BuildCondaPkg):
     src_path = HERE.parent
     feedstock = "https://github.com/conda-forge/spyder-feedstock"
     shallow_ver = "v5.3.2"
-
+    _yaml_yml = YAML()
+
     def _patch_meta(self):
         self.yaml['build'].pop('osx_is_app', None)
         self.yaml.pop('app', None)
 
+        current_requirements = ['python']
+        current_requirements += self._yaml_yml.load(
+            REQ_MAIN.read_text())['dependencies']
+        if os.name == 'nt':
+            win_requirements =  self._yaml_yml.load(
+                REQ_WINDOWS.read_text())['dependencies']
+            current_requirements += win_requirements
+            current_requirements.append('ptyprocess >=0.5')
+        elif sys.platform == 'darwin':
+            mac_requirements =  self._yaml_yml.load(
+                REQ_MAC.read_text())['dependencies']
+            current_requirements += mac_requirements
+        else:
+            linux_requirements = self._yaml_yml.load(
+                REQ_LINUX.read_text())['dependencies']
+            current_requirements += linux_requirements
+        self.yaml['requirements']['run'] = current_requirements
+
         patches = self.yaml['source'].get('patches', [])
         patches.append(str(RESOURCES / "installers-conda.patch"))
         self.yaml['source']['patches'] = patches

installers/macOS/req-extras.txt

@@ -1,6 +1,5 @@
 # Spyder extra packages
 autopep8
-docstring-to-markdown
 flake8
 Paramiko
 pycodestyle

requirements/main.yml

@@ -29,17 +29,17 @@ dependencies:
   - pyqt <5.16
   - pyqtwebengine <5.16
   - python-lsp-black >=1.2.0
-  - python-lsp-server >=1.5.0,<1.6.0
+  - python-lsp-server >=1.6.0,<1.7.0
   - pyzmq >=22.1.0
   - qdarkstyle >=3.0.2,<3.1.0
   - qstylizer >=0.2.2
   - qtawesome >=1.2.1
-  - qtconsole >=5.3.2,<5.4.0
+  - qtconsole >=5.4.0,<5.5.0
   - qtpy >=2.1.0
   - rtree >=0.9.7
   - setuptools >=49.6.0
   - sphinx >=0.6.6
-  - spyder-kernels >=2.3.3,<2.4.0
+  - spyder-kernels >=2.4.0,<2.5.0
   - textdistance >=4.2.0
   - three-merge >=0.1.1
   - watchdog >=0.10.3