Merge pull request #37 from neuroscout/enh/neurovault_meta

Add n_subjects to upload options
neuroscout · Apr 9, 2019 · b7e6a01 · b7e6a01
2 parents 9d2b480 + d2a6975
commit b7e6a01
Show file tree

Hide file tree

Showing 4 changed files with 180 additions and 20 deletions.
diff --git a/pyns/models/analysis.py b/pyns/models/analysis.py
@@ -242,17 +242,20 @@ def get_report(self, id, run_id=None):
         """
         return self.get(id=id, sub_route='report', run_id=run_id)
 
-    def upload_neurovault(self, id, tarball, validation_hash, force=False):
+    def upload_neurovault(self, id, tarball, validation_hash, force=False,
+                          n_subjects=None):
         """ Submit analysis for report generation
         :param str id: Analysis hash_id.
         :param str tarball: Path to tarball.
         :param str validation_hash: Validation hash string.
         :param bool force: Force upload with unique timestamped name.
+        :param int n_subjects: Number of subjects in analysis.
         :return: client response object
         """
         files = {'tarball': open(tarball, 'rb')}
         return self.post(id=id, sub_route='upload', files=files,
-                         validation_hash=validation_hash, force=force)
+                         validation_hash=validation_hash, force=force,
+                         n_subjects=n_subjects)
 
     def get_uploads(self, id):
         """ Get NeuroVault uploads associated with this analysis

diff --git a/setup.py b/setup.py
@@ -5,11 +5,11 @@
     long_description = fh.read()
 
 setup(name='pyns',
-      version='0.2.2',
+      version='0.2.3',
       description='Neuroscout API wrapper',
       long_description=long_description,
       long_description_content_type="text/markdown",
-      url='http://github.com/neuroscout/pynv',
+      url='http://github.com/neuroscout/pyns',
       author='Alejandro de la Vega',
       author_email='aleph4@gmail.com',
       license='MIT',

diff --git a/tests/cassettes/upload_analysis.json b/tests/cassettes/upload_analysis.json
diff --git a/tests/test_analysis.py b/tests/test_analysis.py
@@ -218,7 +218,8 @@ def test_upload_analysis(recorder, neuroscout, analysis, get_test_data_path):
     with recorder.use_cassette('upload_analysis'):
         resp = neuroscout.analyses.upload_neurovault(
             id=analysis_id, tarball=str(get_test_data_path / 'tarball.tar.gz'),
-            validation_hash='8Av1Jbo1aO', force=True)
+            validation_hash='8Av1Jbo1aO', force=True,
+            n_subjects=99)
 
         assert 'uploaded_at' in resp
         uploaded_at = resp['uploaded_at']