Skip to content

Commit

Permalink
Merge pull request spyder-ide#21769 from mrclary/ppm-syspath
Browse files Browse the repository at this point in the history
PR: Add option to prepend or append Pythonpath Manager paths to `sys.path`
  • Loading branch information
ccordoba12 authored Feb 24, 2025
2 parents d31c6fb + fa5ad5e commit 1b3fe16
Show file tree
Hide file tree
Showing 30 changed files with 700 additions and 568 deletions.
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

0 comments on commit 1b3fe16

Please sign in to comment.