Merge branch 'master' of https://github.com/neurosynth/neurosynth

neurosynth · Mar 24, 2014 · 57a44bf · 57a44bf
2 parents 6da9bb6 + fffb5ff
commit 57a44bf
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 *.pyc
 *.DS_Store
 *~
-build/
+build/
+dist
+dist/*
diff --git a/MANIFEST b/MANIFEST
@@ -2,6 +2,7 @@
 Changelog.md
 LICENSE
 README.md
+setup.cfg
 setup.py
 examples/.DS_Store
 examples/classify_regions_using_features.ipynb

diff --git a/dist/neurosynth-0.3.0.dev.tar.gz b/dist/neurosynth-0.3.0.dev.tar.gz
diff --git a/neurosynth/analysis/meta.py b/neurosynth/analysis/meta.py
@@ -192,7 +192,7 @@ def save_results(self, outroot, image_list=None):
         to all file names. Optionally, a restricted list of images to save can be passed; otherwise,
         all images currently stored in self.images will be saved. """
         logger.debug("Saving results...")
-        if image_list == None:
+        if image_list is None:
             image_list = self.images.keys()
         for suffix, img in self.images.items():
             if suffix in image_list:

diff --git a/neurosynth/version.py b/neurosynth/version.py
@@ -4,4 +4,4 @@
 """Specifies current version of NeuroSynth to be used by setup.py and __init__.py
 """
 
-__version__ = '0.3.0.dev'
+__version__ = '0.3.1'
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.md