From 1bc72ba1e1f25600cb272832cfd13e1514c98ef4 Mon Sep 17 00:00:00 2001 From: eleanorjboyd Date: Thu, 31 Oct 2024 14:34:01 -0700 Subject: [PATCH 1/5] support running ruff check at root --- .ruff.toml | 9 ++++ noxfile.py | 1 - .../multiRootWkspc/disableLinters/file.py | 2 +- src/test/multiRootWkspc/parent/child/file.py | 47 +++++++++---------- src/test/multiRootWkspc/workspace1/file.py | 47 +++++++++---------- src/test/multiRootWkspc/workspace2/file.py | 47 +++++++++---------- src/test/multiRootWkspc/workspace3/file.py | 2 +- src/testMultiRootWkspc/workspace1/file.py | 11 ++--- src/testMultiRootWkspc/workspace2/file.py | 2 +- src/testMultiRootWkspc/workspace3/file.py | 2 +- .../workspace5/djangoApp/home/views.py | 7 ++- .../workspace5/djangoApp/manage.py | 2 +- .../workspace5/djangoApp/mysite/urls.py | 6 +-- 13 files changed, 94 insertions(+), 91 deletions(-) create mode 100644 .ruff.toml diff --git a/.ruff.toml b/.ruff.toml new file mode 100644 index 000000000000..831dd50dd128 --- /dev/null +++ b/.ruff.toml @@ -0,0 +1,9 @@ +exclude = [ + "src/test/python_files/terminalExec/sample*.py", + "src/testMultiRootWkspc/parent/child/file.py", + "src/testMultiRootWkspc/disableLinters/file.py", + "src/test/python_files/debugging/logMessage.py", + "src/test/python_files/tensorBoard/*.py", + "src/test/python_files/intellisense/test.py", + "src/test/python_files/debugging/*.py" +] diff --git a/noxfile.py b/noxfile.py index 60e22d461074..7772f08b29bb 100644 --- a/noxfile.py +++ b/noxfile.py @@ -5,7 +5,6 @@ import pathlib import nox import shutil -import sys import sysconfig import uuid diff --git a/src/test/multiRootWkspc/disableLinters/file.py b/src/test/multiRootWkspc/disableLinters/file.py index 27509dd2fcd6..ce9e3240d19e 100644 --- a/src/test/multiRootWkspc/disableLinters/file.py +++ b/src/test/multiRootWkspc/disableLinters/file.py @@ -59,7 +59,7 @@ def meth6(self): # pylint: enable=no-member # error print (self.blip) - except UndefinedName: # pylint: disable=undefined-variable + except UndefinedName: # type: ignore # pylint: disable=undefined-variable # noqa: F821 # no error print (self.blip) # no error diff --git a/src/test/multiRootWkspc/parent/child/file.py b/src/test/multiRootWkspc/parent/child/file.py index 27509dd2fcd6..ef70d0289871 100644 --- a/src/test/multiRootWkspc/parent/child/file.py +++ b/src/test/multiRootWkspc/parent/child/file.py @@ -2,6 +2,7 @@ __revision__ = None + class Foo(object): """block-disable test""" @@ -15,73 +16,71 @@ def meth1(self, arg): def meth2(self, arg): """and this one not""" # pylint: disable=unused-argument - print (self\ - + "foo") + print(self + "foo") def meth3(self): """test one line disabling""" # no error - print (self.bla) # pylint: disable=no-member + print(self.bla) # pylint: disable=no-member # error - print (self.blop) + print(self.blop) def meth4(self): """test re-enabling""" # pylint: disable=no-member # no error - print (self.bla) - print (self.blop) + print(self.bla) + print(self.blop) # pylint: enable=no-member # error - print (self.blip) + print(self.blip) def meth5(self): """test IF sub-block re-enabling""" # pylint: disable=no-member # no error - print (self.bla) + print(self.bla) if self.blop: # pylint: enable=no-member # error - print (self.blip) + print(self.blip) else: # no error - print (self.blip) + print(self.blip) # no error - print (self.blip) + print(self.blip) def meth6(self): """test TRY/EXCEPT sub-block re-enabling""" # pylint: disable=no-member # no error - print (self.bla) + print(self.bla) try: # pylint: enable=no-member # error - print (self.blip) - except UndefinedName: # pylint: disable=undefined-variable + print(self.blip) + except UndefinedName: # type: ignore # pylint: disable=undefined-variable # noqa: F821 # no error - print (self.blip) + print(self.blip) # no error - print (self.blip) + print(self.blip) def meth7(self): """test one line block opening disabling""" - if self.blop: # pylint: disable=no-member + if self.blop: # pylint: disable=no-member # error - print (self.blip) + print(self.blip) else: # error - print (self.blip) + print(self.blip) # error - print (self.blip) - + print(self.blip) def meth8(self): """test late disabling""" # error - print (self.blip) + print(self.blip) # pylint: disable=no-member # no error - print (self.bla) - print (self.blop) + print(self.bla) + print(self.blop) diff --git a/src/test/multiRootWkspc/workspace1/file.py b/src/test/multiRootWkspc/workspace1/file.py index 27509dd2fcd6..ef70d0289871 100644 --- a/src/test/multiRootWkspc/workspace1/file.py +++ b/src/test/multiRootWkspc/workspace1/file.py @@ -2,6 +2,7 @@ __revision__ = None + class Foo(object): """block-disable test""" @@ -15,73 +16,71 @@ def meth1(self, arg): def meth2(self, arg): """and this one not""" # pylint: disable=unused-argument - print (self\ - + "foo") + print(self + "foo") def meth3(self): """test one line disabling""" # no error - print (self.bla) # pylint: disable=no-member + print(self.bla) # pylint: disable=no-member # error - print (self.blop) + print(self.blop) def meth4(self): """test re-enabling""" # pylint: disable=no-member # no error - print (self.bla) - print (self.blop) + print(self.bla) + print(self.blop) # pylint: enable=no-member # error - print (self.blip) + print(self.blip) def meth5(self): """test IF sub-block re-enabling""" # pylint: disable=no-member # no error - print (self.bla) + print(self.bla) if self.blop: # pylint: enable=no-member # error - print (self.blip) + print(self.blip) else: # no error - print (self.blip) + print(self.blip) # no error - print (self.blip) + print(self.blip) def meth6(self): """test TRY/EXCEPT sub-block re-enabling""" # pylint: disable=no-member # no error - print (self.bla) + print(self.bla) try: # pylint: enable=no-member # error - print (self.blip) - except UndefinedName: # pylint: disable=undefined-variable + print(self.blip) + except UndefinedName: # type: ignore # pylint: disable=undefined-variable # noqa: F821 # no error - print (self.blip) + print(self.blip) # no error - print (self.blip) + print(self.blip) def meth7(self): """test one line block opening disabling""" - if self.blop: # pylint: disable=no-member + if self.blop: # pylint: disable=no-member # error - print (self.blip) + print(self.blip) else: # error - print (self.blip) + print(self.blip) # error - print (self.blip) - + print(self.blip) def meth8(self): """test late disabling""" # error - print (self.blip) + print(self.blip) # pylint: disable=no-member # no error - print (self.bla) - print (self.blop) + print(self.bla) + print(self.blop) diff --git a/src/test/multiRootWkspc/workspace2/file.py b/src/test/multiRootWkspc/workspace2/file.py index 27509dd2fcd6..ef70d0289871 100644 --- a/src/test/multiRootWkspc/workspace2/file.py +++ b/src/test/multiRootWkspc/workspace2/file.py @@ -2,6 +2,7 @@ __revision__ = None + class Foo(object): """block-disable test""" @@ -15,73 +16,71 @@ def meth1(self, arg): def meth2(self, arg): """and this one not""" # pylint: disable=unused-argument - print (self\ - + "foo") + print(self + "foo") def meth3(self): """test one line disabling""" # no error - print (self.bla) # pylint: disable=no-member + print(self.bla) # pylint: disable=no-member # error - print (self.blop) + print(self.blop) def meth4(self): """test re-enabling""" # pylint: disable=no-member # no error - print (self.bla) - print (self.blop) + print(self.bla) + print(self.blop) # pylint: enable=no-member # error - print (self.blip) + print(self.blip) def meth5(self): """test IF sub-block re-enabling""" # pylint: disable=no-member # no error - print (self.bla) + print(self.bla) if self.blop: # pylint: enable=no-member # error - print (self.blip) + print(self.blip) else: # no error - print (self.blip) + print(self.blip) # no error - print (self.blip) + print(self.blip) def meth6(self): """test TRY/EXCEPT sub-block re-enabling""" # pylint: disable=no-member # no error - print (self.bla) + print(self.bla) try: # pylint: enable=no-member # error - print (self.blip) - except UndefinedName: # pylint: disable=undefined-variable + print(self.blip) + except UndefinedName: # type: ignore # pylint: disable=undefined-variable # noqa: F821 # no error - print (self.blip) + print(self.blip) # no error - print (self.blip) + print(self.blip) def meth7(self): """test one line block opening disabling""" - if self.blop: # pylint: disable=no-member + if self.blop: # pylint: disable=no-member # error - print (self.blip) + print(self.blip) else: # error - print (self.blip) + print(self.blip) # error - print (self.blip) - + print(self.blip) def meth8(self): """test late disabling""" # error - print (self.blip) + print(self.blip) # pylint: disable=no-member # no error - print (self.bla) - print (self.blop) + print(self.bla) + print(self.blop) diff --git a/src/test/multiRootWkspc/workspace3/file.py b/src/test/multiRootWkspc/workspace3/file.py index 27509dd2fcd6..ce9e3240d19e 100644 --- a/src/test/multiRootWkspc/workspace3/file.py +++ b/src/test/multiRootWkspc/workspace3/file.py @@ -59,7 +59,7 @@ def meth6(self): # pylint: enable=no-member # error print (self.blip) - except UndefinedName: # pylint: disable=undefined-variable + except UndefinedName: # type: ignore # pylint: disable=undefined-variable # noqa: F821 # no error print (self.blip) # no error diff --git a/src/testMultiRootWkspc/workspace1/file.py b/src/testMultiRootWkspc/workspace1/file.py index 6aceaad5e020..a3672bca7079 100644 --- a/src/testMultiRootWkspc/workspace1/file.py +++ b/src/testMultiRootWkspc/workspace1/file.py @@ -2,6 +2,7 @@ __revision__ = None + class Foo(object): """block-disable test""" @@ -15,13 +16,12 @@ def meth1(self, arg): def meth2(self, arg): """and this one not""" # pylint: disable=unused-argument - print(self\ - + "foo") + print(self + "foo") def meth3(self): """test one line disabling""" # no error - print(self.bla) # pylint: disable=no-member + print(self.bla) # pylint: disable=no-member # error print(self.blop) @@ -59,7 +59,7 @@ def meth6(self): # pylint: enable=no-member # error print(self.blip) - except UndefinedName: # pylint: disable=undefined-variable + except UndefinedName: # type: ignore # noqa: F821 # no error print(self.blip) # no error @@ -67,7 +67,7 @@ def meth6(self): def meth7(self): """test one line block opening disabling""" - if self.blop: # pylint: disable=no-member + if self.blop: # pylint: disable=no-member # error print(self.blip) else: @@ -76,7 +76,6 @@ def meth7(self): # error print(self.blip) - def meth8(self): """test late disabling""" # error diff --git a/src/testMultiRootWkspc/workspace2/file.py b/src/testMultiRootWkspc/workspace2/file.py index 6aceaad5e020..79fe82f0c35d 100644 --- a/src/testMultiRootWkspc/workspace2/file.py +++ b/src/testMultiRootWkspc/workspace2/file.py @@ -59,7 +59,7 @@ def meth6(self): # pylint: enable=no-member # error print(self.blip) - except UndefinedName: # pylint: disable=undefined-variable + except UndefinedName: # type: ignore # noqa: F821 # no error print(self.blip) # no error diff --git a/src/testMultiRootWkspc/workspace3/file.py b/src/testMultiRootWkspc/workspace3/file.py index 6aceaad5e020..18ef68fbeb1e 100644 --- a/src/testMultiRootWkspc/workspace3/file.py +++ b/src/testMultiRootWkspc/workspace3/file.py @@ -59,7 +59,7 @@ def meth6(self): # pylint: enable=no-member # error print(self.blip) - except UndefinedName: # pylint: disable=undefined-variable + except UndefinedName: # type: ignore # noqa: F821 # no error print(self.blip) # no error diff --git a/src/testMultiRootWkspc/workspace5/djangoApp/home/views.py b/src/testMultiRootWkspc/workspace5/djangoApp/home/views.py index 0494f868dc6f..a75f16597da1 100644 --- a/src/testMultiRootWkspc/workspace5/djangoApp/home/views.py +++ b/src/testMultiRootWkspc/workspace5/djangoApp/home/views.py @@ -1,10 +1,9 @@ from django.shortcuts import render -from django.template import loader def index(request): context = { - 'value_from_server':'this_is_a_value_from_server', - 'another_value_from_server':'this_is_another_value_from_server' + "value_from_server": "this_is_a_value_from_server", + "another_value_from_server": "this_is_another_value_from_server", } - return render(request, 'index.html', context) + return render(request, "index.html", context) diff --git a/src/testMultiRootWkspc/workspace5/djangoApp/manage.py b/src/testMultiRootWkspc/workspace5/djangoApp/manage.py index afbc784aafd8..3cb1277efa92 100644 --- a/src/testMultiRootWkspc/workspace5/djangoApp/manage.py +++ b/src/testMultiRootWkspc/workspace5/djangoApp/manage.py @@ -11,7 +11,7 @@ # issue is really that Django is missing to avoid masking other # exceptions on Python 2. try: - import django + import django # noqa: F401 except ImportError: raise ImportError( "Couldn't import Django. Are you sure it's installed and " diff --git a/src/testMultiRootWkspc/workspace5/djangoApp/mysite/urls.py b/src/testMultiRootWkspc/workspace5/djangoApp/mysite/urls.py index 9db383365e3e..97077eaebdb6 100644 --- a/src/testMultiRootWkspc/workspace5/djangoApp/mysite/urls.py +++ b/src/testMultiRootWkspc/workspace5/djangoApp/mysite/urls.py @@ -13,11 +13,11 @@ 1. Import the include() function: from django.conf.urls import url, include 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ + from django.conf.urls import url, include -from django.contrib import admin from django.views.generic import RedirectView urlpatterns = [ - url(r'^home/', include('home.urls')), - url('', RedirectView.as_view(url='/home/')), + url(r"^home/", include("home.urls")), + url("", RedirectView.as_view(url="/home/")), ] From ebe56be46da77ad990a3fbdbfde834a770abad12 Mon Sep 17 00:00:00 2001 From: eleanorjboyd Date: Thu, 31 Oct 2024 14:54:48 -0700 Subject: [PATCH 2/5] attempt to format all files with ruff? idk --- .github/actions/lint/action.yml | 1 - build/ci/addEnvPath.py | 11 +++-- .../multiRootWkspc/disableLinters/file.py | 47 +++++++++---------- .../multiRootWkspc/parent/child/childFile.py | 3 +- .../workspace2/workspace2File.py | 3 +- src/test/multiRootWkspc/workspace3/file.py | 47 +++++++++---------- src/test/pythonFiles/dummy.py | 2 +- .../datascience/simple_note_book.py | 6 +-- src/test/python_files/dummy.py | 2 +- src/test/python_files/shebang/plain.py | 1 - .../parent/child/childFile.py | 3 +- .../smokeTests/create_delete_file.py | 6 +-- .../smokeTests/definitions.py | 6 +++ .../smokeTests/testExecInTerminal.py | 4 +- src/testMultiRootWkspc/workspace2/file.py | 9 ++-- src/testMultiRootWkspc/workspace3/file.py | 11 ++--- src/testMultiRootWkspc/workspace4/one.py | 1 + .../workspace5/djangoApp/home/urls.py | 2 +- .../workspace5/flaskApp/run.py | 13 +++-- .../remoteDebugger-start-with-nowait.py | 2 +- .../workspace5/remoteDebugger-start.py | 8 ++-- .../workspace5/remoteDebugger.py | 10 ++-- 22 files changed, 104 insertions(+), 94 deletions(-) diff --git a/.github/actions/lint/action.yml b/.github/actions/lint/action.yml index 444f331a3a96..4387f4e6128d 100644 --- a/.github/actions/lint/action.yml +++ b/.github/actions/lint/action.yml @@ -46,5 +46,4 @@ runs: python -m pip install -U ruff python -m ruff check . python -m ruff format --check - working-directory: python_files shell: bash diff --git a/build/ci/addEnvPath.py b/build/ci/addEnvPath.py index 66eff2a7b25d..50c1e42038fa 100644 --- a/build/ci/addEnvPath.py +++ b/build/ci/addEnvPath.py @@ -1,26 +1,27 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -#Adds the virtual environment's executable path to json file +# Adds the virtual environment's executable path to json file import json import sys import os.path + jsonPath = sys.argv[1] key = sys.argv[2] if os.path.isfile(jsonPath): - with open(jsonPath, 'r') as read_file: + with open(jsonPath, "r") as read_file: data = json.load(read_file) else: directory = os.path.dirname(jsonPath) if not os.path.exists(directory): os.makedirs(directory) - with open(jsonPath, 'w+') as read_file: + with open(jsonPath, "w+") as read_file: data = {} data = {} -with open(jsonPath, 'w') as outfile: - if key == 'condaExecPath': +with open(jsonPath, "w") as outfile: + if key == "condaExecPath": data[key] = sys.argv[3] else: data[key] = sys.executable diff --git a/src/test/multiRootWkspc/disableLinters/file.py b/src/test/multiRootWkspc/disableLinters/file.py index ce9e3240d19e..ef70d0289871 100644 --- a/src/test/multiRootWkspc/disableLinters/file.py +++ b/src/test/multiRootWkspc/disableLinters/file.py @@ -2,6 +2,7 @@ __revision__ = None + class Foo(object): """block-disable test""" @@ -15,73 +16,71 @@ def meth1(self, arg): def meth2(self, arg): """and this one not""" # pylint: disable=unused-argument - print (self\ - + "foo") + print(self + "foo") def meth3(self): """test one line disabling""" # no error - print (self.bla) # pylint: disable=no-member + print(self.bla) # pylint: disable=no-member # error - print (self.blop) + print(self.blop) def meth4(self): """test re-enabling""" # pylint: disable=no-member # no error - print (self.bla) - print (self.blop) + print(self.bla) + print(self.blop) # pylint: enable=no-member # error - print (self.blip) + print(self.blip) def meth5(self): """test IF sub-block re-enabling""" # pylint: disable=no-member # no error - print (self.bla) + print(self.bla) if self.blop: # pylint: enable=no-member # error - print (self.blip) + print(self.blip) else: # no error - print (self.blip) + print(self.blip) # no error - print (self.blip) + print(self.blip) def meth6(self): """test TRY/EXCEPT sub-block re-enabling""" # pylint: disable=no-member # no error - print (self.bla) + print(self.bla) try: # pylint: enable=no-member # error - print (self.blip) - except UndefinedName: # type: ignore # pylint: disable=undefined-variable # noqa: F821 + print(self.blip) + except UndefinedName: # type: ignore # pylint: disable=undefined-variable # noqa: F821 # no error - print (self.blip) + print(self.blip) # no error - print (self.blip) + print(self.blip) def meth7(self): """test one line block opening disabling""" - if self.blop: # pylint: disable=no-member + if self.blop: # pylint: disable=no-member # error - print (self.blip) + print(self.blip) else: # error - print (self.blip) + print(self.blip) # error - print (self.blip) - + print(self.blip) def meth8(self): """test late disabling""" # error - print (self.blip) + print(self.blip) # pylint: disable=no-member # no error - print (self.bla) - print (self.blop) + print(self.bla) + print(self.blop) diff --git a/src/test/multiRootWkspc/parent/child/childFile.py b/src/test/multiRootWkspc/parent/child/childFile.py index 31d6fc7b4a18..9a1fcd74c5e3 100644 --- a/src/test/multiRootWkspc/parent/child/childFile.py +++ b/src/test/multiRootWkspc/parent/child/childFile.py @@ -2,6 +2,7 @@ __revision__ = None + class Child2Class(object): """block-disable test""" @@ -10,4 +11,4 @@ def __init__(self): def meth1OfChild(self, arg): """this issues a message""" - print (self) + print(self) diff --git a/src/test/multiRootWkspc/workspace2/workspace2File.py b/src/test/multiRootWkspc/workspace2/workspace2File.py index 61aa87c55fed..9e56bf5cc589 100644 --- a/src/test/multiRootWkspc/workspace2/workspace2File.py +++ b/src/test/multiRootWkspc/workspace2/workspace2File.py @@ -2,6 +2,7 @@ __revision__ = None + class Workspace2Class(object): """block-disable test""" @@ -10,4 +11,4 @@ def __init__(self): def meth1OfWorkspace2(self, arg): """this issues a message""" - print (self) + print(self) diff --git a/src/test/multiRootWkspc/workspace3/file.py b/src/test/multiRootWkspc/workspace3/file.py index ce9e3240d19e..ef70d0289871 100644 --- a/src/test/multiRootWkspc/workspace3/file.py +++ b/src/test/multiRootWkspc/workspace3/file.py @@ -2,6 +2,7 @@ __revision__ = None + class Foo(object): """block-disable test""" @@ -15,73 +16,71 @@ def meth1(self, arg): def meth2(self, arg): """and this one not""" # pylint: disable=unused-argument - print (self\ - + "foo") + print(self + "foo") def meth3(self): """test one line disabling""" # no error - print (self.bla) # pylint: disable=no-member + print(self.bla) # pylint: disable=no-member # error - print (self.blop) + print(self.blop) def meth4(self): """test re-enabling""" # pylint: disable=no-member # no error - print (self.bla) - print (self.blop) + print(self.bla) + print(self.blop) # pylint: enable=no-member # error - print (self.blip) + print(self.blip) def meth5(self): """test IF sub-block re-enabling""" # pylint: disable=no-member # no error - print (self.bla) + print(self.bla) if self.blop: # pylint: enable=no-member # error - print (self.blip) + print(self.blip) else: # no error - print (self.blip) + print(self.blip) # no error - print (self.blip) + print(self.blip) def meth6(self): """test TRY/EXCEPT sub-block re-enabling""" # pylint: disable=no-member # no error - print (self.bla) + print(self.bla) try: # pylint: enable=no-member # error - print (self.blip) - except UndefinedName: # type: ignore # pylint: disable=undefined-variable # noqa: F821 + print(self.blip) + except UndefinedName: # type: ignore # pylint: disable=undefined-variable # noqa: F821 # no error - print (self.blip) + print(self.blip) # no error - print (self.blip) + print(self.blip) def meth7(self): """test one line block opening disabling""" - if self.blop: # pylint: disable=no-member + if self.blop: # pylint: disable=no-member # error - print (self.blip) + print(self.blip) else: # error - print (self.blip) + print(self.blip) # error - print (self.blip) - + print(self.blip) def meth8(self): """test late disabling""" # error - print (self.blip) + print(self.blip) # pylint: disable=no-member # no error - print (self.bla) - print (self.blop) + print(self.bla) + print(self.blop) diff --git a/src/test/pythonFiles/dummy.py b/src/test/pythonFiles/dummy.py index 10f13768abe0..f4ec86a87370 100644 --- a/src/test/pythonFiles/dummy.py +++ b/src/test/pythonFiles/dummy.py @@ -1 +1 @@ -#dummy file to be opened by Test VS Code instance, so that Python Configuration (workspace configuration will be initialized) \ No newline at end of file +# dummy file to be opened by Test VS Code instance, so that Python Configuration (workspace configuration will be initialized) diff --git a/src/test/python_files/datascience/simple_note_book.py b/src/test/python_files/datascience/simple_note_book.py index ace41e3f5c44..cd6fdb0a7d83 100644 --- a/src/test/python_files/datascience/simple_note_book.py +++ b/src/test/python_files/datascience/simple_note_book.py @@ -1,7 +1,7 @@ # %% import os.path -dir_path = os.path.dirname(os.path.realpath(__file__)) -with open(os.path.join(dir_path, 'ds.log'), 'a') as fp: - fp.write('Hello World') +dir_path = os.path.dirname(os.path.realpath(__file__)) +with open(os.path.join(dir_path, "ds.log"), "a") as fp: + fp.write("Hello World") diff --git a/src/test/python_files/dummy.py b/src/test/python_files/dummy.py index 10f13768abe0..f4ec86a87370 100644 --- a/src/test/python_files/dummy.py +++ b/src/test/python_files/dummy.py @@ -1 +1 @@ -#dummy file to be opened by Test VS Code instance, so that Python Configuration (workspace configuration will be initialized) \ No newline at end of file +# dummy file to be opened by Test VS Code instance, so that Python Configuration (workspace configuration will be initialized) diff --git a/src/test/python_files/shebang/plain.py b/src/test/python_files/shebang/plain.py index 72f63e675db1..c3ca6615b51f 100644 --- a/src/test/python_files/shebang/plain.py +++ b/src/test/python_files/shebang/plain.py @@ -1,2 +1 @@ - print("dummy") diff --git a/src/testMultiRootWkspc/parent/child/childFile.py b/src/testMultiRootWkspc/parent/child/childFile.py index 31d6fc7b4a18..9a1fcd74c5e3 100644 --- a/src/testMultiRootWkspc/parent/child/childFile.py +++ b/src/testMultiRootWkspc/parent/child/childFile.py @@ -2,6 +2,7 @@ __revision__ = None + class Child2Class(object): """block-disable test""" @@ -10,4 +11,4 @@ def __init__(self): def meth1OfChild(self, arg): """this issues a message""" - print (self) + print(self) diff --git a/src/testMultiRootWkspc/smokeTests/create_delete_file.py b/src/testMultiRootWkspc/smokeTests/create_delete_file.py index 399bc4863c15..180de79f11ac 100644 --- a/src/testMultiRootWkspc/smokeTests/create_delete_file.py +++ b/src/testMultiRootWkspc/smokeTests/create_delete_file.py @@ -1,5 +1,5 @@ -with open('smart_send_smoke.txt', 'w') as f: - f.write('This is for smart send smoke test') +with open("smart_send_smoke.txt", "w") as f: + f.write("This is for smart send smoke test") import os -os.remove('smart_send_smoke.txt') +os.remove("smart_send_smoke.txt") diff --git a/src/testMultiRootWkspc/smokeTests/definitions.py b/src/testMultiRootWkspc/smokeTests/definitions.py index a8379a49f960..313c18d5ac8d 100644 --- a/src/testMultiRootWkspc/smokeTests/definitions.py +++ b/src/testMultiRootWkspc/smokeTests/definitions.py @@ -1,16 +1,20 @@ from contextlib import contextmanager + def my_decorator(fn): """ This is my decorator. """ + def wrapper(*args, **kwargs): """ This is the wrapper. """ return 42 + return wrapper + @my_decorator def thing(arg): """ @@ -18,6 +22,7 @@ def thing(arg): """ pass + @contextmanager def my_context_manager(): """ @@ -27,5 +32,6 @@ def my_context_manager(): yield print("after") + with my_context_manager(): thing(19) diff --git a/src/testMultiRootWkspc/smokeTests/testExecInTerminal.py b/src/testMultiRootWkspc/smokeTests/testExecInTerminal.py index d83d46a740d9..147dd6dd8cd9 100644 --- a/src/testMultiRootWkspc/smokeTests/testExecInTerminal.py +++ b/src/testMultiRootWkspc/smokeTests/testExecInTerminal.py @@ -2,11 +2,11 @@ import sys import os -optlist, args = getopt.getopt(sys.argv, '') +optlist, args = getopt.getopt(sys.argv, "") # If the caller has not specified the output file, create one for them with # the same name as the caller script, but with a .log extension. -log_file = os.path.splitext(sys.argv[0])[0] + '.log' +log_file = os.path.splitext(sys.argv[0])[0] + ".log" # If the output file is given, use that instead. if len(args) == 2: diff --git a/src/testMultiRootWkspc/workspace2/file.py b/src/testMultiRootWkspc/workspace2/file.py index 79fe82f0c35d..a3672bca7079 100644 --- a/src/testMultiRootWkspc/workspace2/file.py +++ b/src/testMultiRootWkspc/workspace2/file.py @@ -2,6 +2,7 @@ __revision__ = None + class Foo(object): """block-disable test""" @@ -15,13 +16,12 @@ def meth1(self, arg): def meth2(self, arg): """and this one not""" # pylint: disable=unused-argument - print(self\ - + "foo") + print(self + "foo") def meth3(self): """test one line disabling""" # no error - print(self.bla) # pylint: disable=no-member + print(self.bla) # pylint: disable=no-member # error print(self.blop) @@ -67,7 +67,7 @@ def meth6(self): def meth7(self): """test one line block opening disabling""" - if self.blop: # pylint: disable=no-member + if self.blop: # pylint: disable=no-member # error print(self.blip) else: @@ -76,7 +76,6 @@ def meth7(self): # error print(self.blip) - def meth8(self): """test late disabling""" # error diff --git a/src/testMultiRootWkspc/workspace3/file.py b/src/testMultiRootWkspc/workspace3/file.py index 18ef68fbeb1e..a3672bca7079 100644 --- a/src/testMultiRootWkspc/workspace3/file.py +++ b/src/testMultiRootWkspc/workspace3/file.py @@ -2,6 +2,7 @@ __revision__ = None + class Foo(object): """block-disable test""" @@ -15,13 +16,12 @@ def meth1(self, arg): def meth2(self, arg): """and this one not""" # pylint: disable=unused-argument - print(self\ - + "foo") + print(self + "foo") def meth3(self): """test one line disabling""" # no error - print(self.bla) # pylint: disable=no-member + print(self.bla) # pylint: disable=no-member # error print(self.blop) @@ -59,7 +59,7 @@ def meth6(self): # pylint: enable=no-member # error print(self.blip) - except UndefinedName: # type: ignore # noqa: F821 + except UndefinedName: # type: ignore # noqa: F821 # no error print(self.blip) # no error @@ -67,7 +67,7 @@ def meth6(self): def meth7(self): """test one line block opening disabling""" - if self.blop: # pylint: disable=no-member + if self.blop: # pylint: disable=no-member # error print(self.blip) else: @@ -76,7 +76,6 @@ def meth7(self): # error print(self.blip) - def meth8(self): """test late disabling""" # error diff --git a/src/testMultiRootWkspc/workspace4/one.py b/src/testMultiRootWkspc/workspace4/one.py index 635f08868a11..2db2cd0c7e77 100644 --- a/src/testMultiRootWkspc/workspace4/one.py +++ b/src/testMultiRootWkspc/workspace4/one.py @@ -1,2 +1,3 @@ from hello import world + print(world.sayHello()) diff --git a/src/testMultiRootWkspc/workspace5/djangoApp/home/urls.py b/src/testMultiRootWkspc/workspace5/djangoApp/home/urls.py index 70a9606e88e6..d2562d002d30 100644 --- a/src/testMultiRootWkspc/workspace5/djangoApp/home/urls.py +++ b/src/testMultiRootWkspc/workspace5/djangoApp/home/urls.py @@ -3,5 +3,5 @@ from . import views urlpatterns = [ - url('', views.index, name='index'), + url("", views.index, name="index"), ] diff --git a/src/testMultiRootWkspc/workspace5/flaskApp/run.py b/src/testMultiRootWkspc/workspace5/flaskApp/run.py index 9c3172c3e918..ac050b1c007b 100644 --- a/src/testMultiRootWkspc/workspace5/flaskApp/run.py +++ b/src/testMultiRootWkspc/workspace5/flaskApp/run.py @@ -1,13 +1,16 @@ from flask import Flask, render_template + app = Flask(__name__) -@app.route('/') +@app.route("/") def hello(): - return render_template('index.html', - value_from_server='this_is_a_value_from_server', - another_value_from_server='this_is_another_value_from_server') + return render_template( + "index.html", + value_from_server="this_is_a_value_from_server", + another_value_from_server="this_is_another_value_from_server", + ) -if __name__ == '__main__': +if __name__ == "__main__": app.run() diff --git a/src/testMultiRootWkspc/workspace5/remoteDebugger-start-with-nowait.py b/src/testMultiRootWkspc/workspace5/remoteDebugger-start-with-nowait.py index 75d9766db981..8cde7829c178 100644 --- a/src/testMultiRootWkspc/workspace5/remoteDebugger-start-with-nowait.py +++ b/src/testMultiRootWkspc/workspace5/remoteDebugger-start-with-nowait.py @@ -1 +1 @@ -print('hello world') +print("hello world") diff --git a/src/testMultiRootWkspc/workspace5/remoteDebugger-start.py b/src/testMultiRootWkspc/workspace5/remoteDebugger-start.py index 9fa815038e88..4884badea112 100644 --- a/src/testMultiRootWkspc/workspace5/remoteDebugger-start.py +++ b/src/testMultiRootWkspc/workspace5/remoteDebugger-start.py @@ -1,10 +1,11 @@ import sys import time + def main(): - sys.stdout.write('this is stdout') + sys.stdout.write("this is stdout") sys.stdout.flush() - sys.stderr.write('this is stderr') + sys.stderr.write("this is stderr") sys.stderr.flush() # Give the debugger some time to add a breakpoint. time.sleep(5) @@ -12,6 +13,7 @@ def main(): time.sleep(0.5) pass - print('this is print') + print("this is print") + main() diff --git a/src/testMultiRootWkspc/workspace5/remoteDebugger.py b/src/testMultiRootWkspc/workspace5/remoteDebugger.py index 26ae431cc1cd..881bb0a03da9 100644 --- a/src/testMultiRootWkspc/workspace5/remoteDebugger.py +++ b/src/testMultiRootWkspc/workspace5/remoteDebugger.py @@ -2,16 +2,16 @@ import ptvsd import time -sys.stdout.write('start') +sys.stdout.write("start") sys.stdout.flush() -address = ('127.0.0.1', int(sys.argv[1])) -ptvsd.enable_attach('super_secret', address) +address = ("127.0.0.1", int(sys.argv[1])) +ptvsd.enable_attach("super_secret", address) ptvsd.wait_for_attach() -sys.stdout.write('attached') +sys.stdout.write("attached") sys.stdout.flush() # Give the debugger some time to add a breakpoint. time.sleep(2) -sys.stdout.write('end') +sys.stdout.write("end") sys.stdout.flush() From 17788c50286bf5e838e03cc4b2ffb942446ecdad Mon Sep 17 00:00:00 2001 From: eleanorjboyd Date: Thu, 31 Oct 2024 15:13:01 -0700 Subject: [PATCH 3/5] add extra file to exclude list --- .ruff.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ruff.toml b/.ruff.toml index 831dd50dd128..491bfa601a8e 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -5,5 +5,6 @@ exclude = [ "src/test/python_files/debugging/logMessage.py", "src/test/python_files/tensorBoard/*.py", "src/test/python_files/intellisense/test.py", - "src/test/python_files/debugging/*.py" + "src/test/python_files/debugging/*.py", + "src/test/python_files/tensorBoard/tensorboard_import.ipynb" ] From 94d4c3f6899f2733a794f3909638fa548a13d85e Mon Sep 17 00:00:00 2001 From: eleanorjboyd Date: Thu, 31 Oct 2024 15:20:48 -0700 Subject: [PATCH 4/5] fix pyright errors in python_files --- python_files/tests/test_create_venv.py | 2 +- python_files/tests/test_get_variable_info.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python_files/tests/test_create_venv.py b/python_files/tests/test_create_venv.py index 72fabdaaecac..f8ac960f3b8b 100644 --- a/python_files/tests/test_create_venv.py +++ b/python_files/tests/test_create_venv.py @@ -265,7 +265,7 @@ def redirect_io(stream: str, new_stream): class CustomIO(io.TextIOWrapper): """Custom stream object to replace stdio.""" - name: str = "customio" + name: str = "customio" # type: ignore def __init__(self, name: str, encoding="utf-8", newline=None): self._buffer = io.BytesIO() diff --git a/python_files/tests/test_get_variable_info.py b/python_files/tests/test_get_variable_info.py index 73f94fe26f06..d2516d41b9ce 100644 --- a/python_files/tests/test_get_variable_info.py +++ b/python_files/tests/test_get_variable_info.py @@ -3,7 +3,7 @@ def set_global_variable(value): # setting on the module allows tests to set a variable that the module under test can access - get_variable_info.test_variable = value # pyright: ignore[reportGeneralTypeIssues] + get_variable_info.test_variable = value # pyright: ignore[reportGeneralTypeIssues] # type: ignore def get_global_variable(): From f6227721aeee4090f23deea609ede0c0c335246f Mon Sep 17 00:00:00 2001 From: eleanorjboyd Date: Fri, 1 Nov 2024 10:06:26 -0700 Subject: [PATCH 5/5] add check pr task --- .vscode/tasks.json | 27 ++++++++++++++++++++++++--- check_pr.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 3 deletions(-) create mode 100755 check_pr.sh diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e1468bdfc2ad..5c21a478a8df 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -12,9 +12,7 @@ "type": "npm", "script": "compile", "isBackground": true, - "problemMatcher": [ - "$tsc-watch" - ], + "problemMatcher": ["$tsc-watch"], "group": { "kind": "build", "isDefault": true @@ -34,6 +32,29 @@ "script": "preTestJediLSP", "problemMatcher": [], "label": "preTestJediLSP" + }, + { + "label": "Run check_pr.sh", + "type": "shell", + "command": "${workspaceFolder}/check_pr.sh", + "options": { + "cwd": "${workspaceFolder}", + "env": { + "VIRTUAL_ENV": "${workspaceFolder}/.venv", + "PATH": "${workspaceFolder}/.venv/bin/python" + } + }, + "group": { + "kind": "build", + "isDefault": false + }, + "problemMatcher": [], + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared" + } } ] } diff --git a/check_pr.sh b/check_pr.sh new file mode 100755 index 000000000000..3329c756cc6c --- /dev/null +++ b/check_pr.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +# Function to run a command and check its status +run_command() { + echo "Running: '$1'" + echo "----------------------------------------" + $1 + if [ $? -ne 0 ]; then + echo "FAILURE: '$1'" + exit 1 + else + echo "----------------------------------------" + echo "SUCCESS: '$1'" + echo "----------------------------------------" + fi +} + +# Check dependencies +run_command "npm run checkDependencies" + +# Run linter +run_command "npm run lint" + +# Check formatting +run_command "npm run format-check" + +# Activate the virtual environment +source ".venv/bin/activate" + +# Change directory to python_files +cd python_files || exit + +# Run Pyright +run_command "python -m pyright" + +# Run Ruff +run_command "python -m ruff ." +echo "----------------------------------------" +echo "----------------------------------------" +echo "All checks passed successfully!"