From d62894f1345fb39b55ad4f5492c4e5eea6f2e03f Mon Sep 17 00:00:00 2001 From: Jennings Zhang Date: Fri, 27 May 2022 06:20:09 -0400 Subject: [PATCH] Update dependencies --- Dockerfile | 2 +- requirements.txt | 2 +- setup.py | 2 +- sphere_mesh_wrapper.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 54aa5f1..6f458d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/fnndsc/mni-conda-base:civet2.1.1-python3.10.2 +FROM docker.io/fnndsc/mni-conda-base:civet2.1.1-python3.10.4 LABEL org.opencontainers.image.authors="FNNDSC " \ org.opencontainers.image.title="sphere_mesh ChRIS plugin wrapper" diff --git a/requirements.txt b/requirements.txt index ef5ed77..58b90e9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -chris_plugin~=0.0.10 +chris_plugin==0.0.17 pycivet==0.0.2a1 loguru~=0.6.0 diff --git a/setup.py b/setup.py index ea58aec..1a57a87 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name = 'ep-sphere_mesh', - version = '0.0.2', + version = '0.0.3', description = 'A ChRIS ds plugin wrapper for sphere_mesh', author = 'Jennings Zhang', author_email = 'Jennings.Zhang@childrens.harvard.edu', diff --git a/sphere_mesh_wrapper.py b/sphere_mesh_wrapper.py index f9ec889..d66c6fc 100755 --- a/sphere_mesh_wrapper.py +++ b/sphere_mesh_wrapper.py @@ -76,7 +76,7 @@ def main(options: Namespace, inputdir: Path, outputdir: Path): results = [] with ThreadPoolExecutor(max_workers=len(os.sched_getaffinity(0))) as pool: - mapper = PathMapper(inputdir, outputdir, glob=options.pattern, suffix='.obj') + mapper = PathMapper.file_mapper(inputdir, outputdir, glob=options.pattern, suffix='.obj') for mnc, obj in mapper: results.append(pool.submit(sphere_mesh_wrapper, mnc, obj, options.side))