Merge remote-tracking branch 'origin/main' into aus/command

Author: austin3dickey

.github/workflows/positron-python-ci.yml

@@ -167,7 +167,11 @@ jobs:
         run: uv pip install -r build/test-requirements.txt
 
       - name: Run Python unit tests
-        run: uv run python_files/tests/run_all.py
+        # `--active` targets the setup-uv activated environment. As of uv 0.12.0,
+        # `uv run <script>` discovers the project relative to the script path, so
+        # this would otherwise pick python_files/.venv (which lacks pytest) instead
+        # of the active venv where dependencies were installed. See astral-sh/uv#20225.
+        run: uv run --active python_files/tests/run_all.py
 
   positron-ipykernel-tests:
     name: Test Positron IPyKernel

.github/workflows/positron-python-nightly.yml

@@ -73,7 +73,11 @@ jobs:
         run: uv pip install -r build/test-requirements.txt
 
       - name: Run Python unit tests
-        run: uv run python_files/tests/run_all.py --junit-xml=python-unit-test-results.xml
+        # `--active` targets the setup-uv activated environment. As of uv 0.12.0,
+        # `uv run <script>` discovers the project relative to the script path, so
+        # this would otherwise pick python_files/.venv (which lacks pytest) instead
+        # of the active venv where dependencies were installed. See astral-sh/uv#20225.
+        run: uv run --active python_files/tests/run_all.py --junit-xml=python-unit-test-results.xml
 
       - name: Upload test artifacts
         uses: actions/upload-artifact@v7

.github/workflows/test-tag-paths-map.json

@@ -121,12 +121,19 @@
   "src/vs/editor/contrib/positronEditorActions/": ["@:editor-action-bar"],
   "src/vs/editor/contrib/positronHelp/": ["@:help"],
   "src/vs/editor/contrib/positronStatementRange/": [],
+  "src/vs/platform/extensionManagement/": [],
+  "src/vs/platform/extensionManagement/common/positronGalleryTelemetry.ts": ["@:extensions"],
+  "src/vs/platform/extensionManagement/node/positronBootstrapExtensionsInitializer.ts": ["@:extensions"],
+  "src/vs/platform/extensions/": [],
+  "src/vs/platform/extensions/common/positronExtensionValidator.ts": ["@:extensions"],
   "src/vs/platform/positronActionBar/": [],
   "src/vs/platform/positronAiProvider/": ["@:assistant"],
   "src/vs/platform/positronHeadlessLanguageModel/": ["@:positron-notebooks"],
   "src/vs/platform/positronIdleTracking/": [],
   "src/vs/platform/positronMemoryUsage/": ["@:variables"],
   "src/vs/platform/update/": [],
+  "src/vs/workbench/browser/actions/": [],
+  "src/vs/workbench/browser/actions/positronActions.ts": ["@:new-folder-flow"],
   "src/vs/workbench/browser/parts/editor/editorActionBar": ["@:editor-action-bar"],
   "src/vs/workbench/browser/parts/positronTopActionBar/": ["@:top-action-bar"],
   "src/vs/workbench/browser/positronAnsiRenderer/": ["@:console"],
@@ -138,5 +145,19 @@
   "src/vs/workbench/browser/positronList/": ["@:packages-pane"],
   "src/vs/workbench/browser/positronTree/": ["@:connections"],
   "src/vs/workbench/browser/positronViewPane/": [],
-  "src/vs/workbench/common/positron/": []
+  "src/vs/workbench/common/positron/": [],
+  "src/vs/workbench/contrib/extensions/": [],
+  "src/vs/workbench/contrib/extensions/browser/positronCompatibleVersion.ts": ["@:extensions"],
+  "src/vs/workbench/contrib/extensions/common/positronCustomGalleryProbe.ts": ["@:extensions"],
+  "src/vs/workbench/contrib/extensions/electron-browser/positronCustomGalleryValidation.ts": ["@:extensions"],
+  "src/vs/workbench/contrib/inlineChat/": [],
+  "src/vs/workbench/contrib/inlineChat/browser/positronNotebookUtils.ts": ["@:positron-notebooks", "@:assistant"],
+  "src/vs/workbench/contrib/preferences/": [],
+  "src/vs/workbench/contrib/preferences/common/positronSettingBadges.ts": ["@:vscode-settings"],
+  "src/vs/workbench/contrib/welcomeGettingStarted/": [],
+  "src/vs/workbench/contrib/welcomeGettingStarted/browser/media/positronGettingStarted.css": ["@:welcome"],
+  "src/vs/workbench/contrib/welcomeGettingStarted/browser/positronWelcome": ["@:welcome"],
+  "src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedPositronNotebookContent.ts": ["@:welcome"],
+  "src/vs/workbench/services/themes/": [],
+  "src/vs/workbench/services/themes/browser/positronColorThemeFilter.ts": []
 }

