From 464ec1b4ebffb512f0c966d790b706fa7c6c80b6 Mon Sep 17 00:00:00 2001
From: Aaron Villalpando <aaron@boundaryml.com>
Date: Tue, 31 Dec 2024 10:22:23 -0800
Subject: [PATCH] fix release script and bad merge

---
 integ-tests/python/tests/test_functions.py | 3 ---
 tools/bump-version                         | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/integ-tests/python/tests/test_functions.py b/integ-tests/python/tests/test_functions.py
index bf12b8674..b84ca9dbf 100644
--- 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
index 2c63af3c4..29a5746ec 100755
--- 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