Merge remote-tracking branch 'upstream/master' into print_remote

spyder-ide · Jun 22, 2023 · c1e60e0 · c1e60e0
2 parents aa92dee + af324a2
commit c1e60e0
Show file tree

Hide file tree

Showing 32 changed files with 1,446 additions and 1,027 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
@@ -50,8 +55,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/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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,109 @@
 # History of changes
 
+## Version 3.0.0b1 (2023-06-14)
+
+### Issues Closed
+
+* [Issue 425](https://github.com/spyder-ide/spyder-kernels/issues/425) - Possible minor issues related to post mortem debugging ([PR 444](https://github.com/spyder-ide/spyder-kernels/pull/444) by [@impact27](https://github.com/impact27))
+* [Issue 340](https://github.com/spyder-ide/spyder-kernels/issues/340) - Drop support for Python 2 ([PR 341](https://github.com/spyder-ide/spyder-kernels/pull/341) by [@impact27](https://github.com/impact27))
+
+In this release 2 issues were closed.
+
+### Pull Requests Merged
+
+* [PR 456](https://github.com/spyder-ide/spyder-kernels/pull/456) - PR: Remove unnecessary code for old IPykernel versions in our tests, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 453](https://github.com/spyder-ide/spyder-kernels/pull/453) - PR: Move code that loads and saves HDF5 and DICOM files from Spyder, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 447](https://github.com/spyder-ide/spyder-kernels/pull/447) - PR: Create magics for run|debug file|cell, by [@impact27](https://github.com/impact27)
+* [PR 446](https://github.com/spyder-ide/spyder-kernels/pull/446) - PR: Make call to interrupt children processes work for IPykernel greater than 6.21.2, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 444](https://github.com/spyder-ide/spyder-kernels/pull/444) - PR: Fix post mortem for debugging, by [@impact27](https://github.com/impact27) ([425](https://github.com/spyder-ide/spyder-kernels/issues/425))
+* [PR 443](https://github.com/spyder-ide/spyder-kernels/pull/443) - PR: Fix small typo in Readme, by [@davidbrochart](https://github.com/davidbrochart)
+* [PR 437](https://github.com/spyder-ide/spyder-kernels/pull/437) - PR: Remove imports from __future__, by [@oscargus](https://github.com/oscargus)
+* [PR 421](https://github.com/spyder-ide/spyder-kernels/pull/421) - PR: Update variable explorer from the kernel, by [@impact27](https://github.com/impact27)
+* [PR 417](https://github.com/spyder-ide/spyder-kernels/pull/417) - PR: Fix error in `globalsfilter`, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 412](https://github.com/spyder-ide/spyder-kernels/pull/412) - PR: Use temporary file for faulthandler and make sure iopub is open for comms, by [@impact27](https://github.com/impact27)
+* [PR 409](https://github.com/spyder-ide/spyder-kernels/pull/409) - PR: Add Python executable as part of kernel info, by [@impact27](https://github.com/impact27)
+* [PR 408](https://github.com/spyder-ide/spyder-kernels/pull/408) - PR: Expose package version in SpyderShell, by [@impact27](https://github.com/impact27)
+* [PR 403](https://github.com/spyder-ide/spyder-kernels/pull/403) - PR: Make debugger faster by avoiding unnecessary comm messages, by [@impact27](https://github.com/impact27)
+* [PR 401](https://github.com/spyder-ide/spyder-kernels/pull/401) - PR: Wait for connection file to be written, by [@impact27](https://github.com/impact27)
+* [PR 400](https://github.com/spyder-ide/spyder-kernels/pull/400) - PR: Use `execute_interactive` to print errors during tests, by [@impact27](https://github.com/impact27)
+* [PR 397](https://github.com/spyder-ide/spyder-kernels/pull/397) - PR: Remove Python 2 code introduced when merging PR #395, by [@impact27](https://github.com/impact27)
+* [PR 396](https://github.com/spyder-ide/spyder-kernels/pull/396) - PR: Add handlers to interrupt executions and enter the debugger after that, by [@impact27](https://github.com/impact27)
+* [PR 390](https://github.com/spyder-ide/spyder-kernels/pull/390) - PR: Filter comm socket thread, by [@impact27](https://github.com/impact27)
+* [PR 387](https://github.com/spyder-ide/spyder-kernels/pull/387) - PR: Minor changes to finish the migration to Python 3, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 366](https://github.com/spyder-ide/spyder-kernels/pull/366) - PR: Print warning when using `global` in an empty namespace, by [@impact27](https://github.com/impact27)
+* [PR 341](https://github.com/spyder-ide/spyder-kernels/pull/341) - PR: Drop support for Python 2, by [@impact27](https://github.com/impact27) ([340](https://github.com/spyder-ide/spyder-kernels/issues/340))
+* [PR 339](https://github.com/spyder-ide/spyder-kernels/pull/339) - PR: Use control channel for comms, by [@impact27](https://github.com/impact27)
+* [PR 286](https://github.com/spyder-ide/spyder-kernels/pull/286) - PR: Improve and refactor the way we run and debug code, by [@impact27](https://github.com/impact27)
+* [PR 257](https://github.com/spyder-ide/spyder-kernels/pull/257) - PR: Notify frontend of Matplotlib backend change, by [@impact27](https://github.com/impact27)
+* [PR 171](https://github.com/spyder-ide/spyder-kernels/pull/171) - PR: Publish Pdb stack frames to Spyder, by [@impact27](https://github.com/impact27)
+
+In this release 25 pull requests were closed.
+
+
+----
+
+
+## Version 2.4.3 (2023-04-02)
+
+### Issues Closed
+
+* [Issue 440](https://github.com/spyder-ide/spyder-kernels/issues/440) - distutils and LooseVersion deprecation ([PR 450](https://github.com/spyder-ide/spyder-kernels/pull/450) by [@ccordoba12](https://github.com/ccordoba12))
+
+In this release 1 issue was closed.
+
+### Pull Requests Merged
+
+* [PR 452](https://github.com/spyder-ide/spyder-kernels/pull/452) - PR: Fix error when executing empty Python script, by [@rear1019](https://github.com/rear1019)
+* [PR 450](https://github.com/spyder-ide/spyder-kernels/pull/450) - PR: Remove usage of `distutils.LooseVersion`, by [@ccordoba12](https://github.com/ccordoba12) ([440](https://github.com/spyder-ide/spyder-kernels/issues/440))
+* [PR 449](https://github.com/spyder-ide/spyder-kernels/pull/449) - PR: Add support for Jupyter-client 8, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 448](https://github.com/spyder-ide/spyder-kernels/pull/448) - PR: Skip IPython versions that give buggy code completions, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 442](https://github.com/spyder-ide/spyder-kernels/pull/442) - PR: Add FreeBSD to `test_user_sitepackages_in_pathlist`, by [@rhurlin](https://github.com/rhurlin)
+* [PR 434](https://github.com/spyder-ide/spyder-kernels/pull/434) - PR: Use `allow_pickle=True` when loading Numpy arrays, by [@nkleinbaer](https://github.com/nkleinbaer)
+* [PR 430](https://github.com/spyder-ide/spyder-kernels/pull/430) - PR: Inform GUI about position of exception in post mortem debugging, by [@rear1019](https://github.com/rear1019)
+
+In this release 7 pull requests were closed.
+
+
+----
+
+
+## Version 2.4.2 (2023-01-17)
+
+### Issues Closed
+
+* [Issue 307](https://github.com/spyder-ide/spyder-kernels/issues/307) - formatargspec is deprecated since Python 3.5 ([PR 435](https://github.com/spyder-ide/spyder-kernels/pull/435) by [@juliangilbey](https://github.com/juliangilbey))
+
+In this release 1 issue was closed.
+
+### Pull Requests Merged
+
+* [PR 438](https://github.com/spyder-ide/spyder-kernels/pull/438) - PR: Increase minimal required Jupyter-client version to 7.4.9, by [@ccordoba12](https://github.com/ccordoba12)
+* [PR 435](https://github.com/spyder-ide/spyder-kernels/pull/435) - PR: Replace deprecated `inspect.formatargspec` call, by [@juliangilbey](https://github.com/juliangilbey) ([307](https://github.com/spyder-ide/spyder-kernels/issues/307))
+
+In this release 2 pull requests were closed.
+
+
+----
+
+
+## Version 2.4.1 (2022-12-29)
+
+### Issues Closed
+
+* [Issue 427](https://github.com/spyder-ide/spyder-kernels/issues/427) - Make spyder-kernels compatible with IPython 8 ([PR 419](https://github.com/spyder-ide/spyder-kernels/pull/419) by [@eendebakpt](https://github.com/eendebakpt))
+
+In this release 1 issue was closed.
+
+### Pull Requests Merged
+
+* [PR 419](https://github.com/spyder-ide/spyder-kernels/pull/419) - PR: Update IPython requirement to support version 8, by [@eendebakpt](https://github.com/eendebakpt) ([427](https://github.com/spyder-ide/spyder-kernels/issues/427))
+
+In this release 1 pull request was closed.
+
+
+----
+
+
 ## Version 2.4.0 (2022-11-02)
 
 ### New features

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 Package that provides Jupyter kernels for use with the consoles of Spyder, the
 Scientific Python Development Environment.
 
-These kernels can launched either through Spyder itself or in an independent
+These kernels can be launched either through Spyder itself or in an independent
 Python session, and allow for interactive or file-based execution of Python
 code inside Spyder.
 

diff --git a/requirements/posix.txt b/requirements/posix.txt
@@ -1,7 +1,7 @@
 cloudpickle
-ipykernel>=6.16.1,<7
-ipython>=7.31.1,<8
-jupyter_client>=7.3.4,<8
+ipykernel>=6.23.2,<7
+ipython>=7.31.1,<9
+jupyter_client>=7.4.9,<9
 pyzmq>=22.1.0
 wurlitzer>=1.0.3
 pyxdg>=0.26
diff --git a/requirements/tests.txt b/requirements/tests.txt
@@ -1,4 +1,3 @@
-codecov
 cython
 dask
 flaky
@@ -12,3 +11,5 @@ scipy
 xarray
 pillow
 django
+h5py
+pydicom
diff --git a/requirements/windows.txt b/requirements/windows.txt
@@ -1,5 +1,5 @@
 cloudpickle
-ipykernel>=6.16.1,<7
-ipython>=7.31.1,<8
-jupyter_client>=7.3.4,<8
+ipykernel>=6.23.2,<7
+ipython>=7.31.1,<9
+jupyter_client>=7.4.9,<9
 pyzmq>=22.1.0
diff --git a/setup.py b/setup.py
@@ -37,17 +37,15 @@ def get_version(module='spyder_kernels'):
 
 REQUIREMENTS = [
     'cloudpickle',
-    'ipykernel>=6.16.1,<7',
-    'ipython>=7.31.1,<8',
-    'jupyter-client>=7.3.4,<8',
-    'packaging',
+    'ipykernel>=6.23.2,<7',
+    'ipython>=7.31.1,<9,!=8.8.0,!=8.9.0,!=8.10.0,!=8.11.0,!=8.12.0,!=8.12.1',
+    'jupyter-client>=7.4.9,<9',
     'pyzmq>=22.1.0',
     'wurlitzer>=1.0.3;platform_system!="Windows"',
     'pyxdg>=0.26;platform_system=="Linux"',
 ]
 
 TEST_REQUIREMENTS = [
-    'codecov',
     'cython',
     'dask[distributed]',
     'flaky',
@@ -61,6 +59,8 @@ def get_version(module='spyder_kernels'):
     'xarray',
     'pillow',
     'django',
+    'h5py',
+    'pydicom'
 ]
 
 setup(

diff --git a/spyder_kernels/comms/commbase.py b/spyder_kernels/comms/commbase.py
@@ -50,8 +50,6 @@
                 'call_name': The function name (mostly for debugging)
                 }
 """
-from __future__ import print_function
-
 import cloudpickle
 import pickle
 import logging