Merge remote-tracking branch 'origin/master' into improving_guiqwt_in…

…tegration_kernel # Conflicts: # spyder_kernels/console/start.py
spyder-ide · Aug 3, 2024 · aeae4e1 · aeae4e1
2 parents 6c5418b + 782fddc
commit aeae4e1
Show file tree

Hide file tree

Showing 37 changed files with 2,545 additions and 1,714 deletions.
diff --git a/.github/workflows/linux-pip-tests.yml b/.github/workflows/linux-pip-tests.yml
@@ -10,6 +10,10 @@ on:
     - master
     - 2.*
 
+concurrency:
+  group: linux-pip-tests-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   linux:
     name: Py${{ matrix.PYTHON_VERSION }}
@@ -18,10 +22,11 @@ jobs:
       CI: True
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
       RUNNER_OS: 'ubuntu'
+      USE_CONDA: 'false'
     strategy:
       fail-fast: false 
       matrix:
-        PYTHON_VERSION: ['3.7', '3.8', '3.9']
+        PYTHON_VERSION: ['3.8', '3.9', '3.10']
     timeout-minutes: 20
     steps:
       - name: Checkout branch
@@ -41,17 +46,19 @@ jobs:
         shell: bash -l {0}
         run: |
           pip install -e .[test]
-          # Zict 2.1.0 is not compatible with Python 3
-          pip install zict==2.0.0
       - name: Show environment information
         shell: bash -l {0}
         run: |
           conda info
           conda list
       - name: Run tests
         shell: bash -l {0}
-        run: xvfb-run --auto-servernum pytest spyder_kernels --cov=spyder_kernels -x -vv || xvfb-run --auto-servernum pytest spyder_kernels --cov=spyder_kernels -x -vv || xvfb-run --auto-servernum pytest spyder_kernels --cov=spyder_kernels -x -vv
+        run: |
+          xvfb-run --auto-servernum pytest spyder_kernels --color=yes --cov=spyder_kernels -vv || \
+          xvfb-run --auto-servernum pytest spyder_kernels --color=yes --cov=spyder_kernels -vv || \
+          xvfb-run --auto-servernum pytest spyder_kernels --color=yes --cov=spyder_kernels -vv
       - name: Upload coverage to Codecov
-        if: matrix.PYTHON_VERSION == '3.8'
-        shell: bash -l {0}
-        run: codecov -t 02fa9892-fa7f-4cf8-ac3c-d54143ddc933
+        uses: codecov/codecov-action@v3
+        with:
+          fail_ci_if_error: false
+          verbose: true
diff --git a/.github/workflows/linux-tests.yml b/.github/workflows/linux-tests.yml
@@ -10,6 +10,10 @@ on:
     - master
     - 2.*
 
+concurrency:
+  group: linux-tests-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   linux:
     name: Py${{ matrix.PYTHON_VERSION }}
@@ -22,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false 
       matrix:
-        PYTHON_VERSION: ['3.7', '3.8', '3.9']
+        PYTHON_VERSION: ['3.8', '3.9', '3.10']
     timeout-minutes: 20
     steps:
       - name: Checkout branch
@@ -57,8 +61,12 @@ jobs:
           conda list
       - name: Run tests
         shell: bash -l {0}
-        run: xvfb-run --auto-servernum pytest spyder_kernels --cov=spyder_kernels -x -vv || xvfb-run --auto-servernum pytest spyder_kernels --cov=spyder_kernels -x -vv || xvfb-run --auto-servernum pytest spyder_kernels --cov=spyder_kernels -x -vv
+        run: |
+          xvfb-run --auto-servernum pytest spyder_kernels --color=yes --cov=spyder_kernels -vv || \
+          xvfb-run --auto-servernum pytest spyder_kernels --color=yes --cov=spyder_kernels -vv || \
+          xvfb-run --auto-servernum pytest spyder_kernels --color=yes --cov=spyder_kernels -vv
       - name: Upload coverage to Codecov
-        if: matrix.PYTHON_VERSION == '3.8'
-        shell: bash -l {0}
-        run: codecov -t 02fa9892-fa7f-4cf8-ac3c-d54143ddc933
+        uses: codecov/codecov-action@v3
+        with:
+          fail_ci_if_error: false
+          verbose: true
diff --git a/.github/workflows/macos-tests.yml b/.github/workflows/macos-tests.yml
@@ -10,6 +10,10 @@ on:
     - master
     - 2.*
 
+concurrency:
+  group: macos-tests-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   macos:
     name: Py${{ matrix.PYTHON_VERSION }}
@@ -18,10 +22,11 @@ jobs:
       CI: True
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
       RUNNER_OS: 'macos'
+      USE_CONDA: 'true'
     strategy:
       fail-fast: false 
       matrix:
-        PYTHON_VERSION: ['3.7', '3.8', '3.9']
+        PYTHON_VERSION: ['3.8', '3.9', '3.10']
     timeout-minutes: 25
     steps:
       - name: Checkout branch
@@ -52,4 +57,12 @@ jobs:
           conda list
       - name: Run tests
         shell: bash -l {0}
-        run: pytest spyder_kernels --cov=spyder_kernels -x -vv || pytest spyder_kernels --cov=spyder_kernels -x -vv || pytest spyder_kernels --cov=spyder_kernels -x -vv
+        run: |
+          pytest spyder_kernels --color=yes --cov=spyder_kernels -vv || \
+          pytest spyder_kernels --color=yes --cov=spyder_kernels -vv || \
+          pytest spyder_kernels --color=yes --cov=spyder_kernels -vv
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          fail_ci_if_error: false
+          verbose: true
diff --git a/.github/workflows/windows-tests.yml b/.github/workflows/windows-tests.yml
@@ -10,6 +10,10 @@ on:
     - master
     - 2.*
 
+concurrency:
+  group: windows-tests-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   windows:
     name: Py${{ matrix.PYTHON_VERSION }}
@@ -18,10 +22,11 @@ jobs:
       CI: True
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
       RUNNER_OS: 'windows'
+      USE_CONDA: 'true'
     strategy:
       fail-fast: false 
       matrix:
-        PYTHON_VERSION: ['3.7', '3.8', '3.9']
+        PYTHON_VERSION: ['3.8', '3.9', '3.10']
     timeout-minutes: 25
     steps:
       - name: Checkout branch
@@ -52,4 +57,12 @@ jobs:
           conda list
       - name: Run tests
         shell: bash -l {0}
-        run: pytest spyder_kernels --cov=spyder_kernels -x -vv || pytest spyder_kernels --cov=spyder_kernels -x -vv || pytest spyder_kernels --cov=spyder_kernels -x -vv
+        run: |
+          pytest spyder_kernels --color=yes --cov=spyder_kernels -vv || \
+          pytest spyder_kernels --color=yes --cov=spyder_kernels -vv || \
+          pytest spyder_kernels --cov=spyder_kernels -vv
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          fail_ci_if_error: false
+          verbose: true