extensions/positron-python/python_files/posit/positron/tests/conftest.py

@@ -3,7 +3,6 @@
 # Licensed under the Elastic License 2.0. See LICENSE.txt for license information.
 #
 
-from http.server import HTTPServer
 from typing import Iterable
 from unittest.mock import MagicMock, Mock
 
@@ -165,27 +164,6 @@ def mock_help_service(shell: PositronShell, monkeypatch: pytest.MonkeyPatch) ->
     return mock
 
 
-@pytest.fixture
-def mock_displayhook(shell: PositronShell, monkeypatch: pytest.MonkeyPatch) -> Mock:
-    mock = Mock()
-    monkeypatch.setattr(shell, "displayhook", mock)
-    return mock
-
-
-@pytest.fixture
-def mock_display_pub(shell: PositronShell, monkeypatch: pytest.MonkeyPatch) -> Mock:
-    mock = Mock()
-    monkeypatch.setattr(shell, "display_pub", mock)
-    return mock
-
-
-@pytest.fixture
-def mock_handle_request(monkeypatch: pytest.MonkeyPatch) -> Mock:
-    mock = Mock()
-    monkeypatch.setattr(HTTPServer, "handle_request", mock)
-    return mock
-
-
 @pytest.fixture
 def variables_service(kernel: PositronIPyKernel) -> VariablesService:
     """The Positron variables service."""

extensions/positron-python/python_files/posit/positron/tests/test_patch/test_bokeh.py

@@ -3,9 +3,8 @@
 # Licensed under the Elastic License 2.0. See LICENSE.txt for license information.
 #
 
-from unittest.mock import Mock
-
 import pytest
+from IPython.utils.capture import capture_output
 
 from positron.positron_ipkernel import PositronShell
 
@@ -15,31 +14,29 @@
 
 
 @pytest.mark.usefixtures("enable_bokeh_output_notebook")
-def test_bokeh_mime_tagging(shell: PositronShell, mock_display_pub: Mock):
+def test_bokeh_mime_tagging(shell: PositronShell):
     """
     Test mime tagging.
 
     Test to make sure that the send message function in bokeh is patched to append a mime-type
     on messages that the front-end will use to know that the data coming over should be replayed in
     multiple steps.
     """
-    shell.run_cell(
-        """\
-from bokeh.plotting import figure, show
-p = figure(title="Simple line example", x_axis_label='x', y_axis_label='y')
-p.line([1, 2, 3, 4, 5], [6, 7, 2, 4, 5], legend_label="Temp.", line_width=2)
-show(p)
-"""
-    )
-
-    calls = mock_display_pub.publish.call_args_list
+    with capture_output() as captured:
+        shell.run_cell(
+            """\
+    from bokeh.plotting import figure, show
+    p = figure(title="Simple line example", x_axis_label='x', y_axis_label='y')
+    p.line([1, 2, 3, 4, 5], [6, 7, 2, 4, 5], legend_label="Temp.", line_width=2)
+    show(p)
+    """
+        )
 
     # Assert that one of the calls has the MIME_TYPE_POSITRON_WEBVIEW_FLAG key in it along with a
     # text/html key
     assert any(
-        MIME_TYPE_POSITRON_WEBVIEW_FLAG in call.kwargs["data"]
-        and "text/html" in call.kwargs["data"]
-        for call in calls
+        MIME_TYPE_POSITRON_WEBVIEW_FLAG in output.data and "text/html" in output.data
+        for output in captured.outputs
     )