Merge pull request #22379 from ccordoba12/update-qtconsole-subrepo

PR: Update Qtconsole subrepo
spyder-ide · Aug 24, 2024 · 02a3669 · 02a3669
2 parents 6cb9e98 + 925358f
commit 02a3669
Show file tree

Hide file tree

Showing 19 changed files with 193 additions and 57 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -264,7 +264,7 @@ Due to that, a clone of those projects is placed in the `external-deps` director
 
     ```
     $ git checkout fix_in_spyder
-    $ git subrepo pull external-deps/qtconsole -r https://github.com/jupyter/qtconsole.git -b master -u -f
+    $ git subrepo pull external-deps/qtconsole -r https://github.com/jupyter/qtconsole.git -b main -u -f
     ```
 
 

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/.gitignore b/external-deps/qtconsole/.gitignore
diff --git a/external-deps/qtconsole/.gitrepo b/external-deps/qtconsole/.gitrepo
diff --git a/external-deps/qtconsole/docs/source/changelog.rst b/external-deps/qtconsole/docs/source/changelog.rst
diff --git a/external-deps/qtconsole/docs/source/conf.py b/external-deps/qtconsole/docs/source/conf.py
diff --git a/external-deps/qtconsole/qtconsole/ansi_code_processor.py b/external-deps/qtconsole/qtconsole/ansi_code_processor.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/frontend_widget.py b/external-deps/qtconsole/qtconsole/frontend_widget.py
-Original file line number
+Diff line change
@@ Expand Up @@
         ```
         $ git checkout fix_in_spyder
-        $ git subrepo pull external-deps/qtconsole -r https://github.com/jupyter/qtconsole.git -b master -u -f
+        $ git subrepo pull external-deps/qtconsole -r https://github.com/jupyter/qtconsole.git -b main -u -f
         ```
@@ Expand Down @@