PR: Update tests for Spyder 6.1

.github/workflows/run-tests.yml

@@ -14,8 +14,8 @@ jobs:
       fail-fast: false 
       matrix:
         OS: ['ubuntu', 'macos', 'windows']
-        PYTHON_VERSION: ['3.9', '3.10', '3.11']
-        SPYDER_SOURCE: ['conda', 'git']
+        PYTHON_VERSION: ['3.9', '3.11', '3.12']
+        SPYDER_SOURCE: ['git']
     name: ${{ matrix.OS }} py${{ matrix.PYTHON_VERSION }} spyder-from-${{ matrix.SPYDER_SOURCE }}
     runs-on: ${{ matrix.OS }}-latest
     env:
@@ -46,42 +46,42 @@ jobs:
       - name: Install Spyder's dependencies (main)
         if: matrix.SPYDER_SOURCE == 'git'
         shell: bash -l {0}
-        run: mamba env update --file spyder/requirements/main.yml
+        run: conda env update --file spyder/requirements/main.yml
       - name: Install Spyder's dependencies (Linux)
         if: matrix.SPYDER_SOURCE == 'git' && matrix.OS == 'ubuntu'
         shell: bash -l {0}
-        run: mamba env update --file spyder/requirements/linux.yml
+        run: conda env update --file spyder/requirements/linux.yml
       - name: Install Spyder's dependencies (Mac / Windows)
         if: matrix.SPYDER_SOURCE == 'git' && matrix.OS != 'ubuntu'
         shell: bash -l {0}
-        run: mamba env update --file spyder/requirements/${{ matrix.OS }}.yml
+        run: conda env update --file spyder/requirements/${{ matrix.OS }}.yml
       - name: Install Spyder from source
         if: matrix.SPYDER_SOURCE == 'git'
         shell: bash -l {0}
-        run: pip install --no-deps -e spyder
+        run: python -m pip install --no-deps spyder/
       - name: Install plugin dependencies (without Spyder)
         if: matrix.SPYDER_SOURCE == 'git'
         shell: bash -l {0}
         run: |
           python spyder-unittest/.github/scripts/generate-without-spyder.py
-          mamba install --file spyder-unittest/requirements/without-spyder.txt -y
+          conda install --file spyder-unittest/requirements/without-spyder.txt -y
       - name: Install plugin dependencies
         if: matrix.SPYDER_SOURCE == 'conda'
         shell: bash -l {0}
-        run: mamba install --file spyder-unittest/requirements/conda.txt -y
+        run: conda install --file spyder-unittest/requirements/conda.txt -y
       - name: Install test dependencies
         shell: bash -l {0}
         run: |
-          mamba install nomkl -y -q
-          mamba install --file spyder-unittest/requirements/tests.txt -y
+          conda install nomkl -y -q
+          conda install --file spyder-unittest/requirements/tests.txt -y
       - name: Install plugin
         shell: bash -l {0}
-        run: pip install --no-deps -e spyder-unittest
+        run: python -m pip install --no-deps spyder-unittest/
       - name: Show environment information
         shell: bash -l {0}
         run: |
-          mamba info
-          mamba list
+          conda info
+          conda list
       - name: Run tests (Linux)
         if: matrix.OS == 'ubuntu'
         uses: nick-fields/retry@v3

spyder_unittest/tests/conftest.py

@@ -10,9 +10,6 @@
 available for integration tests.
 """
 
-# Standard library imports
-import os
-
 # Third-party imports
 from qtpy.QtWidgets import QApplication
 import pytest
@@ -34,12 +31,6 @@ def main_window(monkeypatch):
 
     # Don't show tours message
     CONF.set('tours', 'show_tour_message', False)
-
-    # Turn introspection on, even though it's slower and more memory
-    # intensive, because otherwise tests are aborted at end with
-    # "QThread: Destroyed while thread is still running".
-    os.environ['SPY_TEST_USE_INTROSPECTION'] = 'True'
-
     QApplication.processEvents()
 
     # Start the window
@@ -54,5 +45,3 @@ def main_window(monkeypatch):
     CONF.reset_to_defaults(notification=False)
     CONF.reset_manager()
     PLUGIN_REGISTRY.reset()
-
-    os.environ.pop('SPY_TEST_USE_INTROSPECTION')

spyder_unittest/tests/test_unittestplugin.py

@@ -47,7 +47,7 @@ def test_pythonpath_change(main_window):
 
     new_path = '/some/path'
     new_path_dict = OrderedDict([(new_path, True)])
-    ppm.get_container()._update_python_path(new_path_dict)
+    ppm.get_container()._save_paths(user_paths=new_path_dict)
 
     assert unittest_plugin.get_widget().pythonpath == [new_path]