From 85838aad5d0db80e40569d8e66cf3ae03a303525 Mon Sep 17 00:00:00 2001 From: isabelizimm Date: Wed, 22 Jan 2025 11:44:03 -0500 Subject: [PATCH 1/5] rename positron_ipykernel to positron --- extensions/positron-python/.gitignore | 4 ++-- .../positron-python/.vscode/settings.json | 2 +- extensions/positron-python/README.md | 20 ++++++++-------- .../python_files/.vscode/settings.json | 2 +- .../pinned-test-requirements.txt | 0 .../positron}/__init__.py | 0 .../positron}/_pydoc.css | 0 .../positron}/access_keys.py | 0 .../positron}/connections.py | 0 .../positron}/connections_comm.py | 0 .../positron}/data_explorer.py | 0 .../positron}/data_explorer_comm.py | 0 .../positron}/docstrings/__init__.py | 0 .../positron}/docstrings/epytext.py | 0 .../positron}/help.py | 0 .../positron}/help_comm.py | 0 .../positron}/inspectors.py | 0 .../positron}/jedi.py | 17 +++++++++++++ .../positron}/lsp.py | 0 .../positron}/matplotlib_backend.py | 0 .../positron}/patch/__init__.py | 0 .../positron}/patch/bokeh.py | 0 .../positron}/patch/holoviews.py | 0 .../positron}/plot_comm.py | 0 .../positron}/plots.py | 0 .../positron}/positron_comm.py | 0 .../positron}/positron_ipkernel.py | 4 ++-- .../positron}/positron_jedilsp.py | 0 .../positron}/pydoc.py | 0 .../positron}/session_mode.py | 0 .../positron}/tests/__init__.py | 0 .../positron}/tests/conftest.py | 10 ++++---- .../positron}/tests/data.py | 0 .../positron}/tests/test_access_keys.py | 2 +- .../positron}/tests/test_connections.py | 4 ++-- .../positron}/tests/test_data_explorer.py | 0 .../tests/test_docstrings_epytext.py | 2 +- .../positron}/tests/test_help.py | 6 ++--- .../positron}/tests/test_inspectors.py | 8 +++---- .../positron}/tests/test_patch/__init__.py | 0 .../positron}/tests/test_patch/test_bokeh.py | 2 +- .../positron}/tests/test_plots.py | 8 +++---- .../positron}/tests/test_positron_ipkernel.py | 10 ++++---- .../positron}/tests/test_positron_jedilsp.py | 14 +++++------ .../positron}/tests/test_pydoc.py | 2 +- .../positron}/tests/test_ui.py | 6 ++--- .../positron}/tests/test_variables.py | 24 +++++++++---------- .../positron}/tests/utils.py | 4 ++-- .../positron}/third_party.py | 0 .../positron}/ui.py | 0 .../positron}/ui_comm.py | 0 .../positron}/utils.py | 0 .../positron}/variables.py | 0 .../positron}/variables_comm.py | 0 .../positron_language_server.py | 6 ++--- .../{positron => posit}/test-requirements.txt | 0 .../python_files/pyproject.toml | 16 ++++++------- .../patches/jedi-language-server.patch | 12 +++++----- .../scripts/patches/jedi.patch | 14 +++++------ .../scripts/patches/parso.patch | 6 ++--- .../scripts/patches/pydantic.patch | 12 +++++----- .../scripts/patches/pygments.patch | 18 +++++++------- extensions/positron-python/scripts/vendor.py | 6 ++--- .../src/client/positron/manager.ts | 2 +- .../positron-reticulate/src/extension.ts | 2 +- positron/comms/generate-comms.ts | 2 +- 66 files changed, 132 insertions(+), 115 deletions(-) rename extensions/positron-python/python_files/{positron => posit}/pinned-test-requirements.txt (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/__init__.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/_pydoc.css (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/access_keys.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/connections.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/connections_comm.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/data_explorer.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/data_explorer_comm.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/docstrings/__init__.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/docstrings/epytext.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/help.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/help_comm.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/inspectors.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/jedi.py (95%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/lsp.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/matplotlib_backend.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/patch/__init__.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/patch/bokeh.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/patch/holoviews.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/plot_comm.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/plots.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/positron_comm.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/positron_ipkernel.py (99%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/positron_jedilsp.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/pydoc.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/session_mode.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/__init__.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/conftest.py (96%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/data.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_access_keys.py (97%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_connections.py (98%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_data_explorer.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_docstrings_epytext.py (97%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_help.py (95%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_inspectors.py (99%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_patch/__init__.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_patch/test_bokeh.py (96%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_plots.py (97%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_positron_ipkernel.py (97%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_positron_jedilsp.py (97%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_pydoc.py (99%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_ui.py (98%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/test_variables.py (96%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/tests/utils.py (96%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/third_party.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/ui.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/ui_comm.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/utils.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/variables.py (100%) rename extensions/positron-python/python_files/{positron/positron_ipykernel => posit/positron}/variables_comm.py (100%) rename extensions/positron-python/python_files/{positron => posit}/positron_language_server.py (96%) rename extensions/positron-python/python_files/{positron => posit}/test-requirements.txt (100%) diff --git a/extensions/positron-python/.gitignore b/extensions/positron-python/.gitignore index 9a0ff28b190..39571ab0b1b 100644 --- a/extensions/positron-python/.gitignore +++ b/extensions/positron-python/.gitignore @@ -51,8 +51,8 @@ dist/** l10n/ tags # --- Start Positron --- -python_files/positron/positron_ipykernel/tests/images -python_files/positron/positron_ipykernel/_vendor/** +python_files/posit/positron/tests/images +python_files/posit/positron/_vendor/** # --- End Positron --- python-env-tools/** # coverage files produced as test output diff --git a/extensions/positron-python/.vscode/settings.json b/extensions/positron-python/.vscode/settings.json index 3fe8d0899ff..f112111d1e4 100644 --- a/extensions/positron-python/.vscode/settings.json +++ b/extensions/positron-python/.vscode/settings.json @@ -74,7 +74,7 @@ "python.testing.pytestArgs": [ "python_files/tests", // --- Start Positron --- - "python_files/positron/positron_ipykernel" + "python_files/posit/positron" // --- End Positron --- ], "python.testing.unittestEnabled": false, diff --git a/extensions/positron-python/README.md b/extensions/positron-python/README.md index 4318c784297..8e6b5105e23 100644 --- a/extensions/positron-python/README.md +++ b/extensions/positron-python/README.md @@ -13,16 +13,16 @@ We provide a custom Positron Python Kernel based on the following open-source Py - [**IPyKernel**](https://github.com/ipython/ipykernel), a Jupyter kernel for the Python programming language written in Python - [**Jedi Language Server**](https://github.com/pappasam/jedi-language-server), a language server built on the [pygls](https://github.com/openlawlibrary/pygls) (Python Generic Language Server Framework) using the [Jedi](https://github.com/davidhalter/jedi) library for autocompletion, static analysis, and refactoring -The entrypoint to our kernel is the [`positron_language_server.py`](python_files/positron/positron_language_server.py) script. The core functionality of the kernel can be found in the [`positron_ipykernel`](python_files/positron/positron/positron_ipykernel/) package, which consists of these services: - -- [`positron_ipkernel`](python_files/positron/positron_ipykernel/positron_ipkernel.py), the Positron Python Kernel -- [`positron_jedilsp`](python_files/positron/positron_ipykernel/positron_jedilsp.py), the Positron Python Language Server -- [`variables`](python_files/positron/positron_ipykernel/variables.py), manages Positron's Variables pane -- [`ui`](python_files/positron/positron_ipykernel/ui.py), manages Positron's Frontend comm channel (a global channel for communication unscoped to any particular view) -- [`help`](python_files/positron/positron_ipykernel/help.py), manages Positron's Help pane -- [`lsp`](python_files/positron/positron_ipykernel/lsp.py), manages the language server -- [`plots`](python_files/positron/positron_ipykernel/plots.py), a custom [IPython display publisher](https://github.com/ipython/ipython/blob/main/IPython/core/displaypub.py) that displays to Positron's Plots pane -- [`data_explorer`](python_files/positron/positron_ipykernel/data_explorer.py), manages Positron's Data Viewer +The entrypoint to our kernel is the [`positron_language_server.py`](python_files/posit/positron_language_server.py) script. The core functionality of the kernel can be found in the [`positron`](python_files/posit/positron/) package, which consists of these services: + +- [`positron_ipkernel`](python_files/posit/positron/positron_ipkernel.py), the Positron Python Kernel +- [`positron_jedilsp`](python_files/posit/positron/positron_jedilsp.py), the Positron Python Language Server +- [`variables`](python_files/posit/positron/variables.py), manages Positron's Variables pane +- [`ui`](python_files/posit/positron/ui.py), manages Positron's Frontend comm channel (a global channel for communication unscoped to any particular view) +- [`help`](python_files/posit/positron/help.py), manages Positron's Help pane +- [`lsp`](python_files/posit/positron/lsp.py), manages the language server +- [`plots`](python_files/posit/positron/plots.py), a custom [IPython display publisher](https://github.com/ipython/ipython/blob/main/IPython/core/displaypub.py) that displays to Positron's Plots pane +- [`data_explorer`](python_files/posit/positron/data_explorer.py), manages Positron's Data Viewer The various Positron services communicate with the front end via Jupyter's [comms](https://connect.rstudioservices.com/content/59a1f153-dcd8-44ac-849b-3371829b7002/positron-architecture.html#comms-and-ui-bindings) messaging protocol. diff --git a/extensions/positron-python/python_files/.vscode/settings.json b/extensions/positron-python/python_files/.vscode/settings.json index 165fbc8b9fc..7422c6abd4a 100644 --- a/extensions/positron-python/python_files/.vscode/settings.json +++ b/extensions/positron-python/python_files/.vscode/settings.json @@ -10,7 +10,7 @@ }, "python.testing.pytestArgs": [ "tests", - "positron/positron_ipykernel/tests" + "posit/positron/tests" ], "python.testing.unittestEnabled": false, "python.testing.pytestEnabled": true, diff --git a/extensions/positron-python/python_files/positron/pinned-test-requirements.txt b/extensions/positron-python/python_files/posit/pinned-test-requirements.txt similarity index 100% rename from extensions/positron-python/python_files/positron/pinned-test-requirements.txt rename to extensions/positron-python/python_files/posit/pinned-test-requirements.txt diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/__init__.py b/extensions/positron-python/python_files/posit/positron/__init__.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/__init__.py rename to extensions/positron-python/python_files/posit/positron/__init__.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/_pydoc.css b/extensions/positron-python/python_files/posit/positron/_pydoc.css similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/_pydoc.css rename to extensions/positron-python/python_files/posit/positron/_pydoc.css diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/access_keys.py b/extensions/positron-python/python_files/posit/positron/access_keys.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/access_keys.py rename to extensions/positron-python/python_files/posit/positron/access_keys.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/connections.py b/extensions/positron-python/python_files/posit/positron/connections.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/connections.py rename to extensions/positron-python/python_files/posit/positron/connections.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/connections_comm.py b/extensions/positron-python/python_files/posit/positron/connections_comm.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/connections_comm.py rename to extensions/positron-python/python_files/posit/positron/connections_comm.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/data_explorer.py b/extensions/positron-python/python_files/posit/positron/data_explorer.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/data_explorer.py rename to extensions/positron-python/python_files/posit/positron/data_explorer.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/data_explorer_comm.py b/extensions/positron-python/python_files/posit/positron/data_explorer_comm.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/data_explorer_comm.py rename to extensions/positron-python/python_files/posit/positron/data_explorer_comm.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/docstrings/__init__.py b/extensions/positron-python/python_files/posit/positron/docstrings/__init__.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/docstrings/__init__.py rename to extensions/positron-python/python_files/posit/positron/docstrings/__init__.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/docstrings/epytext.py b/extensions/positron-python/python_files/posit/positron/docstrings/epytext.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/docstrings/epytext.py rename to extensions/positron-python/python_files/posit/positron/docstrings/epytext.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/help.py b/extensions/positron-python/python_files/posit/positron/help.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/help.py rename to extensions/positron-python/python_files/posit/positron/help.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/help_comm.py b/extensions/positron-python/python_files/posit/positron/help_comm.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/help_comm.py rename to extensions/positron-python/python_files/posit/positron/help_comm.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/inspectors.py b/extensions/positron-python/python_files/posit/positron/inspectors.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/inspectors.py rename to extensions/positron-python/python_files/posit/positron/inspectors.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/jedi.py b/extensions/positron-python/python_files/posit/positron/jedi.py similarity index 95% rename from extensions/positron-python/python_files/positron/positron_ipykernel/jedi.py rename to extensions/positron-python/python_files/posit/positron/jedi.py index 52a06d781de..281d2d40365 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/jedi.py +++ b/extensions/positron-python/python_files/posit/positron/jedi.py @@ -3,6 +3,8 @@ # Licensed under the Elastic License 2.0. See LICENSE.txt for license information. # +import os +import platform from typing import Any, Tuple from ._vendor.jedi import cache, debug @@ -31,6 +33,7 @@ from ._vendor.jedi.inference.helpers import infer_call_of_leaf from ._vendor.jedi.inference.value import ModuleValue from ._vendor.jedi.parser_utils import cut_value_at_position +from ._vendor.jedi import settings from .utils import safe_isinstance # @@ -43,6 +46,20 @@ _sentinel = object() +# update Jedi cache to not conflict with other Jedi instances +if platform.system().lower() == 'windows': + _cache_directory = os.path.join( + os.getenv('LOCALAPPDATA') or os.path.expanduser('~'), + 'Jedi', + 'Positron-Jedi', + ) +elif platform.system().lower() == 'darwin': + _cache_directory = os.path.join('~', 'Library', 'Caches', 'Positron-Jedi') +else: + _cache_directory = os.path.join(os.getenv('XDG_CACHE_HOME') or '~/.cache', + 'positron-jedi') +settings.cache_directory = os.path.expanduser(_cache_directory) + class PositronMixedModuleContext(MixedModuleContext): """ diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/lsp.py b/extensions/positron-python/python_files/posit/positron/lsp.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/lsp.py rename to extensions/positron-python/python_files/posit/positron/lsp.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/matplotlib_backend.py b/extensions/positron-python/python_files/posit/positron/matplotlib_backend.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/matplotlib_backend.py rename to extensions/positron-python/python_files/posit/positron/matplotlib_backend.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/patch/__init__.py b/extensions/positron-python/python_files/posit/positron/patch/__init__.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/patch/__init__.py rename to extensions/positron-python/python_files/posit/positron/patch/__init__.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/patch/bokeh.py b/extensions/positron-python/python_files/posit/positron/patch/bokeh.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/patch/bokeh.py rename to extensions/positron-python/python_files/posit/positron/patch/bokeh.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/patch/holoviews.py b/extensions/positron-python/python_files/posit/positron/patch/holoviews.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/patch/holoviews.py rename to extensions/positron-python/python_files/posit/positron/patch/holoviews.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/plot_comm.py b/extensions/positron-python/python_files/posit/positron/plot_comm.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/plot_comm.py rename to extensions/positron-python/python_files/posit/positron/plot_comm.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/plots.py b/extensions/positron-python/python_files/posit/positron/plots.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/plots.py rename to extensions/positron-python/python_files/posit/positron/plots.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/positron_comm.py b/extensions/positron-python/python_files/posit/positron/positron_comm.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/positron_comm.py rename to extensions/positron-python/python_files/posit/positron/positron_comm.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/positron_ipkernel.py b/extensions/positron-python/python_files/posit/positron/positron_ipkernel.py similarity index 99% rename from extensions/positron-python/python_files/positron/positron_ipykernel/positron_ipkernel.py rename to extensions/positron-python/python_files/posit/positron/positron_ipkernel.py index 79358845ce1..59b25f56614 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/positron_ipkernel.py +++ b/extensions/positron-python/python_files/posit/positron/positron_ipkernel.py @@ -309,7 +309,7 @@ async def _stop(self): def show_usage(self): """Show a usage message""" - self.kernel.help_service.show_help("positron_ipykernel.utils.positron_ipykernel_usage") + self.kernel.help_service.show_help("positron.utils.positron_ipykernel_usage") @traitlets.observe("exit_now") def _update_exit_now(self, change): @@ -548,7 +548,7 @@ def init_gui_pylab(self): # Matplotlib uses the MPLBACKEND environment variable to determine the backend to use. # It imports the backend module when it's first needed. if not os.environ.get("MPLBACKEND"): - os.environ["MPLBACKEND"] = "module://positron_ipykernel.matplotlib_backend" + os.environ["MPLBACKEND"] = "module://positron.matplotlib_backend" return super().init_gui_pylab() diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/positron_jedilsp.py b/extensions/positron-python/python_files/posit/positron/positron_jedilsp.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/positron_jedilsp.py rename to extensions/positron-python/python_files/posit/positron/positron_jedilsp.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/pydoc.py b/extensions/positron-python/python_files/posit/positron/pydoc.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/pydoc.py rename to extensions/positron-python/python_files/posit/positron/pydoc.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/session_mode.py b/extensions/positron-python/python_files/posit/positron/session_mode.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/session_mode.py rename to extensions/positron-python/python_files/posit/positron/session_mode.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/__init__.py b/extensions/positron-python/python_files/posit/positron/tests/__init__.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/__init__.py rename to extensions/positron-python/python_files/posit/positron/tests/__init__.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/conftest.py b/extensions/positron-python/python_files/posit/positron/tests/conftest.py similarity index 96% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/conftest.py rename to extensions/positron-python/python_files/posit/positron/tests/conftest.py index f61ee880e64..c543d03789a 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/conftest.py +++ b/extensions/positron-python/python_files/posit/positron/tests/conftest.py @@ -11,15 +11,15 @@ from jupyter_client.session import Session from traitlets.config import Config -import positron_ipykernel.utils as utils -from positron_ipykernel.connections import ConnectionsService -from positron_ipykernel.positron_ipkernel import ( +import positron.utils as utils +from positron.connections import ConnectionsService +from positron.positron_ipkernel import ( PositronIPKernelApp, PositronIPyKernel, PositronShell, ) -from positron_ipykernel.session_mode import SessionMode -from positron_ipykernel.variables import VariablesService +from positron.session_mode import SessionMode +from positron.variables import VariablesService from http.server import HTTPServer utils.TESTING = True diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/data.py b/extensions/positron-python/python_files/posit/positron/tests/data.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/data.py rename to extensions/positron-python/python_files/posit/positron/tests/data.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_access_keys.py b/extensions/positron-python/python_files/posit/positron/tests/test_access_keys.py similarity index 97% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_access_keys.py rename to extensions/positron-python/python_files/posit/positron/tests/test_access_keys.py index 4f615b84eae..ea880f520b3 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_access_keys.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_access_keys.py @@ -13,7 +13,7 @@ import pytest from fastcore.foundation import L -from positron_ipykernel.access_keys import decode_access_key, encode_access_key +from positron.access_keys import decode_access_key, encode_access_key from .data import ( BOOL_CASES, diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_connections.py b/extensions/positron-python/python_files/posit/positron/tests/test_connections.py similarity index 98% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_connections.py rename to extensions/positron-python/python_files/posit/positron/tests/test_connections.py index 1895669df47..a36650c3350 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_connections.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_connections.py @@ -9,8 +9,8 @@ import pytest import sqlalchemy -from positron_ipykernel.access_keys import encode_access_key -from positron_ipykernel.connections import ConnectionsService +from positron.access_keys import encode_access_key +from positron.connections import ConnectionsService from .conftest import DummyComm, PositronShell from .utils import json_rpc_request, json_rpc_response diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_data_explorer.py b/extensions/positron-python/python_files/posit/positron/tests/test_data_explorer.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_data_explorer.py rename to extensions/positron-python/python_files/posit/positron/tests/test_data_explorer.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_docstrings_epytext.py b/extensions/positron-python/python_files/posit/positron/tests/test_docstrings_epytext.py similarity index 97% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_docstrings_epytext.py rename to extensions/positron-python/python_files/posit/positron/tests/test_docstrings_epytext.py index 16573aca195..9cfc9531bf2 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_docstrings_epytext.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_docstrings_epytext.py @@ -5,7 +5,7 @@ import pytest -from positron_ipykernel.docstrings import epytext_to_markdown, looks_like_epytext +from positron.docstrings import epytext_to_markdown, looks_like_epytext BASIC_EXAMPLE = """Example of epytext docstring. diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_help.py b/extensions/positron-python/python_files/posit/positron/tests/test_help.py similarity index 95% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_help.py rename to extensions/positron-python/python_files/posit/positron/tests/test_help.py index 317bfbd614e..58da2d950d6 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_help.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_help.py @@ -11,8 +11,8 @@ import pandas as pd import pytest -from positron_ipykernel.help import HelpService, help -from positron_ipykernel.help_comm import HelpBackendRequest, HelpFrontendEvent, ShowHelpKind +from positron.help import HelpService, help +from positron.help_comm import HelpBackendRequest, HelpFrontendEvent, ShowHelpKind from .conftest import DummyComm from .utils import json_rpc_notification, json_rpc_request, json_rpc_response @@ -120,7 +120,7 @@ def show_help_event(content: str, kind=ShowHelpKind.Url, focus=True): # Keywords should resolve even though they aren't objects. ("async", "async"), # The overrided help function should resolve. - (help, "positron_ipykernel.help.help"), + (help, "positron.help.help"), ], ) def test_show_help( diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_inspectors.py b/extensions/positron-python/python_files/posit/positron/tests/test_inspectors.py similarity index 99% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_inspectors.py rename to extensions/positron-python/python_files/posit/positron/tests/test_inspectors.py index 446ea433a47..9fbc2187697 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_inspectors.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_inspectors.py @@ -20,13 +20,13 @@ from fastcore.foundation import L from shapely.geometry import Polygon -from positron_ipykernel.inspectors import ( +from positron.inspectors import ( PRINT_WIDTH, TRUNCATE_AT, get_inspector, ) -from positron_ipykernel.utils import get_qualname -from positron_ipykernel.variables_comm import VariableKind +from positron.utils import get_qualname +from positron.variables_comm import VariableKind from .data import ( BOOL_CASES, @@ -598,7 +598,7 @@ def test_inspect_object(value: Any) -> None: display_value=str(value), kind=VariableKind.Other, display_type="HelperClass", - type_info="positron_ipykernel.tests.test_inspectors.HelperClass", + type_info="positron.tests.test_inspectors.HelperClass", supports_deepcopy=False, ) diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_patch/__init__.py b/extensions/positron-python/python_files/posit/positron/tests/test_patch/__init__.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_patch/__init__.py rename to extensions/positron-python/python_files/posit/positron/tests/test_patch/__init__.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_patch/test_bokeh.py b/extensions/positron-python/python_files/posit/positron/tests/test_patch/test_bokeh.py similarity index 96% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_patch/test_bokeh.py rename to extensions/positron-python/python_files/posit/positron/tests/test_patch/test_bokeh.py index e49d61fc52f..b397b347c05 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_patch/test_bokeh.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_patch/test_bokeh.py @@ -5,7 +5,7 @@ from unittest.mock import Mock -from positron_ipykernel.positron_ipkernel import PositronShell +from positron.positron_ipkernel import PositronShell from ..conftest import TestSession diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_plots.py b/extensions/positron-python/python_files/posit/positron/tests/test_plots.py similarity index 97% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_plots.py rename to extensions/positron-python/python_files/posit/positron/tests/test_plots.py index 92bf0bc5369..35703cc13a4 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_plots.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_plots.py @@ -13,9 +13,9 @@ import pytest from PIL import Image -from positron_ipykernel.plot_comm import PlotSize, PlotUnit -from positron_ipykernel.plots import PlotsService -from positron_ipykernel.positron_ipkernel import PositronIPyKernel, _CommTarget +from positron.plot_comm import PlotSize, PlotUnit +from positron.plots import PlotsService +from positron.positron_ipkernel import PositronIPyKernel, _CommTarget from .conftest import DummyComm, PositronShell from .utils import ( @@ -38,7 +38,7 @@ def setup_positron_matplotlib_backend() -> None: # The backend is set in the kernel app, which isn't currently available in our tests, # so set it here too. - matplotlib.use("module://positron_ipykernel.matplotlib_backend") + matplotlib.use("module://positron.matplotlib_backend") @pytest.fixture(autouse=True) diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_positron_ipkernel.py b/extensions/positron-python/python_files/posit/positron/tests/test_positron_ipkernel.py similarity index 97% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_positron_ipkernel.py rename to extensions/positron-python/python_files/posit/positron/tests/test_positron_ipkernel.py index ed15e5bc05d..d4ac54970b2 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_positron_ipkernel.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_positron_ipkernel.py @@ -13,10 +13,10 @@ from ipykernel.compiler import get_tmp_directory from IPython.utils.syspathcontext import prepended_to_syspath -from positron_ipykernel.access_keys import encode_access_key -from positron_ipykernel.help import help -from positron_ipykernel.session_mode import SessionMode -from positron_ipykernel.utils import alias_home +from positron.access_keys import encode_access_key +from positron.help import help +from positron.session_mode import SessionMode +from positron.utils import alias_home from .conftest import PositronShell from .utils import assert_register_table_called @@ -318,7 +318,7 @@ def test_question_mark_help(shell: PositronShell, mock_help_service: Mock) -> No shell.run_cell("?") mock_help_service.show_help.assert_called_once_with( - "positron_ipykernel.utils.positron_ipykernel_usage" + "positron.utils.positron_usage" ) diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_positron_jedilsp.py b/extensions/positron-python/python_files/posit/positron/tests/test_positron_jedilsp.py similarity index 97% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_positron_jedilsp.py rename to extensions/positron-python/python_files/posit/positron/tests/test_positron_jedilsp.py index 9f038c6fb34..72f98001531 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_positron_jedilsp.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_positron_jedilsp.py @@ -14,9 +14,9 @@ import polars as pl import pytest -from positron_ipykernel._vendor import cattrs -from positron_ipykernel._vendor.jedi_language_server import jedi_utils -from positron_ipykernel._vendor.lsprotocol.types import ( +from positron._vendor import cattrs +from positron._vendor.jedi_language_server import jedi_utils +from positron._vendor.lsprotocol.types import ( ClientCapabilities, CompletionClientCapabilities, CompletionClientCapabilitiesCompletionItemType, @@ -33,10 +33,10 @@ TextDocumentItem, TextEdit, ) -from positron_ipykernel._vendor.pygls.workspace.text_document import TextDocument -from positron_ipykernel.help_comm import ShowHelpTopicParams -from positron_ipykernel.jedi import PositronInterpreter -from positron_ipykernel.positron_jedilsp import ( +from positron._vendor.pygls.workspace.text_document import TextDocument +from positron.help_comm import ShowHelpTopicParams +from positron.jedi import PositronInterpreter +from positron.positron_jedilsp import ( HelpTopicParams, PositronInitializationOptions, PositronJediLanguageServer, diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_pydoc.py b/extensions/positron-python/python_files/posit/positron/tests/test_pydoc.py similarity index 99% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_pydoc.py rename to extensions/positron-python/python_files/posit/positron/tests/test_pydoc.py index d600c533cd7..d486b93ca9c 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_pydoc.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_pydoc.py @@ -10,7 +10,7 @@ import pandas as pd import pytest -from positron_ipykernel.pydoc import ( +from positron.pydoc import ( _Attr, _compact_signature, _get_summary, diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_ui.py b/extensions/positron-python/python_files/posit/positron/tests/test_ui.py similarity index 98% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_ui.py rename to extensions/positron-python/python_files/posit/positron/tests/test_ui.py index 518f5cf34f3..f9934e09cf0 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_ui.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_ui.py @@ -14,9 +14,9 @@ import polars as pl import pytest -from positron_ipykernel.positron_ipkernel import PositronIPyKernel, PositronShell -from positron_ipykernel.ui import UiService -from positron_ipykernel.utils import alias_home +from positron.positron_ipkernel import PositronIPyKernel, PositronShell +from positron.ui import UiService +from positron.utils import alias_home from .conftest import DummyComm from .utils import ( diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_variables.py b/extensions/positron-python/python_files/posit/positron/tests/test_variables.py similarity index 96% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_variables.py rename to extensions/positron-python/python_files/posit/positron/tests/test_variables.py index f058d8327a9..5056837c51f 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/test_variables.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_variables.py @@ -14,14 +14,14 @@ import polars as pl import pytest -from positron_ipykernel import variables as variables_module -from positron_ipykernel.access_keys import encode_access_key -from positron_ipykernel.inspectors import get_inspector -from positron_ipykernel.positron_comm import JsonRpcErrorCode -from positron_ipykernel.positron_ipkernel import PositronIPyKernel -from positron_ipykernel.utils import JsonData, JsonRecord, not_none -from positron_ipykernel.variables import VariablesService, _summarize_variable -from positron_ipykernel.variables_comm import Variable +from positron import variables as variables_module +from positron.access_keys import encode_access_key +from positron.inspectors import get_inspector +from positron.positron_comm import JsonRpcErrorCode +from positron.positron_ipkernel import PositronIPyKernel +from positron.utils import JsonData, JsonRecord, not_none +from positron.variables import VariablesService, _summarize_variable +from positron.variables_comm import Variable from .conftest import DummyComm, PositronShell from .utils import ( @@ -116,7 +116,7 @@ def test_change_detection( def _assert_assigned(shell: PositronShell, value_code: str, variables_comm: DummyComm): # Test that the expected `update` message was sent with the # expected `assigned` value. - with patch("positron_ipykernel.variables.timestamp", return_value=0): + with patch("positron.variables.timestamp", return_value=0): # Remember if the user namespace had the 'x' value before the assignment. was_empty = "x" not in shell.user_ns @@ -185,7 +185,7 @@ def test_change_detection_over_limit(shell: PositronShell, variables_comm: Dummy def _do_list(variables_comm: DummyComm): msg = json_rpc_request("list", comm_id="dummy_comm_id") - with patch("positron_ipykernel.variables.timestamp", return_value=0): + with patch("positron.variables.timestamp", return_value=0): variables_comm.handle_msg(msg) # Check the structure of the message but let the caller verify the contents. @@ -238,7 +238,7 @@ def test_list_falls_back_on_variable_error( def NumberInspector(*args, **kwargs): raise Exception() - from positron_ipykernel.inspectors import INSPECTOR_CLASSES + from positron.inspectors import INSPECTOR_CLASSES monkeypatch.setitem(INSPECTOR_CLASSES, "number", NumberInspector) @@ -389,7 +389,7 @@ def _do_inspect(encoded_path: List[JsonData], variables_comm: DummyComm) -> List comm_id="dummy_comm_id", ) - with patch("positron_ipykernel.variables.timestamp", return_value=0): + with patch("positron.variables.timestamp", return_value=0): variables_comm.handle_msg(msg) # Check the structure of the message but let the caller verify the contents. diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/utils.py b/extensions/positron-python/python_files/posit/positron/tests/utils.py similarity index 96% rename from extensions/positron-python/python_files/positron/positron_ipykernel/tests/utils.py rename to extensions/positron-python/python_files/posit/positron/tests/utils.py index fc8080f6a90..2faf806af4f 100644 --- a/extensions/positron-python/python_files/positron/positron_ipykernel/tests/utils.py +++ b/extensions/positron-python/python_files/posit/positron/tests/utils.py @@ -9,8 +9,8 @@ from typing import Any, List, Optional, Set from unittest.mock import Mock -from positron_ipykernel._vendor.pydantic import BaseModel -from positron_ipykernel.utils import JsonData, JsonRecord +from positron._vendor.pydantic import BaseModel +from positron.utils import JsonData, JsonRecord def assert_pydantic_model_equal(actual: BaseModel, expected: BaseModel, exclude: Set[str]) -> None: diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/third_party.py b/extensions/positron-python/python_files/posit/positron/third_party.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/third_party.py rename to extensions/positron-python/python_files/posit/positron/third_party.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/ui.py b/extensions/positron-python/python_files/posit/positron/ui.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/ui.py rename to extensions/positron-python/python_files/posit/positron/ui.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/ui_comm.py b/extensions/positron-python/python_files/posit/positron/ui_comm.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/ui_comm.py rename to extensions/positron-python/python_files/posit/positron/ui_comm.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/utils.py b/extensions/positron-python/python_files/posit/positron/utils.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/utils.py rename to extensions/positron-python/python_files/posit/positron/utils.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/variables.py b/extensions/positron-python/python_files/posit/positron/variables.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/variables.py rename to extensions/positron-python/python_files/posit/positron/variables.py diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/variables_comm.py b/extensions/positron-python/python_files/posit/positron/variables_comm.py similarity index 100% rename from extensions/positron-python/python_files/positron/positron_ipykernel/variables_comm.py rename to extensions/positron-python/python_files/posit/positron/variables_comm.py diff --git a/extensions/positron-python/python_files/positron/positron_language_server.py b/extensions/positron-python/python_files/posit/positron_language_server.py similarity index 96% rename from extensions/positron-python/python_files/positron/positron_language_server.py rename to extensions/positron-python/python_files/posit/positron_language_server.py index 82678f39062..2de4b13592d 100644 --- a/extensions/positron-python/python_files/positron/positron_language_server.py +++ b/extensions/positron-python/python_files/posit/positron_language_server.py @@ -10,13 +10,13 @@ import os import sys -from positron_ipykernel.positron_ipkernel import ( +from positron.positron_ipkernel import ( PositronIPKernelApp, PositronIPyKernel, PositronShell, ) -from positron_ipykernel.positron_jedilsp import POSITRON -from positron_ipykernel.session_mode import SessionMode +from positron.positron_jedilsp import POSITRON +from positron.session_mode import SessionMode logger = logging.getLogger(__name__) diff --git a/extensions/positron-python/python_files/positron/test-requirements.txt b/extensions/positron-python/python_files/posit/test-requirements.txt similarity index 100% rename from extensions/positron-python/python_files/positron/test-requirements.txt rename to extensions/positron-python/python_files/posit/test-requirements.txt diff --git a/extensions/positron-python/python_files/pyproject.toml b/extensions/positron-python/python_files/pyproject.toml index 894d903d320..ce32a1f754a 100644 --- a/extensions/positron-python/python_files/pyproject.toml +++ b/extensions/positron-python/python_files/pyproject.toml @@ -2,7 +2,7 @@ max_line_length = 100 [tool.black] -include = 'positron\/.*.py$|positron\/positron_ipykernel\/.*.py$|positron\/positron_ipykernel\/test_positron_.*.py$' +include = 'positron\/.*.py$|posit\/positron\/.*.py$|posit\/positron\/test_positron_.*.py$' exclude = ''' ( @@ -10,7 +10,7 @@ exclude = ''' .data | .vscode | lib - | positron/positron_ipykernel/_vendor + | posit/positron/_vendor )/ ) ''' @@ -18,13 +18,13 @@ line-length = 100 [tool.isort] profile = "black" -extend_skip = ['positron/positron_ipykernel/_vendor'] -known_first_party = ['positron_ipykernel'] -known_third_party = ['positron_ipykernel._vendor'] +extend_skip = ['posit/positron/_vendor'] +known_first_party = ['positron'] +known_third_party = ['positron._vendor'] [tool.pyright] -exclude = ['lib', 'positron/positron_ipykernel/_vendor'] -extraPaths = ['lib/python', 'positron/positron_ipykernel/_vendor'] +exclude = ['lib', 'posit/positron/_vendor'] +extraPaths = ['lib/python', 'posit/positron/_vendor'] ignore = [ # Ignore all pre-existing code with issues 'get-pip.py', @@ -62,7 +62,7 @@ exclude = [ "tests/pytestadapter", # Ignore vendored dependencies 'lib/', - 'positron/positron_ipykernel/_vendor/', + 'posit/positron/_vendor/', # --- End Positron --- ] diff --git a/extensions/positron-python/scripts/patches/jedi-language-server.patch b/extensions/positron-python/scripts/patches/jedi-language-server.patch index f3826e41b42..ce4690fb07d 100644 --- a/extensions/positron-python/scripts/patches/jedi-language-server.patch +++ b/extensions/positron-python/scripts/patches/jedi-language-server.patch @@ -1,7 +1,7 @@ -diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi_language_server/jedi_utils.py b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi_language_server/jedi_utils.py +diff --git a/extensions/positron-python/python_files/posit/positron/_vendor/jedi_language_server/jedi_utils.py b/extensions/positron-python/python_files/posit/positron/_vendor/jedi_language_server/jedi_utils.py index 4f3ba7bd5..52524daa2 100644 ---- a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi_language_server/jedi_utils.py -+++ b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi_language_server/jedi_utils.py +--- a/extensions/positron-python/python_files/posit/positron/_vendor/jedi_language_server/jedi_utils.py ++++ b/extensions/positron-python/python_files/posit/positron/_vendor/jedi_language_server/jedi_utils.py @@ -12,9 +12,9 @@ from inspect import Parameter from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple @@ -42,10 +42,10 @@ index 4f3ba7bd5..52524daa2 100644 """Get LSP Diagnostic from Jedi SyntaxError.""" return Diagnostic( range=Range( -diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi_language_server/__init__.py b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi_language_server/__init__.py +diff --git a/extensions/positron-python/python_files/posit/positron/_vendor/jedi_language_server/__init__.py b/extensions/positron-python/python_files/posit/positron/_vendor/jedi_language_server/__init__.py index ba6eaf9fe..28266bd95 100644 ---- a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi_language_server/__init__.py -+++ b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi_language_server/__init__.py +--- a/extensions/positron-python/python_files/posit/positron/_vendor/jedi_language_server/__init__.py ++++ b/extensions/positron-python/python_files/posit/positron/_vendor/jedi_language_server/__init__.py @@ -1,5 +1,4 @@ """Jedi Language Server.""" diff --git a/extensions/positron-python/scripts/patches/jedi.patch b/extensions/positron-python/scripts/patches/jedi.patch index 077a5374ce2..1e9a7e268fc 100644 --- a/extensions/positron-python/scripts/patches/jedi.patch +++ b/extensions/positron-python/scripts/patches/jedi.patch @@ -1,7 +1,7 @@ -diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi/api/replstartup.py b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi/api/replstartup.py +diff --git a/extensions/positron-python/python_files/posit/positron/_vendor/jedi/api/replstartup.py b/extensions/positron-python/python_files/posit/positron/_vendor/jedi/api/replstartup.py index e0f23d19b..f30731476 100644 ---- a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi/api/replstartup.py -+++ b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi/api/replstartup.py +--- a/extensions/positron-python/python_files/posit/positron/_vendor/jedi/api/replstartup.py ++++ b/extensions/positron-python/python_files/posit/positron/_vendor/jedi/api/replstartup.py @@ -17,13 +17,13 @@ Then you will be able to use Jedi completer in your Python interpreter:: ..dex ..sert @@ -19,10 +19,10 @@ index e0f23d19b..f30731476 100644 # Note: try not to do many things here, as it will contaminate global # namespace of the interpreter. -diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi/inference/compiled/subprocess/__main__.py b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi/inference/compiled/subprocess/__main__.py +diff --git a/extensions/positron-python/python_files/posit/positron/_vendor/jedi/inference/compiled/subprocess/__main__.py b/extensions/positron-python/python_files/posit/positron/_vendor/jedi/inference/compiled/subprocess/__main__.py index f044e2ee1..beec3f0cf 100644 ---- a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi/inference/compiled/subprocess/__main__.py -+++ b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/jedi/inference/compiled/subprocess/__main__.py +--- a/extensions/positron-python/python_files/posit/positron/_vendor/jedi/inference/compiled/subprocess/__main__.py ++++ b/extensions/positron-python/python_files/posit/positron/_vendor/jedi/inference/compiled/subprocess/__main__.py @@ -9,12 +9,9 @@ del sys.path[0] @@ -34,7 +34,7 @@ index f044e2ee1..beec3f0cf 100644 - _parso_path = sys.argv[1] - # The paths are the directory that jedi and parso lie in. - return {'jedi': _jedi_path, 'parso': _parso_path} -+ return {"positron_ipykernel": _d(_d(_d(_d(_d(_d(_d(__file__)))))))} ++ return {"positron": _d(_d(_d(_d(_d(_d(_d(__file__)))))))} class _ExactImporter(MetaPathFinder): diff --git a/extensions/positron-python/scripts/patches/parso.patch b/extensions/positron-python/scripts/patches/parso.patch index 52ec34819b8..23b6511255c 100644 --- a/extensions/positron-python/scripts/patches/parso.patch +++ b/extensions/positron-python/scripts/patches/parso.patch @@ -2,10 +2,10 @@ We append `-Positron` to the `_VERSION_TAG` so that our cache directories don't installation in the user's environment. The vendored parso has a different import path than the user's, so using the same cache can cause unexpected errors. -diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/parso/cache.py b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/parso/cache.py +diff --git a/extensions/positron-python/python_files/posit/positron/_vendor/parso/cache.py b/extensions/positron-python/python_files/posit/positron/_vendor/parso/cache.py index 5592a9fdd..98b903aaa 100644 ---- a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/parso/cache.py -+++ b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/parso/cache.py +--- a/extensions/positron-python/python_files/posit/positron/_vendor/parso/cache.py ++++ b/extensions/positron-python/python_files/posit/positron/_vendor/parso/cache.py @@ -49,7 +49,7 @@ are regarded as incompatible. - A __slot__ of a class is changed. """ diff --git a/extensions/positron-python/scripts/patches/pydantic.patch b/extensions/positron-python/scripts/patches/pydantic.patch index 0be76d478ef..e42b3540a90 100644 --- a/extensions/positron-python/scripts/patches/pydantic.patch +++ b/extensions/positron-python/scripts/patches/pydantic.patch @@ -1,7 +1,7 @@ -diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pydantic/_hypothesis_plugin.py b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pydantic/_hypothesis_plugin.py +diff --git a/extensions/positron-python/python_files/posit/positron/_vendor/pydantic/_hypothesis_plugin.py b/extensions/positron-python/python_files/posit/positron/_vendor/pydantic/_hypothesis_plugin.py index 0c529620f..ce9df7a36 100644 ---- a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pydantic/_hypothesis_plugin.py -+++ b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pydantic/_hypothesis_plugin.py +--- a/extensions/positron-python/python_files/posit/positron/_vendor/pydantic/_hypothesis_plugin.py ++++ b/extensions/positron-python/python_files/posit/positron/_vendor/pydantic/_hypothesis_plugin.py @@ -33,7 +33,7 @@ from typing import Callable, Dict, Type, Union, cast, overload import hypothesis.strategies as st @@ -46,10 +46,10 @@ index 0c529620f..ce9df7a36 100644 st.tuples( st.integers(0, 255), st.integers(0, 255), -diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pydantic/_hypothesis_plugin.py b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pydantic/_hypothesis_plugin.py +diff --git a/extensions/positron-python/python_files/posit/positron/_vendor/pydantic/_hypothesis_plugin.py b/extensions/positron-python/python_files/posit/positron/_vendor/pydantic/_hypothesis_plugin.py index ce9df7a36..93ff17077 100644 ---- a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pydantic/_hypothesis_plugin.py -+++ b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pydantic/_hypothesis_plugin.py +--- a/extensions/positron-python/python_files/posit/positron/_vendor/pydantic/_hypothesis_plugin.py ++++ b/extensions/positron-python/python_files/posit/positron/_vendor/pydantic/_hypothesis_plugin.py @@ -34,7 +34,7 @@ import hypothesis.strategies as st import pydantic diff --git a/extensions/positron-python/scripts/patches/pygments.patch b/extensions/positron-python/scripts/patches/pygments.patch index 7603a9b8bb2..86899a1c7a6 100644 --- a/extensions/positron-python/scripts/patches/pygments.patch +++ b/extensions/positron-python/scripts/patches/pygments.patch @@ -1,7 +1,7 @@ -diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/cmdline.py b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/cmdline.py +diff --git a/extensions/positron-python/python_files/posit/positron/_vendor/pygments/cmdline.py b/extensions/positron-python/python_files/posit/positron/_vendor/pygments/cmdline.py index 435231e65..b75a9d7f4 100644 ---- a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/cmdline.py -+++ b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/cmdline.py +--- a/extensions/positron-python/python_files/posit/positron/_vendor/pygments/cmdline.py ++++ b/extensions/positron-python/python_files/posit/positron/_vendor/pygments/cmdline.py @@ -469,11 +469,11 @@ def main_inner(parser, argns): outfile = UnclosingTextIOWrapper(outfile, encoding=fmter.encoding) fmter.encoding = None @@ -16,10 +16,10 @@ index 435231e65..b75a9d7f4 100644 outfile, convert=None, strip=None, autoreset=False, wrap=True) # When using the LaTeX formatter and the option `escapeinside` is -diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/__main__.py b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/__main__.py +diff --git a/extensions/positron-python/python_files/posit/positron/_vendor/pygments/__main__.py b/extensions/positron-python/python_files/posit/positron/_vendor/pygments/__main__.py index 5eb2c747a..b8b833ec4 100644 ---- a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/__main__.py -+++ b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/__main__.py +--- a/extensions/positron-python/python_files/posit/positron/_vendor/pygments/__main__.py ++++ b/extensions/positron-python/python_files/posit/positron/_vendor/pygments/__main__.py @@ -9,9 +9,9 @@ """ @@ -32,10 +32,10 @@ index 5eb2c747a..b8b833ec4 100644 + sys.exit(main(sys.argv)) except KeyboardInterrupt: sys.exit(1) -diff --git a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/sphinxext.py b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/sphinxext.py +diff --git a/extensions/positron-python/python_files/posit/positron/_vendor/pygments/sphinxext.py b/extensions/positron-python/python_files/posit/positron/_vendor/pygments/sphinxext.py index f935688f1..4c293489f 100644 ---- a/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/sphinxext.py -+++ b/extensions/positron-python/python_files/positron/positron_ipykernel/_vendor/pygments/sphinxext.py +--- a/extensions/positron-python/python_files/posit/positron/_vendor/pygments/sphinxext.py ++++ b/extensions/positron-python/python_files/posit/positron/_vendor/pygments/sphinxext.py @@ -91,7 +91,7 @@ class PygmentsDoc(Directive): The columns are the lexer name, the extensions handled by this lexer (or "None"), the aliases and a link to the lexer class.""" diff --git a/extensions/positron-python/scripts/vendor.py b/extensions/positron-python/scripts/vendor.py index fbfaa1a64a8..a0b2fc839f7 100644 --- a/extensions/positron-python/scripts/vendor.py +++ b/extensions/positron-python/scripts/vendor.py @@ -25,8 +25,8 @@ def main() -> None: cfg = Configuration( base_directory=project_path, - destination=Path("python_files/positron/positron_ipykernel/_vendor/"), - namespace="positron_ipykernel._vendor", + destination=Path("python_files/posit/positron/_vendor/"), + namespace="positron._vendor", requirements=Path( "python_files/jedilsp_requirements/requirements.txt" ), @@ -35,7 +35,7 @@ def main() -> None: # Fix pygments.lexers._mapping strings, via: https://github.com/pypa/pip/blob/main/pyproject.toml { "match": r"\('pygments\.lexers\.", - "replace": r"('positron_ipykernel._vendor.pygments.lexers.", + "replace": r"('positron._vendor.pygments.lexers.", } ], ) diff --git a/extensions/positron-python/src/client/positron/manager.ts b/extensions/positron-python/src/client/positron/manager.ts index 30b863efe83..b8c8c080b29 100644 --- a/extensions/positron-python/src/client/positron/manager.ts +++ b/extensions/positron-python/src/client/positron/manager.ts @@ -157,7 +157,7 @@ export class PythonRuntimeManager implements IPythonRuntimeManager { } const command = extraData.pythonPath; - const lsScriptPath = path.join(EXTENSION_ROOT_DIR, 'python_files', 'positron', 'positron_language_server.py'); + const lsScriptPath = path.join(EXTENSION_ROOT_DIR, 'python_files', 'posit', 'positron_language_server.py'); const args = [ command, lsScriptPath, diff --git a/extensions/positron-reticulate/src/extension.ts b/extensions/positron-reticulate/src/extension.ts index 018a8731717..eac11aa62ea 100644 --- a/extensions/positron-reticulate/src/extension.ts +++ b/extensions/positron-reticulate/src/extension.ts @@ -798,7 +798,7 @@ export function activate(context: vscode.ExtensionContext) { if (!api) { throw new Error('Failed to find the Positron Python extension API.'); } - return api.extensionPath + '/python_files/positron/positron_ipykernel'; + return api.extensionPath + '/python_files/posit/positron'; }) ); diff --git a/positron/comms/generate-comms.ts b/positron/comms/generate-comms.ts index bb0022fc8c7..4d8eb92a335 100644 --- a/positron/comms/generate-comms.ts +++ b/positron/comms/generate-comms.ts @@ -46,7 +46,7 @@ const tsOutputDir = `${__dirname}/../../src/vs/workbench/services/languageRuntim const rustOutputDir = `${__dirname}/../../../ark/crates/amalthea/src/comm`; /// The directory to write the generated Python files to -const pythonOutputDir = `${__dirname}/../../extensions/positron-python/python_files/positron/positron_ipykernel`; +const pythonOutputDir = `${__dirname}/../../extensions/positron-python/python_files/posit/positron`; const year = new Date().getFullYear(); From bfcc83986bb5fa808c61bf355300e36c68578f95 Mon Sep 17 00:00:00 2001 From: isabelizimm Date: Wed, 22 Jan 2025 12:09:18 -0500 Subject: [PATCH 2/5] update path for tests --- .github/workflows/positron-python-ci.yml | 4 ++-- extensions/positron-python/README.md | 4 ++-- extensions/positron-python/noxfile-positron.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/positron-python-ci.yml b/.github/workflows/positron-python-ci.yml index 92bfbcf848f..9cbed6b6c7f 100644 --- a/.github/workflows/positron-python-ci.yml +++ b/.github/workflows/positron-python-ci.yml @@ -94,7 +94,7 @@ jobs: run: | python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy python -m pip install --upgrade -r build/test-requirements.txt - python -m pip install --upgrade -r ./python_files/positron/pinned-test-requirements.txt + python -m pip install --upgrade -r ./python_files/posit/pinned-test-requirements.txt - name: Run Pyright uses: jakebailey/pyright-action@v2 @@ -175,7 +175,7 @@ jobs: run: python scripts/vendor.py - name: Install Positron IPyKernel test requirements - run: python -m pip install --prefer-binary --upgrade -r python_files/positron/pinned-test-requirements.txt + run: python -m pip install --prefer-binary --upgrade -r python_files/posit/pinned-test-requirements.txt - name: Run Positron IPyKernel unit tests run: pytest python_files/positron diff --git a/extensions/positron-python/README.md b/extensions/positron-python/README.md index 8e6b5105e23..c56e3aba05d 100644 --- a/extensions/positron-python/README.md +++ b/extensions/positron-python/README.md @@ -47,11 +47,11 @@ pyright Install the test requirements that are used in CI: ```sh -pip install -r python_files/positron/pinned-test-requirements.txt +pip install -r python_files/posit/pinned-test-requirements.txt ``` Run Positron's unit tests with [pytest](https://docs.pytest.org/en/8.0.x/): ```sh -python -m pytest python_files/positron/ +python -m pytest python_files/posit/ ``` diff --git a/extensions/positron-python/noxfile-positron.py b/extensions/positron-python/noxfile-positron.py index f9a9cab25dd..d0a23c8a932 100644 --- a/extensions/positron-python/noxfile-positron.py +++ b/extensions/positron-python/noxfile-positron.py @@ -12,7 +12,7 @@ @nox.parametrize('torch', ['1.12.1']) @nox.parametrize('lightning', ['2.1.4']) def test_minimum_reqs(session, pandas, torch, lightning): - session.install("-r", "python_files/positron/pinned-test-requirements.txt") + session.install("-r", "python_files/posit/pinned-test-requirements.txt") session.install('--force-reinstall', f'pandas=={pandas}') session.install('--force-reinstall', f'torch=={torch}') session.install('--force-reinstall', f'lightning=={lightning}') From b4fa6ddd8dd1eca3f157f35e6a5d84ac87cf6815 Mon Sep 17 00:00:00 2001 From: isabelizimm Date: Wed, 22 Jan 2025 12:25:10 -0500 Subject: [PATCH 3/5] lint --- .github/workflows/positron-python-ci.yml | 2 +- .github/workflows/positron-python-nightly.yml | 4 ++-- extensions/positron-python/package.json | 2 +- .../python_files/posit/positron/jedi.py | 15 +++++++-------- .../positron/tests/test_positron_ipkernel.py | 4 +--- extensions/positron-reticulate/src/extension.ts | 2 +- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/positron-python-ci.yml b/.github/workflows/positron-python-ci.yml index 9cbed6b6c7f..1f13e43265a 100644 --- a/.github/workflows/positron-python-ci.yml +++ b/.github/workflows/positron-python-ci.yml @@ -178,7 +178,7 @@ jobs: run: python -m pip install --prefer-binary --upgrade -r python_files/posit/pinned-test-requirements.txt - name: Run Positron IPyKernel unit tests - run: pytest python_files/positron + run: pytest python_files/posit python-minimum-dependencies: name: Test Minimum Positron IPyKernel Dependencies diff --git a/.github/workflows/positron-python-nightly.yml b/.github/workflows/positron-python-nightly.yml index 1dcacbe3557..3e576ba1b69 100644 --- a/.github/workflows/positron-python-nightly.yml +++ b/.github/workflows/positron-python-nightly.yml @@ -117,10 +117,10 @@ jobs: run: python scripts/vendor.py - name: Install latest versions Positron IPyKernel test requirements - run: python -m pip install --prefer-binary --upgrade -r python_files/positron/test-requirements.txt + run: python -m pip install --prefer-binary --upgrade -r python_files/posit/test-requirements.txt - name: Run Positron IPyKernel unit tests - run: pytest python_files/positron --junit-xml=python-test-results.xml + run: pytest python_files/posit --junit-xml=python-test-results.xml - name: Upload test artifacts uses: actions/upload-artifact@v4 diff --git a/extensions/positron-python/package.json b/extensions/positron-python/package.json index c7700c42f37..ab0c540fff2 100644 --- a/extensions/positron-python/package.json +++ b/extensions/positron-python/package.json @@ -1836,7 +1836,7 @@ "updateBuildNumber": "gulp updateBuildNumber", "verifyBundle": "gulp verifyBundle", "webpack": "webpack", - "positron:testMinimumPythonReqs": "nox --noxfile noxfile-positron.py -- python_files/positron" + "positron:testMinimumPythonReqs": "nox --noxfile noxfile-positron.py -- python_files/posit" }, "dependencies": { "@iarna/toml": "^2.2.5", diff --git a/extensions/positron-python/python_files/posit/positron/jedi.py b/extensions/positron-python/python_files/posit/positron/jedi.py index 281d2d40365..b6e2e9e8997 100644 --- a/extensions/positron-python/python_files/posit/positron/jedi.py +++ b/extensions/positron-python/python_files/posit/positron/jedi.py @@ -47,17 +47,16 @@ _sentinel = object() # update Jedi cache to not conflict with other Jedi instances -if platform.system().lower() == 'windows': +if platform.system().lower() == "windows": _cache_directory = os.path.join( - os.getenv('LOCALAPPDATA') or os.path.expanduser('~'), - 'Jedi', - 'Positron-Jedi', + os.getenv("LOCALAPPDATA") or os.path.expanduser("~"), + "Jedi", + "Positron-Jedi", ) -elif platform.system().lower() == 'darwin': - _cache_directory = os.path.join('~', 'Library', 'Caches', 'Positron-Jedi') +elif platform.system().lower() == "darwin": + _cache_directory = os.path.join("~", "Library", "Caches", "Positron-Jedi") else: - _cache_directory = os.path.join(os.getenv('XDG_CACHE_HOME') or '~/.cache', - 'positron-jedi') + _cache_directory = os.path.join(os.getenv("XDG_CACHE_HOME") or "~/.cache", "positron-jedi") settings.cache_directory = os.path.expanduser(_cache_directory) diff --git a/extensions/positron-python/python_files/posit/positron/tests/test_positron_ipkernel.py b/extensions/positron-python/python_files/posit/positron/tests/test_positron_ipkernel.py index d4ac54970b2..097eba7a7da 100644 --- a/extensions/positron-python/python_files/posit/positron/tests/test_positron_ipkernel.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_positron_ipkernel.py @@ -317,9 +317,7 @@ def test_question_mark_help(shell: PositronShell, mock_help_service: Mock) -> No shell.run_cell("?") - mock_help_service.show_help.assert_called_once_with( - "positron.utils.positron_usage" - ) + mock_help_service.show_help.assert_called_once_with("positron.utils.positron_usage") def test_console_warning(shell: PositronShell, warning_kwargs): diff --git a/extensions/positron-reticulate/src/extension.ts b/extensions/positron-reticulate/src/extension.ts index eac11aa62ea..6d5527e27ae 100644 --- a/extensions/positron-reticulate/src/extension.ts +++ b/extensions/positron-reticulate/src/extension.ts @@ -462,7 +462,7 @@ class ReticulateRuntimeSession implements positron.LanguageRuntimeSession { const profileFile = session.state.profileFile; const logLevel = 'debug'; - const kernelPath = `${__dirname}/../../positron-python/python_files/positron/positron_language_server.py`; + const kernelPath = `${__dirname}/../../positron-python/python_files/posit/positron_language_server.py`; if (!this.rSession) { kernel.log('No R session :('); From aa263f5bbf40bcbdd7f5639a53d49dc8d63b2926 Mon Sep 17 00:00:00 2001 From: isabelizimm Date: Wed, 22 Jan 2025 12:31:50 -0500 Subject: [PATCH 4/5] keep positron_ipykernel_usage --- .../python_files/posit/positron/tests/test_positron_ipkernel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/positron-python/python_files/posit/positron/tests/test_positron_ipkernel.py b/extensions/positron-python/python_files/posit/positron/tests/test_positron_ipkernel.py index 097eba7a7da..fda0c8fa5a0 100644 --- a/extensions/positron-python/python_files/posit/positron/tests/test_positron_ipkernel.py +++ b/extensions/positron-python/python_files/posit/positron/tests/test_positron_ipkernel.py @@ -317,7 +317,7 @@ def test_question_mark_help(shell: PositronShell, mock_help_service: Mock) -> No shell.run_cell("?") - mock_help_service.show_help.assert_called_once_with("positron.utils.positron_usage") + mock_help_service.show_help.assert_called_once_with("positron.utils.positron_ipykernel_usage") def test_console_warning(shell: PositronShell, warning_kwargs): From d90bdbe1b3eb9f90e9ea63706fcd8e6e650aa031 Mon Sep 17 00:00:00 2001 From: isabelizimm Date: Wed, 22 Jan 2025 12:43:15 -0500 Subject: [PATCH 5/5] add comment on jedi.setings.cache_directory --- extensions/positron-python/python_files/posit/positron/jedi.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/positron-python/python_files/posit/positron/jedi.py b/extensions/positron-python/python_files/posit/positron/jedi.py index b6e2e9e8997..1d096b044ea 100644 --- a/extensions/positron-python/python_files/posit/positron/jedi.py +++ b/extensions/positron-python/python_files/posit/positron/jedi.py @@ -47,6 +47,8 @@ _sentinel = object() # update Jedi cache to not conflict with other Jedi instances +# adapted from jedi.settings.cache_directory + if platform.system().lower() == "windows": _cache_directory = os.path.join( os.getenv("LOCALAPPDATA") or os.path.expanduser("~"),