make install now installs extras (microsoft#136)

momuno · Oct 16, 2024 · 03750a0 · 03750a0
1 parent 99eeacc
commit 03750a0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/assistants/prospector-assistant/uv.lock b/assistants/prospector-assistant/uv.lock
diff --git a/libraries/python/assistant-extensions/pyproject.toml b/libraries/python/assistant-extensions/pyproject.toml
@@ -9,16 +9,10 @@ description = "Add your description here"
 authors = [{ name = "Semantic Workbench Team" }]
 readme = "README.md"
 requires-python = ">=3.11"
-dependencies = [
-    "assistant-drive>=0.1.0",
-    "docx2txt>=0.8",
-    "openai>=1.51.2",
-    "pdfplumber>=0.11.4",
-    "semantic-workbench-assistant>=0.1.0",
-]
+dependencies = ["openai>=1.51.2", "semantic-workbench-assistant>=0.1.0"]
 
 [project.optional-dependencies]
-attachments = ["docx2txt>=0.8", "pdfplumber>=0.11.2"]
+attachments = ["docx2txt>=0.8", "pdfplumber>=0.11.2", "assistant-drive>=0.1.0"]
 
 [tool.uv]
 package = true

diff --git a/libraries/python/assistant-extensions/uv.lock b/libraries/python/assistant-extensions/uv.lock
diff --git a/tools/makefiles/python.mk b/tools/makefiles/python.mk
@@ -10,6 +10,8 @@ else
 venv_dir = .venv
 endif
 
+UV_SYNC_ARGS ?= --all-extras
+
 ## Rules
 
 .PHONY: install
@@ -35,5 +37,5 @@ format:
 ifneq ($(findstring pytest,$(if $(shell command -v uv $(null_stderr)),$(shell uv tree --depth 1),)),)
 .PHONY: test
 test:
-	uv run pytest $(PYTEST_ARGS)
+	uv run $(uv_project_args) pytest $(PYTEST_ARGS)
 endif