Merge pull request #20277 from dalthviz/update-core-deps-541

dalthviz · web-flow · commit 8696c7fdc98f · 2022-12-29T18:34:38.000-05:00
PR: Update core dependencies for 5.4.1
diff --git a/.github/workflows/test-files.yml b/.github/workflows/test-files.yml
@@ -80,11 +80,11 @@ jobs:
       - name: Cache conda
         uses: actions/cache@v2
         env:
-          # Increase this value to reset cache if requirements/*.txt has not changed
+          # Increase this value to reset cache if requirements/*.yml has not changed
           CACHE_NUMBER: 0
         with:
           path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-cacheconda-installconda-${{ matrix.PYTHON_VERSION }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements/*.txt') }}
+          key: ${{ runner.os }}-cacheconda-installconda-${{ matrix.PYTHON_VERSION }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements/*.yml') }}
       - name: Cache pip
         if: env.RUN_BUILD == 'true'
         uses: actions/cache@v2
@@ -99,7 +99,6 @@ jobs:
            auto-update-conda: false
            auto-activate-base: false
            python-version: ${{ matrix.PYTHON_VERSION }}
-           use-only-tar-bz2: true
            channels: conda-forge,defaults
            channel-priority: strict
            miniforge-variant: Mambaforge
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -89,7 +89,7 @@ jobs:
           CACHE_NUMBER: 0
         with:
           path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-cacheconda-install${{ matrix.INSTALL_TYPE }}-${{ matrix.PYTHON_VERSION }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements/*.txt') }}
+          key: ${{ runner.os }}-cacheconda-install${{ matrix.INSTALL_TYPE }}-${{ matrix.PYTHON_VERSION }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements/*.yml') }}
       - name: Cache pip
         if: env.RUN_BUILD == 'true'
         uses: actions/cache@v2
@@ -104,7 +104,6 @@ jobs:
           auto-update-conda: false
           auto-activate-base: false
           python-version: ${{ matrix.PYTHON_VERSION }}
-          use-only-tar-bz2: true
           channels: conda-forge,defaults
           channel-priority: strict
           miniforge-variant: Mambaforge
diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml
@@ -82,7 +82,7 @@ jobs:
           CACHE_NUMBER: 0
         with:
           path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-cacheconda-install${{ matrix.INSTALL_TYPE }}-${{ matrix.PYTHON_VERSION }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements/*.txt') }}
+          key: ${{ runner.os }}-cacheconda-install${{ matrix.INSTALL_TYPE }}-${{ matrix.PYTHON_VERSION }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements/*.yml') }}
       - name: Cache pip
         if: env.RUN_BUILD == 'true'
         uses: actions/cache@v2
@@ -97,7 +97,6 @@ jobs:
           auto-update-conda: false
           auto-activate-base: false
           python-version: ${{ matrix.PYTHON_VERSION }}
-          use-only-tar-bz2: true
           channels: conda-forge,defaults
           channel-priority: strict
           miniforge-variant: Mambaforge
diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
@@ -82,7 +82,7 @@ jobs:
           CACHE_NUMBER: 0
         with:
           path: ~/conda_pkgs_dir
-          key: ${{ runner.os }}-cacheconda-install${{ matrix.INSTALL_TYPE }}-${{ matrix.PYTHON_VERSION }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements/*.txt') }}
+          key: ${{ runner.os }}-cacheconda-install${{ matrix.INSTALL_TYPE }}-${{ matrix.PYTHON_VERSION }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('requirements/*.yml') }}
       - name: Cache pip
         if: env.RUN_BUILD == 'true'
         uses: actions/cache@v2
@@ -97,7 +97,6 @@ jobs:
           auto-update-conda: false
           auto-activate-base: false
           python-version: ${{ matrix.PYTHON_VERSION }}
-          use-only-tar-bz2: true
           channels: conda-forge,defaults
           channel-priority: strict
           miniforge-variant: Mambaforge
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -31,7 +31,7 @@ dependencies:
 - pyqt <5.16
 - pyqtwebengine <5.16
 - python-lsp-black >=1.2.0
-- python-lsp-server >=1.6.0,<1.7.0
+- python-lsp-server >=1.7.0,<1.8.0
 - pyxdg >=0.26
 - pyzmq >=22.1.0
 - qdarkstyle >=3.0.2,<3.1.0
@@ -42,7 +42,7 @@ dependencies:
 - rtree >=0.9.7
 - setuptools >=49.6.0
 - sphinx >=0.6.6
-- spyder-kernels >=2.4.0,<2.5.0
+- spyder-kernels >=2.4.1,<2.5.0
 - textdistance >=4.2.0
 - three-merge >=0.1.1
 - watchdog >=0.10.3
diff --git a/external-deps/python-lsp-server/.gitrepo b/external-deps/python-lsp-server/.gitrepo
diff --git a/external-deps/python-lsp-server/CHANGELOG.md b/external-deps/python-lsp-server/CHANGELOG.md
diff --git a/installers/Windows/req-extras-pull-request.txt b/installers/Windows/req-extras-pull-request.txt
@@ -10,7 +10,7 @@ rope
 yapf
 
 # Scientific packages (for Same as Spyder)
-numpy<1.23
+numpy
 scipy
 pandas
 openpyxl  # pandas optional dependency to handle Excel files
diff --git a/installers/Windows/req-extras-release.txt b/installers/Windows/req-extras-release.txt
@@ -10,7 +10,7 @@ rope
 yapf
 
 # Scientific packages (for Same as Spyder)
-numpy<1.23
+numpy
 scipy
 pandas
 openpyxl  # pandas optional dependency to handle Excel files
diff --git a/requirements/main.yml b/requirements/main.yml
@@ -29,7 +29,7 @@ dependencies:
   - pyqt <5.16
   - pyqtwebengine <5.16
   - python-lsp-black >=1.2.0
-  - python-lsp-server >=1.6.0,<1.7.0
+  - python-lsp-server >=1.7.0,<1.8.0
   - pyzmq >=22.1.0
   - qdarkstyle >=3.0.2,<3.1.0
   - qstylizer >=0.2.2
@@ -39,7 +39,7 @@ dependencies:
   - rtree >=0.9.7
   - setuptools >=49.6.0
   - sphinx >=0.6.6
-  - spyder-kernels >=2.4.0,<2.5.0
+  - spyder-kernels >=2.4.1,<2.5.0
   - textdistance >=4.2.0
   - three-merge >=0.1.1
   - watchdog >=0.10.3
diff --git a/setup.py b/setup.py
@@ -229,7 +229,7 @@ def run(self):
     'pyls-spyder>=0.4.0',
     'pyqt5<5.16',
     'pyqtwebengine<5.16',
-    'python-lsp-server[all]>=1.6.0,<1.7.0',
+    'python-lsp-server[all]>=1.7.0,<1.8.0',
     'pyxdg>=0.26;platform_system=="Linux"',
     'pyzmq>=22.1.0',
     'qdarkstyle>=3.0.2,<3.1.0',
@@ -240,7 +240,7 @@ def run(self):
     'rtree>=0.9.7',
     'setuptools>=49.6.0',
     'sphinx>=0.6.6',
-    'spyder-kernels>=2.4.0,<2.5.0',
+    'spyder-kernels>=2.4.1,<2.5.0',
     'textdistance>=4.2.0',
     'three-merge>=0.1.1',
     'watchdog>=0.10.3'
@@ -251,9 +251,9 @@ def run(self):
     reqs_to_loosen = {'python-lsp-server[all]', 'qtconsole', 'spyder-kernels'}
     install_requires = [req for req in install_requires
                         if req.split(">")[0] not in reqs_to_loosen]
-    install_requires.append('python-lsp-server[all]>=1.6.0,<1.8.0')
+    install_requires.append('python-lsp-server[all]>=1.7.0,<1.9.0')
     install_requires.append('qtconsole>=5.4.0,<5.6.0')
-    install_requires.append('spyder-kernels>=2.4.0,<2.6.0')
+    install_requires.append('spyder-kernels>=2.4.1,<2.6.0')
 
 extras_require = {
     'test:platform_system == "Windows"': ['pywin32'],
diff --git a/spyder/dependencies.py b/spyder/dependencies.py
@@ -53,7 +53,7 @@
 PYGMENTS_REQVER = '>=2.0'
 PYLINT_REQVER = '>=2.5.0;<3.0'
 PYLINT_VENV_REQVER = '>=2.1.1'
-PYLSP_REQVER = '>=1.6.0;<1.7.0'
+PYLSP_REQVER = '>=1.7.0;<1.8.0'
 PYLSP_BLACK_REQVER = '>=1.2.0'
 PYLS_SPYDER_REQVER = '>=0.4.0'
 PYXDG_REQVER = '>=0.26'
@@ -66,7 +66,7 @@
 RTREE_REQVER = '>=0.9.7'
 SETUPTOOLS_REQVER = '>=49.6.0'
 SPHINX_REQVER = '>=0.6.6'
-SPYDER_KERNELS_REQVER = '>=2.4.0;<2.5.0'
+SPYDER_KERNELS_REQVER = '>=2.4.1;<2.5.0'
 TEXTDISTANCE_REQVER = '>=4.2.0'
 THREE_MERGE_REQVER = '>=0.1.1'
 # None for pynsist install for now
