Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Add option to prepend or append Pythonpath Manager paths to sys.path #21769

Merged
merged 45 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
0177706
Update UI with toggle button to prioritize spyder_pythonpath with res…
mrclary Jan 30, 2024
a01bb64
Add path priority to pythonpath_manager plugin container
mrclary Feb 6, 2024
d7cc645
Add path priority to pythonpath_manager sig_pythonpath_changed signal
mrclary Jan 31, 2024
742d73e
Add path priority to IPython Console plugin
mrclary Feb 6, 2024
6683336
Add path priority to completions language server
mrclary Feb 6, 2024
0aee73e
Add test for prioritize button state
mrclary Feb 6, 2024
1543eaf
Update ipythonconsole plugin tests
mrclary Feb 6, 2024
05110cf
Change sig_pythonpath_changed arguments from dictionary to list of st…
mrclary Feb 12, 2024
e5d2a7a
Add system_paths and user_paths to pythonpath_manager configuration
mrclary Feb 28, 2024
b7a45db
Convert (path, project_path, not_active_path) to (user_paths, project…
mrclary Feb 28, 2024
ebaae51
Only set user_paths, project_paths, system_paths, and prioritize in u…
mrclary Feb 28, 2024
e158d06
Send new user paths, system paths, and prioritize back to container.
mrclary Feb 28, 2024
e6ff1dd
Remove superfluous user_path attribute
mrclary Feb 28, 2024
2e5b5f6
Remove algorithm to save system PYTHONPATH.
mrclary Feb 28, 2024
d4c6b38
Simplify get_user_paths and get_system_paths
mrclary Feb 29, 2024
22e88af
Update container attributes (path, not_active_path, project_path, pri…
mrclary Feb 29, 2024
483ee98
Revise configuration migration method.
mrclary Feb 29, 2024
bc0fac2
Revise _save_paths
mrclary Feb 29, 2024
4d7e928
Simplify get_spyder_pythonpath. spyder_pythonpath is now straightforw…
mrclary Feb 29, 2024
df3d00f
Simplify update_active_project_path. sig_pythonpath_changed is emitte…
mrclary Feb 29, 2024
5d58176
Update show_path_manager method. Note that PathManager.setup is calle…
mrclary Feb 29, 2024
157fbff
Propagate changes to sig_pythonpath_changed to pythonpath plugin
mrclary Feb 29, 2024
7ea1f61
Propagate changes to sig_pythonpath_changed to ipythonconsole plugin.…
mrclary Feb 29, 2024
378beb0
Propagate changes to sig_pythonpath_changed to completions plugin.
mrclary Feb 29, 2024
2ec2ee0
Update main window test
mrclary Mar 1, 2024
251908b
Update export_pythonpath
mrclary Mar 3, 2024
5549407
Update widget icon.
mrclary Mar 7, 2024
db59c41
Apply suggestions from code review
mrclary May 16, 2024
e6066b6
Apply suggestions from python-lsp-server code review
mrclary May 18, 2024
3139213
Python 3.8 does not support | operator on OrderedDict.
mrclary May 26, 2024
23b439a
Do not emit sig_path_changed on closeEvent or reject.
mrclary Oct 11, 2024
3a716a4
Only update system paths on Spyder startup, not every time the python…
mrclary Oct 12, 2024
fadf37a
Add import path functionality.
mrclary Oct 13, 2024
c7b4246
Update unit tests
mrclary Oct 15, 2024
71c4480
Apply suggestions from code review
mrclary Jan 21, 2025
4994680
Apply suggestion from code review per @ccordoba12
mrclary Jan 20, 2025
96d36d4
Use a configuration key to store whether the configuration has been m…
mrclary Jan 21, 2025
09501b3
Rename _project_paths -> _project_path and consider only a single path.
mrclary Jan 21, 2025
849f2b1
Rename attribute project_paths -> project_path and declare attributes…
mrclary Jan 21, 2025
912b4a5
Add test for PYTHONPATH priority. Initially add path via path manager…
mrclary Jan 23, 2025
d51f9b2
Apply suggestions from code review
mrclary Feb 18, 2025
77468c7
Increase minimal support for python-lsp-server
mrclary Feb 17, 2025
731e9f1
git subrepo clone (merge) --branch=master --force https://github.com/…
mrclary Feb 18, 2025
4fba46f
Apply suggestions from code review
mrclary Feb 18, 2025
fa5ad5e
Fix issue where adding duplicate path and selecting "yes" to move it …
mrclary Feb 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies:
- pyqt >=5.15,<5.16
- pyqtwebengine >=5.15,<5.16
- python-lsp-black >=2.0.0,<3.0.0
- python-lsp-server >=1.12.0,<1.13.0
- python-lsp-server >=1.12.2,<1.13.0
- pyuca >=1.2
- pyxdg >=0.26
- pyzmq >=24.0.0
Expand Down
1 change: 1 addition & 0 deletions changelogs/Spyder-6.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### API changes

* **Breaking** - The `sig_pythonpath_changed` signal of the Python path manager plugin now emits a list of strings and a bool, instead of two dictionaries.
* Add `early_return` and `return_awaitable` kwargs to `AsyncDispatcher` constructor.
* Add `register_api` and `get_api` methods to `RemoteClient` plugin in order to
get and register new rest API modules for the remote client.
Expand Down
4 changes: 2 additions & 2 deletions external-deps/spyder-kernels/.gitrepo

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 36 additions & 16 deletions external-deps/spyder-kernels/spyder_kernels/console/kernel.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 15 additions & 14 deletions external-deps/spyder-kernels/spyder_kernels/console/start.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion requirements/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies:
- pyqt >=5.15,<5.16
- pyqtwebengine >=5.15,<5.16
- python-lsp-black >=2.0.0,<3.0.0
- python-lsp-server >=1.12.0,<1.13.0
- python-lsp-server >=1.12.2,<1.13.0
- pyuca >=1.2
- pyzmq >=24.0.0
- qdarkstyle >=3.2.0,<3.3.0
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ def run(self):
'pylint-venv>=3.0.2',
'pyls-spyder>=0.4.0',
'python-lsp-black>=2.0.0,<3.0.0',
'python-lsp-server[all]>=1.12.0,<1.13.0',
'python-lsp-server[all]>=1.12.2,<1.13.0',
'pyuca>=1.2',
'pyxdg>=0.26;platform_system=="Linux"',
'pyzmq>=24.0.0',
Expand Down Expand Up @@ -329,7 +329,7 @@ def run(self):
install_requires = [req for req in install_requires
if req.split(">")[0] not in reqs_to_loosen]

install_requires.append('python-lsp-server[all]>=1.12.0,<1.14.0')
install_requires.append('python-lsp-server[all]>=1.12.2,<1.14.0')
install_requires.append('qtconsole>=5.5.1,<5.7.0')

extras_require = {
Expand Down
Loading
Loading