Merge pull request #31 from mgxd/fix/den

Fix: density key

Author: mgxd

.circleci/config.yml

@@ -33,9 +33,9 @@ jobs:
 
       - restore_cache:
           keys:
-            - deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
-            - deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
-            - deps-v5-
+            - deps-v6-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
+            - deps-v6-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
+            - deps-v6-
 
       - run:
           name: Get TemplateFlow Zip package
@@ -72,7 +72,7 @@ jobs:
             git config --global user.email "[email protected]"
 
       - save_cache:
-          key: deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
+          key: deps-v6-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
           paths:
             - "/opt/circleci/.pyenv/versions/3.5.2"
             - "/tmp/data/templateflow"
@@ -257,9 +257,9 @@ jobs:
 
       - restore_cache:
           keys:
-            - deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
-            - deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
-            - deps-v5-
+            - deps-v6-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
+            - deps-v6-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
+            - deps-v6-
 
       - add_ssh_keys:
           fingerprints:
@@ -312,9 +312,9 @@ jobs:
 
       - restore_cache:
           keys:
-            - deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
-            - deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
-            - deps-v5-
+            - deps-v6-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
+            - deps-v6-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
+            - deps-v6-
 
       - run:
           name: Deploy to PyPi

templateflow/api.py

@@ -21,9 +21,15 @@ def get(template, **kwargs):
         Index to an specific spatial resolution of the template.
     suffix : str or None
         BIDS suffix
-    atlas : str
+    atlas : str or None
         Name of a particular atlas
-    desc : str
+    hemi : str or None
+        Hemisphere
+    space : str or None
+        Space template is mapped to
+    density : str or None
+        Surface density
+    desc : str or None
         Description field
 
     Examples
@@ -39,6 +45,10 @@ def get(template, **kwargs):
     ['.../tpl-MNI152Lin/tpl-MNI152Lin_res-01_T1w.nii.gz',
      '.../tpl-MNI152Lin/tpl-MNI152Lin_res-02_T1w.nii.gz']
 
+    >>> str(get('fsLR', space=None, hemi='L',
+    ...         density='32k', suffix='sphere'))  # doctest: +ELLIPSIS
+    '.../tpl-fsLR_hemi-L_den-32k_sphere.surf.gii'
+
     """
     out_file = [Path(p) for p in TF_LAYOUT.get(
         template=template, return_type='file', **kwargs)]

templateflow/conf/config.json

@@ -20,8 +20,7 @@
         },
         {
             "name": "density",
-            "pattern": "[_/\\\\]+den-(\\d+)k+",
-            "dtype": "int"
+            "pattern": "[_/\\\\]+den-([a-zA-Z0-9]+)"
         },
         {
             "name": "atlas",