From c04ba2eb1d2c0fdeea71c87f8933011abd88403d Mon Sep 17 00:00:00 2001 From: Dhananjhay Date: Thu, 16 Jan 2025 19:30:20 -0500 Subject: [PATCH] resolve dependencies in isolated conda envs --- hippunfold/workflow/envs/env1.yaml | 1 + hippunfold/workflow/envs/env10.yaml | 2 +- hippunfold/workflow/rules/warps.smk | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hippunfold/workflow/envs/env1.yaml b/hippunfold/workflow/envs/env1.yaml index c0ad7f87..29e64202 100644 --- a/hippunfold/workflow/envs/env1.yaml +++ b/hippunfold/workflow/envs/env1.yaml @@ -9,3 +9,4 @@ dependencies: - nibabel>=3.2.1 - scikit-fmm>=2022.03.26 - scipy=1.7.1 + - pandas>=1.2.0,<1.3.0 diff --git a/hippunfold/workflow/envs/env10.yaml b/hippunfold/workflow/envs/env10.yaml index febdf68e..9243b572 100644 --- a/hippunfold/workflow/envs/env10.yaml +++ b/hippunfold/workflow/envs/env10.yaml @@ -8,4 +8,4 @@ dependencies: - nibabel>=3.2.1 - numpy - scipy=1.7.1 - - astropy>=4.0,<4.3.1 + - astropy diff --git a/hippunfold/workflow/rules/warps.smk b/hippunfold/workflow/rules/warps.smk index 2f815377..e269664e 100644 --- a/hippunfold/workflow/rules/warps.smk +++ b/hippunfold/workflow/rules/warps.smk @@ -441,7 +441,7 @@ rule create_warps_hipp: container: config["singularity"]["autotop"] conda: - "../envs/env1.yaml" + "../envs/env10.yaml" script: "../scripts/create_warps.py" @@ -568,7 +568,7 @@ rule create_warps_dentate: container: config["singularity"]["autotop"] conda: - "../envs/env1.yaml" + "../envs/env10.yaml" script: "../scripts/create_warps.py"