Merge remote-tracking branch 'origin/main' into update-css-2024-05-29

posit-dev · May 29, 2024 · 333b141 · 333b141
2 parents 6d9a1cb + 339e6c4
commit 333b141
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,6 +1,6 @@
 {
 	"recommendations": [
-    "posit.shiny-python",
+    "posit.shiny",
 		"esbenp.prettier-vscode",
     "ms-python.black-formatter",
 	]

diff --git a/setup.cfg b/setup.cfg
@@ -56,6 +56,7 @@ install_requires =
     # starlette. For more information, see:
     # https://github.com/posit-dev/py-shiny/issues/1114#issuecomment-1942757757
     python-multipart>=0.0.7;platform_system!="Emscripten"
+    setuptools;python_version>="3.12"
 tests_require =
     pytest>=3
 zip_safe = False