Increase minimal required version of python-lsp-black to 2.0

That version allows to format code for indented selections.

.github/scripts/install.sh

@@ -26,9 +26,6 @@ if [ "$USE_CONDA" = "true" ]; then
     # Remove pylsp before installing its subrepo below
     micromamba remove --force python-lsp-server python-lsp-server-base -y
 
-    # Prevent error in a test for the %edit magic
-    micromamba install ipykernel=6.26.0 -q -y
-
 else
     # Update pip and setuptools
     python -m pip install -U pip setuptools wheel build
@@ -49,14 +46,8 @@ else
         # This allows the test suite to run more reliably on Linux
         pip uninstall pyqt5 pyqt5-qt5 pyqt5-sip pyqtwebengine pyqtwebengine-qt5 -q -y
         pip install pyqt5==5.12.* pyqtwebengine==5.12.*
-
-        # QDarkstyle 3.2.1 doesn't work with PyQt 5.12
-        pip install qdarkstyle==3.2
     fi
 
-    # Prevent error in a test for the %edit magic
-    pip install ipykernel==6.26.0
-
 fi
 
 # Install subrepos from source

.github/workflows/installer-macos.yml

@@ -88,6 +88,8 @@ jobs:
           fi
           ${pythonLocation}/bin/python -m pip install -U pip setuptools wheel
           ${pythonLocation}/bin/python -m pip install -r req-build.txt -r req-extras.txt -r req-plugins.txt "${INSTALL_FLAGS[@]}" -e ${GITHUB_WORKSPACE}
+      - name: Add mising file to Black dist-info
+        run: touch ${pythonLocation}/lib/python3.9/site-packages/black-23.12.0.dist-info/top_level.txt
       - name: Install Subrepos
         if: ${{github.event_name == 'pull_request'}}
         run: ${pythonLocation}/bin/python -bb -X dev -W error ${GITHUB_WORKSPACE}/install_dev_repos.py --not-editable --no-install spyder
@@ -102,6 +104,8 @@ jobs:
           install_name_tool -change @rpath/libc++.1.dylib /usr/lib/libc++.1.dylib bin/micromamba
       - name: Build Application Bundle
         run: ${pythonLocation}/bin/python setup.py ${LITE_FLAG} --dist-dir ${DISTDIR}
+      - name: Add missing Black module to bundle
+        run: cp -v ${pythonLocation}/lib/python3.9/site-packages/629853fdff261ed89b74__mypyc* ${DISTDIR}/Spyder.app/Contents/Resources/lib/python3.9/
       - name: Create Keychain
         if: ${{env.IS_RELEASE == 'true' || env.IS_PRE == 'true'}}
         run: ./certkeychain.sh "${MACOS_CERTIFICATE}" "${MACOS_CERTIFICATE_PWD}"

binder/environment.yml

@@ -30,7 +30,7 @@ dependencies:
 - pyls-spyder >=0.4.0
 - pyqt >=5.10,<5.16
 - pyqtwebengine >=5.10,<5.16
-- python-lsp-black >=1.2.0,<3.0.0
+- python-lsp-black >=2.0.0,<3.0.0
 - python-lsp-server >=1.9.0,<1.10.0
 - pyxdg >=0.26
 - pyzmq >=22.1.0

installers/macOS/packages.py

@@ -43,6 +43,7 @@
 
 # Packages that cannot be in the zip folder
 PACKAGES = [
+    'blackd',
     'keyring',
     'pkg_resources',
     'pygments',

installers/macOS/req-build.txt

@@ -2,4 +2,4 @@
 dmgbuild>=1.4.2
 py2app==0.28.4
 sphinx==5.1.1  # See spyder-ide/spyder#19618 for details.
-black==22.8.0  # See spyder-ide/spyder#19743 for details.
+black==23.12.0  # Pin it to add missing modules to the bundle. See workflow file for the details.

requirements/main.yml

@@ -28,7 +28,7 @@ dependencies:
   - pyls-spyder >=0.4.0
   - pyqt >=5.10,<5.16
   - pyqtwebengine >=5.10,<5.16
-  - python-lsp-black >=1.2.0,<3.0.0
+  - python-lsp-black >=2.0.0,<3.0.0
   - python-lsp-server >=1.9.0,<1.10.0
   - pyzmq >=22.1.0
   - qdarkstyle >=3.2.0,<3.3.0

setup.py

@@ -228,7 +228,7 @@ def run(self):
     'pygments>=2.0',
     'pylint>=2.5.0,<3.1',
     'pylint-venv>=3.0.2',
-    'python-lsp-black>=1.2.0,<3.0.0',
+    'python-lsp-black>=2.0.0,<3.0.0',
     'pyls-spyder>=0.4.0',
     'pyqt5>=5.10,<5.16',
     'pyqtwebengine>=5.10,<5.16',

spyder/dependencies.py

@@ -59,7 +59,7 @@
 PYLINT_REQVER = '>=2.5.0,<3.1'
 PYLINT_VENV_REQVER = '>=3.0.2'
 PYLSP_REQVER = '>=1.9.0,<1.10.0'
-PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0'
+PYLSP_BLACK_REQVER = '>=2.0.0,<3.0.0'
 PYLS_SPYDER_REQVER = '>=0.4.0'
 PYXDG_REQVER = '>=0.26'
 PYZMQ_REQVER = '>=22.1.0'