fix release script and bad merge

BoundaryML · Dec 31, 2024 · 464ec1b · 464ec1b
1 parent 7b79ac4
commit 464ec1b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/integ-tests/python/tests/test_functions.py b/integ-tests/python/tests/test_functions.py
@@ -40,14 +40,11 @@
     BlockConstraintForParam,
     NestedBlockConstraintForParam,
     MapKey,
-<<<<<<< HEAD
     LinkedListAliasNode,
     ClassToRecAlias,
     NodeWithAliasIndirection,
     MergeAttrs,
-=======
     OptionalListAndMap,
->>>>>>> canary
 )
 import baml_client.types as types
 from ..baml_client.tracing import trace, set_tags, flush, on_log_event

diff --git a/tools/bump-version b/tools/bump-version
@@ -233,6 +233,7 @@ pnpm build
 pnpm generate
 
 cd "${_repo_root}/integ-tests/python"
+poetry install
 env -u CONDA_PREFIX poetry run maturin develop --manifest-path ${_repo_root}/engine/language_client_python/Cargo.toml
 poetry run baml-cli generate --from ../baml_src