Merge branch 'master' into feat-remoteclient-tests

.github/workflows/installers-conda.yml

@@ -210,11 +210,12 @@ jobs:
 
       - name: Env Variables
         run: |
-          NSIS_USING_LOG_BUILD=1
-          [[ "$IS_RELEASE" == "true" || "$IS_PRE_RELEASE" == "true" ]] && NSIS_USING_LOG_BUILD=0
-          CONDA_BLD_PATH=${RUNNER_TEMP}/conda-bld
+          if [[ "$IS_RELEASE" != "true" && "$IS_PRE_RELEASE" != "true" ]]; then
+              NSIS_USING_LOG_BUILD=1
+              echo "NSIS_USING_LOG_BUILD=$NSIS_USING_LOG_BUILD" >> $GITHUB_ENV
+          fi
 
-          echo "NSIS_USING_LOG_BUILD=$NSIS_USING_LOG_BUILD" >> $GITHUB_ENV
+          CONDA_BLD_PATH=${RUNNER_TEMP}/conda-bld
           echo "CONDA_BLD_PATH=$CONDA_BLD_PATH" >> $GITHUB_ENV
 
           env | sort

binder/environment.yml

@@ -50,7 +50,7 @@ dependencies:
 - rtree >=0.9.7
 - setuptools >=49.6.0
 - sphinx >=0.6.6
-- spyder-kernels >=3.0.0,<3.1.0
+- spyder-kernels >=3.0.0,<3.2.0
 - superqt >=0.6.2,<1.0.0
 - textdistance >=4.2.0
 - three-merge >=0.1.1

installers-conda/resources/post-install.sh

@@ -65,6 +65,9 @@ for shell_init in ${shell_init_list[@]}; do
     # Don't create non-existent global init file
     [[ "$mode" == "system" && ! -f "$shell_init" ]] && continue
 
+    # Resolve possible symlink
+    [[ -f $shell_init ]] && shell_init=$(readlink -f $shell_init)
+
     echo "Creating aliases in $shell_init ..."
     add_alias
 done
@@ -120,7 +123,9 @@ done
 
 # Remove aliases from shell startup
 for x in ${shell_init_list[@]}; do
-    [[ ! -f "\$x" ]] && continue
+    # Resolve possible symlink
+    [[ ! -f "\$x" ]] && continue || x=\$(readlink -f \$x)
+
     echo "Removing Spyder shell commands from \$x..."
     sed -i.bak -e "/$m1/,/$m2/d" \$x
     rm \$x.bak

requirements/main.yml

@@ -47,7 +47,7 @@ dependencies:
   - rtree >=0.9.7
   - setuptools >=49.6.0
   - sphinx >=0.6.6
-  - spyder-kernels >=3.0.0,<3.1.0
+  - spyder-kernels >=3.0.0,<3.2.0
   - superqt >=0.6.2,<1.0.0
   - textdistance >=4.2.0
   - three-merge >=0.1.1

setup.py

@@ -247,7 +247,7 @@ def run(self):
     'rtree>=0.9.7',
     'setuptools>=49.6.0',
     'sphinx>=0.6.6',
-    'spyder-kernels>=3.0.0,<3.1.0',
+    'spyder-kernels>=3.0.0,<3.2.0',
     'superqt>=0.6.2,<1.0.0',
     'textdistance>=4.2.0',
     'three-merge>=0.1.1',
@@ -262,7 +262,6 @@ def run(self):
                         if req.split(">")[0] not in reqs_to_loosen]
     install_requires.append('python-lsp-server[all]>=1.12.0,<1.14.0')
     install_requires.append('qtconsole>=5.5.1,<5.7.0')
-    install_requires.append('spyder-kernels>=3.0.0,<3.2.0')
 
 extras_require = {
     'test:platform_system == "Windows"': ['pywin32'],

spyder/dependencies.py

@@ -73,7 +73,7 @@
 RTREE_REQVER = '>=0.9.7'
 SETUPTOOLS_REQVER = '>=49.6.0'
 SPHINX_REQVER = '>=0.6.6'
-SPYDER_KERNELS_REQVER = '>=3.0.0,<3.1.0'
+SPYDER_KERNELS_REQVER = '>=3.0.0,<3.2.0'
 SUPERQT_REQVER = '>=0.6.2,<1.0.0'
 TEXTDISTANCE_REQVER = '>=4.2.0'
 THREE_MERGE_REQVER = '>=0.1.1'