Merge from 5.x: PR #19947

Fixes #19888
spyder-ide · Oct 30, 2022 · c2dc1da · c2dc1da
2 parents 0d6db54 + 29d54b8
commit c2dc1da
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 32 deletions.
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -39,6 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CI: 'true'
+      QTCONSOLE_TESTING: 'true'
       CODECOV_TOKEN: "56731c25-9b1f-4340-8b58-35739bfbc52d"
       OS: 'linux'
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}

diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml
@@ -39,6 +39,7 @@ jobs:
     runs-on: macos-12
     env:
       CI: 'true'
+      QTCONSOLE_TESTING: 'true'
       CODECOV_TOKEN: "56731c25-9b1f-4340-8b58-35739bfbc52d"
       OS: 'macos'
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}

diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
@@ -39,6 +39,7 @@ jobs:
     runs-on: windows-latest
     env:
       CI: 'true'
+      QTCONSOLE_TESTING: 'true'
       CODECOV_TOKEN: "56731c25-9b1f-4340-8b58-35739bfbc52d"
       OS: 'win'
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}

diff --git a/external-deps/qtconsole/.github/workflows/linux-tests.yml b/external-deps/qtconsole/.github/workflows/linux-tests.yml
diff --git a/external-deps/qtconsole/.github/workflows/macos-tests.yml b/external-deps/qtconsole/.github/workflows/macos-tests.yml
diff --git a/external-deps/qtconsole/.github/workflows/windows-tests.yml b/external-deps/qtconsole/.github/workflows/windows-tests.yml
diff --git a/external-deps/qtconsole/.gitrepo b/external-deps/qtconsole/.gitrepo
diff --git a/external-deps/qtconsole/qtconsole/completion_html.py b/external-deps/qtconsole/qtconsole/completion_html.py
diff --git a/external-deps/qtconsole/qtconsole/completion_widget.py b/external-deps/qtconsole/qtconsole/completion_widget.py
diff --git a/external-deps/qtconsole/qtconsole/console_widget.py b/external-deps/qtconsole/qtconsole/console_widget.py
diff --git a/external-deps/qtconsole/qtconsole/qtconsoleapp.py b/external-deps/qtconsole/qtconsole/qtconsoleapp.py