From 110df775970872ee3fdeb57be18429cb13491ba4 Mon Sep 17 00:00:00 2001
From: Hao Lin <hrlin@berkeley.edu>
Date: Wed, 18 Dec 2024 16:15:32 -0800
Subject: [PATCH] Replace conda --force flag with --yes and update miniconda
 version (#32)

* Replace --force flag with --yes

* Bump xcode version to 13.4.1

* Update image and conda versions

* Use cmg
---
 .circleci/config.yml | 8 ++++----
 ci/install.sh        | 4 ++--
 src/main.rs          | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ef8ec6a..47b4240 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,21 +9,21 @@ commands:
 jobs:
   unit_test_linux:
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.12
     steps:
       - checkout
       - run_install_and_script 
 
   unit_test_darwin:
     macos:
-      xcode: 12.5.1
+      xcode: 16.2.0
     steps:
       - checkout
       - run_install_and_script
 
   deploy_linux:
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.12
     steps:
       - checkout
       # needs ANACONDA_ORG_TOKEN env var
@@ -32,7 +32,7 @@ jobs:
 
   deploy_darwin:
     macos:
-      xcode: 12.5.1
+      xcode: 16.2.0
     steps:
       - checkout
       # needs ANACONDA_ORG_TOKEN env var
diff --git a/ci/install.sh b/ci/install.sh
index 2596d68..97e4f88 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -3,10 +3,10 @@
 set -e
 
 if [[ "$(uname)" == "Darwin" ]]; then
-    URL="https://repo.anaconda.com/miniconda/Miniconda3-py37_4.10.3-MacOSX-x86_64.sh"
+    URL="https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-MacOSX-arm64.sh"
     HOMEBREW_NO_AUTO_UPDATE=1 brew install wget
 else
-    URL="https://repo.anaconda.com/miniconda/Miniconda3-py37_4.10.3-Linux-x86_64.sh"
+    URL="https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-Linux-x86_64.sh"
 fi
 wget $URL -O miniconda.sh;
 bash miniconda.sh -b -p $HOME/miniconda
diff --git a/src/main.rs b/src/main.rs
index 1386ec4..3b26ac3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -255,7 +255,7 @@ fn freeze_same_platform(depfile_path: &str, lockfile_path: &str) -> Result<()> {
             &depfile_path,
             "-n",
             &tmp_name,
-            "--force",
+            "--yes",
         ],
     )?;
     info!("Made new env new env");
@@ -488,7 +488,7 @@ fn handle_create(matches: &ArgMatches) -> Result<()> {
         &[
             "env",
             "create",
-            "--force",
+            "--yes",
             "-q",
             "--json",
             "--name",