Merge branch 'master' into add-water-heater-management-test-scripts

jamesharrow · web-flow · commit 5dc0d93d7151 · 2024-07-29T00:32:43.000+01:00
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -21,7 +21,9 @@
         "vadimcn.vscode-lldb",
         "xaver.clang-format",
         "yuichinukiyama.vscode-preview-server",
-        "yzhang.markdown-all-in-one"
+        "yzhang.markdown-all-in-one",
+        "ms-python.autopep8",
+        "ms-python.isort"
     ],
     // 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
@@ -192,5 +192,5 @@
     "[python]": {
         "editor.defaultFormatter": "ms-python.autopep8"
     },
-    "python.formatting.provider": "none"
+    "autopep8.args": ["--max-line-length", "132"]
 }

Original file line number	Diff line number	Diff line change
`@@ -192,5 +192,5 @@`
`192`	`192`	`"[python]": {`
`193`	`193`	`"editor.defaultFormatter": "ms-python.autopep8"`
`194`	`194`	`},`
`195`		`- "python.formatting.provider": "none"`
	`195`	`+ "autopep8.args": ["--max-line-length", "132"]`
`196`	`196`	`}`