From 39e2bee9d926ab0bb0780d44f98f659f2710de65 Mon Sep 17 00:00:00 2001 From: Eleanor Boyd Date: Mon, 26 Feb 2024 13:46:21 -0800 Subject: [PATCH 1/3] skip tests, pytest upstream regression (#22974) Short-term fix to stop CI from failing due to a regression upstream from pytest. See issue for details: https://github.com/microsoft/vscode-python/issues/22965. --- pythonFiles/tests/pytestadapter/test_discovery.py | 8 ++++++++ pythonFiles/tests/pytestadapter/test_execution.py | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/pythonFiles/tests/pytestadapter/test_discovery.py b/pythonFiles/tests/pytestadapter/test_discovery.py index b28a2b307ae2..a1f4e4f266ae 100644 --- a/pythonFiles/tests/pytestadapter/test_discovery.py +++ b/pythonFiles/tests/pytestadapter/test_discovery.py @@ -18,6 +18,10 @@ from .helpers import TEST_DATA_PATH, runner, runner_with_cwd, create_symlink +@pytest.mark.skipif( + sys.platform == "win32", + reason="See https://github.com/microsoft/vscode-python/issues/22965", +) def test_import_error(tmp_path): """Test pytest discovery on a file that has a pytest marker but does not import pytest. @@ -59,6 +63,10 @@ def test_import_error(tmp_path): assert False +@pytest.mark.skipif( + sys.platform == "win32", + reason="See https://github.com/microsoft/vscode-python/issues/22965", +) def test_syntax_error(tmp_path): """Test pytest discovery on a file that has a syntax error. diff --git a/pythonFiles/tests/pytestadapter/test_execution.py b/pythonFiles/tests/pytestadapter/test_execution.py index 1defe2f52b82..a8336089d0a9 100644 --- a/pythonFiles/tests/pytestadapter/test_execution.py +++ b/pythonFiles/tests/pytestadapter/test_execution.py @@ -6,6 +6,7 @@ from typing import Any, Dict, List import pytest +import sys from tests.pytestadapter import expected_execution_test_output @@ -71,6 +72,10 @@ def test_rootdir_specified(): assert actual_result_dict == expected_const +@pytest.mark.skipif( + sys.platform == "win32", + reason="See https://github.com/microsoft/vscode-python/issues/22965", +) def test_syntax_error_execution(tmp_path): """Test pytest execution on a file that has a syntax error. From 212339c02f39142ece93d768ae4cbf46ee0d53a9 Mon Sep 17 00:00:00 2001 From: Anthony Kim Date: Mon, 26 Feb 2024 10:27:36 -0800 Subject: [PATCH 2/3] bump release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 172505674beb..871489b89077 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "python", - "version": "2024.1.0-dev", + "version": "2024.2.0-rc", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "python", - "version": "2024.1.0-dev", + "version": "2024.2.0-rc", "license": "MIT", "dependencies": { "@iarna/toml": "^2.2.5", diff --git a/package.json b/package.json index efe8cba4f5d6..02339c7e00f2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "python", "displayName": "Python", "description": "IntelliSense (Pylance), Linting, Debugging (Python Debugger), code formatting, refactoring, unit tests, and more.", - "version": "2024.1.0-dev", + "version": "2024.2.0-rc", "featureFlags": { "usingNewInterpreterStorage": true }, From d4852fc6cb931f1ed74e4745d3428f6c182dabd1 Mon Sep 17 00:00:00 2001 From: Anthony Kim Date: Mon, 26 Feb 2024 10:36:50 -0800 Subject: [PATCH 3/3] update debugger version --- pythonFiles/install_debugpy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonFiles/install_debugpy.py b/pythonFiles/install_debugpy.py index 9377d00237d7..c217e81fd219 100644 --- a/pythonFiles/install_debugpy.py +++ b/pythonFiles/install_debugpy.py @@ -13,7 +13,7 @@ DEBUGGER_DEST = os.path.join(EXTENSION_ROOT, "pythonFiles", "lib", "python") DEBUGGER_PACKAGE = "debugpy" DEBUGGER_PYTHON_ABI_VERSIONS = ("cp310",) -DEBUGGER_VERSION = "1.8.0" # can also be "latest" +DEBUGGER_VERSION = "1.8.1" # can also be "latest" def _contains(s, parts=()):