chore: update Python extension settings

seanwu1105 · Sep 4, 2023 · 2716f47 · 2716f47
1 parent 1123719
commit 2716f47
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 75 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -140,9 +140,7 @@ jobs:
         run: poetry install --no-interaction --no-root
 
       - name: Lint
-        run: |
-          poetry run pylint scripts
-          poetry run mypy scripts
+        run: poetry run pylint scripts
 
   py-test:
     strategy:

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -4,6 +4,9 @@
   "recommendations": [
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode",
-    "ms-python.python"
+    "ms-python.python",
+    "ms-python.pylint",
+    "ms-python.black-formatter",
+    "ms-python.isort"
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -12,5 +12,11 @@
     "source.fixAll": true,
     "source.organizeImports": true
   },
-  "typescript.preferences.importModuleSpecifier": "relative"
+  "typescript.preferences.importModuleSpecifier": "relative",
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.black-formatter"
+  },
+  "python.analysis.autoImportCompletions": true,
+  "pylint.args": ["--rcfile=${workspaceFolder}/python/.pylintrc"],
+  "isort.args": ["--settings-file=${workspaceFolder}/python/.isort.cfg"]
 }
diff --git a/python/.pylintrc b/python/.pylintrc
@@ -82,7 +82,7 @@ persistent=yes
 
 # Minimum Python version to use for version dependent checks. Will default to
 # the version used to run pylint.
-py-version=3.7
+py-version=3.8
 
 # Discover python modules and packages in the file system subtree.
 recursive=no

diff --git a/python/.vscode/settings.json b/python/.vscode/settings.json
diff --git a/python/poetry.lock b/python/poetry.lock
diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -13,7 +13,6 @@ pyqt5 = { version = "^5.15.7", markers = "sys_platform != 'darwin' or platform_m
 
 [tool.poetry.group.dev.dependencies]
 pylint = "^2.14.5"
-mypy = "^0.971"
 black = "^22.6.0"
 pytest = "^7.1.2"
 pytest-cov = "^4.0.0"

diff --git a/python/scripts/utils/__init__.py b/python/scripts/utils/__init__.py
@@ -5,7 +5,9 @@
 
 QT_DEPENDENCY_ARG = "vscode_extension_qt_dependency"
 
-SupportedQtDependencies = typing.Optional[str]
+SupportedQtDependencies = typing.Optional[
+    typing.Literal["PySide6", "PySide2", "PyQt6", "PyQt5"]
+]
 
 
 def is_installed(name: str) -> bool:
@@ -19,8 +21,7 @@ def parse_qt_dependency() -> SupportedQtDependencies:
         required=False,
     )
 
-    dep = vars(parser.parse_known_args()[0])[QT_DEPENDENCY_ARG]
-    if dep is not None:
+    if dep := vars(parser.parse_known_args()[0])[QT_DEPENDENCY_ARG]:
         sys.argv.remove(f"--{QT_DEPENDENCY_ARG}")
         sys.argv.remove(dep)
 

diff --git a/python/tests/__init__.py b/python/tests/__init__.py
@@ -11,7 +11,9 @@
 
 ASSETS_DIR = os.path.join(TESTS_DIR, "assets")
 
-SupportedScripts = typing.Type[str]
+SupportedScripts = typing.Literal[
+    "designer", "qml", "qmlls", "rcc", "uic", "lupdate", "linguist", "lrelease"
+]
 
 
 def filter_available_qt_dependencies(