Update use of cellfinder.core download cli (#107)

* Update use of cellfinder.core download cli * Update cellfinder model cache
brainglobe · May 9, 2024 · 8d5a0f5 · 8d5a0f5
1 parent 4700a23
commit 8d5a0f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
@@ -50,7 +50,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: "~/.cellfinder"
-          key: models-${{ hashFiles('~/.cellfinder/**') }}
+          key: models-${{ hashFiles('~/.brainglobe/**') }}
       # Cache atlases
       - name: Cache atlases
         uses: actions/cache@v3

diff --git a/brainglobe_workflows/brainmapper/parser.py b/brainglobe_workflows/brainmapper/parser.py
@@ -18,10 +18,7 @@
 )
 from brainreg.core.cli import atlas_parse, geometry_parser, niftyreg_parse
 from brainreg.core.cli import backend_parse as brainreg_backend_parse
-from cellfinder.core.download.cli import (
-    download_directory_parser,
-    model_parser,
-)
+from cellfinder.core.download.cli import download_parser
 from cellfinder.core.tools.source_files import user_specific_configuration_path
 
 from brainglobe_workflows import __version__
@@ -65,9 +62,8 @@ def brainmapper_parser():
     parser = classification_parse(parser)
     parser = cube_extract_parse(parser)
     parser = misc_parse(parser)
-    parser = model_parser(parser)
     parser = figures_parse(parser)
-    parser = download_directory_parser(parser)
+    parser = download_parser(parser)
 
     # brainreg options
     parser = atlas_parse(parser)