Merge branch 'master' of https://github.com/nvdaaddons/AddonTemplate …

…into template
cary-rowen · Apr 14, 2024 · 74e3457 · 74e3457
2 parents 8cf2ae0 + e3fa6d5
commit 74e3457
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -6,7 +6,7 @@
 		"ms-python.python",
 		"ms-python.vscode-pylance",
 		"redhat.vscode-yaml",
-		"ms-python.flake8" // flake8 extension version <= v2023.4.0
+		"ms-python.flake8"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": []

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,9 +11,7 @@
     "files.insertFinalNewline": true,
     "files.trimFinalNewlines": true,
     "editor.insertSpaces": false,
-    "python.analysis.diagnosticSeverityOverrides": {
-        "reportUndefinedVariable": "none"
-    },
+    "python.analysis.stubPath": "${workspaceFolder}/.vscode/typings",
     "python.analysis.extraPaths": [
         "../nvda/source",
         "../nvda/miscDeps/python"

diff --git a/.vscode/typings/__builtins__.pyi b/.vscode/typings/__builtins__.pyi
@@ -0,0 +1,6 @@
+def _(msg: str) -> str:
+	...
+
+
+def pgettext(context: str, message: str) -> str:
+	...
diff --git a/flake8.ini b/flake8.ini
@@ -36,7 +36,9 @@ ignore =
 
 builtins = # inform flake8 about functions we consider built-in.
 	_, # translation lookup
+	ngettext, # translation lookup
 	pgettext, # translation lookup
+	npgettext, # translation lookup
 
 exclude = # don't bother looking in the following subdirectories / files.
 	.git,

diff --git a/sconstruct b/sconstruct
@@ -170,7 +170,8 @@ def createAddonBundleFromPath(path, dest):
 				absPath = os.path.join(dir, filename)
 				if pathInBundle not in buildVars.excludedFiles:
 					z.write(absPath, pathInBundle)
-	createAddonStoreJson(dest)
+	# Add-on store does not require submitting json files.
+	# createAddonStoreJson(dest)
 	return dest