From 4ded8e73ffe0f4e78135363fb7b774d1e0aa2b50 Mon Sep 17 00:00:00 2001
From: Remi Lehe <remi.lehe@normalesup.org>
Date: Thu, 29 Aug 2024 13:09:25 -0700
Subject: [PATCH] Use botorch<0.11

---
 dev-environment.yml | 2 +-
 environment.yml     | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/dev-environment.yml b/dev-environment.yml
index 9205c07..f4b3450 100644
--- a/dev-environment.yml
+++ b/dev-environment.yml
@@ -9,7 +9,7 @@ dependencies:
   - pyyaml
   - tensorflow
   - keras<3
-  - botorch
+  - botorch<0.11
 
   # dev requirements
   - pytest
diff --git a/environment.yml b/environment.yml
index ac4e387..895354a 100644
--- a/environment.yml
+++ b/environment.yml
@@ -3,12 +3,7 @@ name: lume-model
 channels:
   - conda-forge
 dependencies:
-<<<<<<< HEAD
-  - python=3.10
-  - keras<3
-=======
   - python=3.9
->>>>>>> parent of 53ac916... Update default Python version to 3.10
   - pydantic>2.3
   - numpy
   - pyyaml