From 92331b73ba2e14b376fd573a8ae27a3fee875238 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Thu, 2 Feb 2023 11:40:39 -0800 Subject: [PATCH] Update version for release (#20630) --- package-lock.json | 4 ++-- package.json | 2 +- pythonFiles/testing_tools/adapter/info.py | 1 - pythonFiles/testing_tools/adapter/pytest/_discovery.py | 2 +- .../tests/testing_tools/adapter/pytest/test_discovery.py | 5 +---- pythonFiles/tests/testing_tools/adapter/test___main__.py | 1 - pythonFiles/tests/testing_tools/adapter/test_discovery.py | 1 - pythonFiles/unittestadapter/execution.py | 1 - 8 files changed, 5 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 63c3010b8451..ec3780f81074 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "python", - "version": "2023.2.0-rc", + "version": "2023.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "python", - "version": "2023.2.0-rc", + "version": "2023.2.0", "license": "MIT", "dependencies": { "@iarna/toml": "^2.2.5", diff --git a/package.json b/package.json index 0e09bbb86c4e..ed4ce1bcba87 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "python", "displayName": "Python", "description": "IntelliSense (Pylance), Linting, Debugging (multi-threaded, remote), Jupyter Notebooks, code formatting, refactoring, unit tests, and more.", - "version": "2023.2.0-rc", + "version": "2023.2.0", "featureFlags": { "usingNewInterpreterStorage": true }, diff --git a/pythonFiles/testing_tools/adapter/info.py b/pythonFiles/testing_tools/adapter/info.py index f99ce0b6f9a2..d518a29dd97a 100644 --- a/pythonFiles/testing_tools/adapter/info.py +++ b/pythonFiles/testing_tools/adapter/info.py @@ -27,7 +27,6 @@ def __init__(self, *args, **kwargs): class ParentInfo(namedtuple("ParentInfo", "id kind name root relpath parentid")): - KINDS = ("folder", "file", "suite", "function", "subtest") def __new__(cls, id, kind, name, root=None, relpath=None, parentid=None): diff --git a/pythonFiles/testing_tools/adapter/pytest/_discovery.py b/pythonFiles/testing_tools/adapter/pytest/_discovery.py index 34312dcc1997..c9a96abeb6ca 100644 --- a/pythonFiles/testing_tools/adapter/pytest/_discovery.py +++ b/pythonFiles/testing_tools/adapter/pytest/_discovery.py @@ -26,7 +26,7 @@ def discover( pytestargs = _adjust_pytest_args(pytestargs) # We use this helper rather than "-pno:terminal" due to possible # platform-dependent issues. - with (util.hide_stdio() if hidestdio else util.noop_cm()) as stdio: + with util.hide_stdio() if hidestdio else util.noop_cm() as stdio: ec = _pytest_main(pytestargs, [_plugin]) # See: https://docs.pytest.org/en/latest/usage.html#possible-exit-codes if ec == 5: diff --git a/pythonFiles/tests/testing_tools/adapter/pytest/test_discovery.py b/pythonFiles/tests/testing_tools/adapter/pytest/test_discovery.py index c3b8a2d679d1..83eeaa1f9062 100644 --- a/pythonFiles/tests/testing_tools/adapter/pytest/test_discovery.py +++ b/pythonFiles/tests/testing_tools/adapter/pytest/test_discovery.py @@ -46,7 +46,6 @@ def main(self, args, plugins): class StubPlugin(util.StubProxy): - _started = True def __init__(self, stub=None, tests=None): @@ -66,7 +65,6 @@ def func(*args, **kwargs): class StubDiscoveredTests(util.StubProxy): - NOT_FOUND = object() def __init__(self, stub=None): @@ -105,7 +103,6 @@ def __init__(self, name): class StubPytestItem(util.StubProxy): - _debugging = False _hasfunc = True @@ -218,6 +215,7 @@ def normcase(path): else: raise NotImplementedError + ########## def _fix_fileid(*args): return adapter_util.fix_fileid( @@ -332,7 +330,6 @@ def ret(args, plugins): class DiscoverTests(unittest.TestCase): - DEFAULT_ARGS = [ "--collect-only", ] diff --git a/pythonFiles/tests/testing_tools/adapter/test___main__.py b/pythonFiles/tests/testing_tools/adapter/test___main__.py index d0a778c1d024..ebdb5f32bb19 100644 --- a/pythonFiles/tests/testing_tools/adapter/test___main__.py +++ b/pythonFiles/tests/testing_tools/adapter/test___main__.py @@ -115,7 +115,6 @@ def test_unsupported_tool(self): class MainTests(unittest.TestCase): - # TODO: We could use an integration test for pytest.discover(). def test_discover(self): diff --git a/pythonFiles/tests/testing_tools/adapter/test_discovery.py b/pythonFiles/tests/testing_tools/adapter/test_discovery.py index ec3d198b0108..890f73a5921d 100644 --- a/pythonFiles/tests/testing_tools/adapter/test_discovery.py +++ b/pythonFiles/tests/testing_tools/adapter/test_discovery.py @@ -11,7 +11,6 @@ def _fix_nodeid(nodeid): - nodeid = nodeid.replace("\\", "/") if not nodeid.startswith("./"): nodeid = "./" + nodeid diff --git a/pythonFiles/unittestadapter/execution.py b/pythonFiles/unittestadapter/execution.py index a016ff1af9ec..a926bcdcc09e 100644 --- a/pythonFiles/unittestadapter/execution.py +++ b/pythonFiles/unittestadapter/execution.py @@ -60,7 +60,6 @@ class TestOutcomeEnum(str, enum.Enum): class UnittestTestResult(unittest.TextTestResult): - formatted: Dict[str, Dict[str, str | None]] = dict() def startTest(self, test: unittest.TestCase):