Skip to content

Commit 7ef3731

Browse files
authored
Merge pull request #24794 from ccordoba12/profile-in-console
PR: Rearchitect Profiler to run in the IPython console
2 parents a67410a + 9663ab7 commit 7ef3731

File tree

27 files changed

+2188
-1223
lines changed

27 files changed

+2188
-1223
lines changed

.github/workflows/test-mac.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,14 @@ jobs:
150150
.github/scripts/run_tests.sh -n 4 || \
151151
.github/scripts/run_tests.sh -n 5 || \
152152
.github/scripts/run_tests.sh -n 6 || \
153-
.github/scripts/run_tests.sh -n 7
153+
.github/scripts/run_tests.sh -n 7 || \
154+
.github/scripts/run_tests.sh -n 8 || \
155+
.github/scripts/run_tests.sh -n 9 || \
156+
.github/scripts/run_tests.sh -n 10 || \
157+
.github/scripts/run_tests.sh -n 11 || \
158+
.github/scripts/run_tests.sh -n 12 || \
159+
.github/scripts/run_tests.sh -n 13 || \
160+
.github/scripts/run_tests.sh -n 14
154161
155162
- name: Coverage
156163
uses: codecov/codecov-action@v4

changelogs/Spyder-6.md

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
`SaveAll`, `SaveAs`, `SaveCopyAs`, `RevertFile`, `CloseFile`, `CloseAll`, `Undo`, `Redo`, `Cut`, `Copy`, `Paste`,
4141
`SelectAll`, `FindText`, `FindNext`, `FindPrevious` and `ReplaceText` actions were moved to the
4242
`ApplicationActions` class in the `Application` plugin.
43-
* **Breaking** - The shortcuts "new file", "open file", "open last closed", "save file", "save all", "save as", "close file 1", "close file 2" and "close all" were moved to the "main" section.
43+
* **Breaking** - The shortcuts "new file", "open file", "open last closed", "save file", "save all", "save as", "close file 1",
44+
"close file 2" and "close all" were moved to the "main" section.
4445
* Add "undo", "redo", "cut", "copy", "paste" and "select all" shortcuts to the "main" section.
4546
* Add `open_last_closed`, `current_file_is_temporary`, `save_all`, `save_as`, `save_copy_as`, `revert_file`, `undo`,
4647
`redo`, `cut`, `copy`, `paste`, `select_all`, `find`, `find_next`, `find_previous` and `replace` methods.
@@ -62,7 +63,6 @@
6263
* **Breaking** - The `sender_plugin` kwarg of the `chdir` method now expects a string instead of a `SpyderPluginV2` object.
6364
* Add `server_id` kwarg to the `chdir` method.
6465

65-
6666
#### Remote Client
6767

6868
* **Breaking** - The `create_ipyclient_for_server` and `get_kernels` methods were removed.
@@ -95,11 +95,25 @@
9595
* **Breaking** - The `sig_dir_opened` signal now emits two strings instead of a single one.
9696
* Add `server_id` kwarg to the `chdir` method.
9797

98-
### Main menu
98+
#### Profiler
99+
100+
* **Breaking** - Remove `sig_started` and `sig_finished` signals, and `run_profiler`, `stop_profiler` and `run_file` methods.
101+
* **Breaking** - Remove `ProfilerWidgetToolbars` and `ProfilerWidgetInformationToolbarSections` enums
102+
* Add `ProfilerWidgetMenus`, `ProfilerContextMenuSections` and `ProfilerWidgetContextMenuActions` enums.
103+
* Add `profile_file`, `profile_cell` and `profile_selection` methods.
99104

100-
* **Breaking** - From `SourceMenuSections`, move the `Formatting` section to `EditMenuSections` and `Cursor` to `SearchMenuSections`, remove the `CodeAnalysis` section and add the `Autofix` section.
105+
#### Main menu
106+
107+
* **Breaking** - From `SourceMenuSections`, move the `Formatting` section to `EditMenuSections` and `Cursor` to
108+
`SearchMenuSections`, remove the `CodeAnalysis` section and add the `Autofix` section.
101109
* **Breaking** - Replace the `Tools`, `External` and `Extras` sections in `ToolsMenuSections` with `Managers` and `Preferences`.
102-
* **Future Breaking** - Rename the `View` menu to `Window` in `ApplicationMenus` and `ViewMenuSections` to `WindowMenuSections`; aliases are retained for backward compatibility but may be removed in Spyder 7+.
110+
* **Future Breaking** - Rename the `View` menu to `Window` in `ApplicationMenus` and `ViewMenuSections` to `WindowMenuSections`;
111+
aliases are retained for backward compatibility but may be removed in Spyder 7+.
112+
* Add `Profile` constant to `RunMenuSections`.
113+
114+
### Toolbar
115+
116+
* Add `Profile` constant to `ApplicationToolbars`.
103117

104118
#### SpyderPluginV2
105119

@@ -128,9 +142,14 @@
128142
#### AsyncDispatcher
129143

130144
* **Breaking** - Remove `dispatch` method to use it directly as decorator.
131-
* Add class `DispatcherFuture` to `spyder.api.asyncdispatcher` and `QtSlot` method to `AsyncDispatcher` so that connected methods can be run inside the main Qt event loop.
145+
* Add class `DispatcherFuture` to `spyder.api.asyncdispatcher` and `QtSlot` method to `AsyncDispatcher` so that connected
146+
methods can be run inside the main Qt event loop.
132147
* Add `early_return` and `return_awaitable` kwargs its constructor.
133148

149+
#### General API
150+
151+
* **Breaking** - Remove `old_conf_version` method from `SpyderConfigurationAccessor`.
152+
134153
----
135154

136155
## Version 6.1.0a4 (2025/07/21)

external-deps/spyder-kernels/.gitrepo

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

external-deps/spyder-kernels/spyder_kernels/customize/code_runner.py

Lines changed: 133 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

runtests.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# Standard library imports
1212
import argparse
1313
import os
14+
import sys
1415

1516
# To activate/deactivate certain things for pytests only
1617
# NOTE: Please leave this before any other import here!!
@@ -41,9 +42,9 @@ def run_pytest(run_slow=False, extra_args=None, remoteclient=False):
4142
# Show coverage
4243
pytest_args += ['--cov=spyder', '--no-cov-on-fail', '--cov-report=xml']
4344

44-
# To display nice tests resume in Azure's web page
45-
if os.environ.get('AZURE', None) is not None:
46-
pytest_args += ['--cache-clear', '--junitxml=result.xml']
45+
# Restart suite after a failure to prevent hangs
46+
if sys.platform == "darwin":
47+
pytest_args += ["-x"]
4748
if run_slow or RUN_SLOW:
4849
pytest_args += ['--run-slow']
4950
# Allow user to pass a custom test path to pytest to e.g. run just one test

spyder/api/config/mixins.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,6 @@ def old_spyder_conf_version(self):
213213
"""Get old version for the Spyder configuration system."""
214214
return CONF.old_spyder_version
215215

216-
old_conf_version = old_spyder_conf_version
217-
"""To be removed in 6.1.0 because it was incorrectly named."""
218-
219216

220217
class SpyderConfigurationObserver(SpyderConfigurationAccessor):
221218
"""

0 commit comments

Comments
 (0)