From 9b1da7b3b34d70944f4458f76477046b98f4d5e0 Mon Sep 17 00:00:00 2001 From: Jacob Oursland Date: Mon, 18 Dec 2023 13:08:42 -0800 Subject: [PATCH 1/2] Conda: use --no-prune when setting up the devenv. --- conda/setup-environment.cmd | 2 +- conda/setup-environment.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/setup-environment.cmd b/conda/setup-environment.cmd index 24c7610850..dd51d7c739 100644 --- a/conda/setup-environment.cmd +++ b/conda/setup-environment.cmd @@ -7,4 +7,4 @@ call conda config --add envs_dirs %CD%/.conda call conda config --set env_prompt "({name})" :: install the FreeCAD dependencies into the environment -call mamba run --live-stream -n freecad mamba-devenv -f conda/environment.devenv.yml +call mamba run --live-stream -n freecad mamba-devenv --no-prune -f conda/environment.devenv.yml diff --git a/conda/setup-environment.sh b/conda/setup-environment.sh index c667e2dbf3..bd75d76602 100755 --- a/conda/setup-environment.sh +++ b/conda/setup-environment.sh @@ -9,4 +9,4 @@ conda config --add envs_dirs $(pwd)/.conda conda config --set env_prompt "({name})" # install the FreeCAD dependencies into the environment -mamba run --live-stream -n freecad mamba-devenv -f conda/environment.devenv.yml +mamba run --live-stream -n freecad mamba-devenv --no-prune -f conda/environment.devenv.yml From dd16a4d5c34ef0674f8a3e0ff8a302dba7a5d3cd Mon Sep 17 00:00:00 2001 From: Jacob Oursland Date: Mon, 18 Dec 2023 13:23:08 -0800 Subject: [PATCH 2/2] Conda: Use python 3.11.*, not 3.11 which is 3.11.0. --- conda/conda-env.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/conda-env.yaml b/conda/conda-env.yaml index e564b8f043..1bd63b1952 100644 --- a/conda/conda-env.yaml +++ b/conda/conda-env.yaml @@ -3,6 +3,6 @@ channels: - conda-forge dependencies: - conda-devenv -- mamba==1.4.9 # NOTE: Pin to highest version supported by the devenv -- python==3.11 # dependencies. If a higher version is installed, a crash - # occurs during the downgrade process. +- mamba==1.4.9 # NOTE: Pin to highest version supported by the devenv +- python==3.11.* # dependencies. If a higher version is installed, a crash + # occurs during the downgrade process.