rebasing branch

conda-incubator · Oct 30, 2022 · 23d2104 · 23d2104
1 parent 5ab313f
commit 23d2104
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/condacolab.py b/condacolab.py
@@ -136,7 +136,7 @@ def _update_environment(
         if specs:
             env_details["dependencies"] = specs
         if python_version:
-            env_details["dependencies"].extend([f"python={python_version}"])
+            env_details["dependencies"] += [f"python={python_version}"]
         if pip_args:
             pip_args_dict = {"pip": pip_args}
             env_details["dependencies"].append(pip_args_dict)
@@ -297,8 +297,6 @@ def install_from_url(
         "pip_task.log"
         )
 
-<<<<<<< HEAD
-=======
     print("📌 Adjusting configuration...")
     cuda_version = ".".join(os.environ.get("CUDA_VERSION", "*.*.*").split(".")[:2])
     prefix = Path(prefix)
@@ -329,7 +327,6 @@ def install_from_url(
             extra_conda_args=extra_conda_args,
             )
 
->>>>>>> 245e25c (API for customizing the conda base env)
     env = env or {}
     bin_path = f"{prefix}/bin"