switch to find_packages in setup

neurosynth · Nov 8, 2015 · 6fe1971 · 6fe1971
1 parent 52eccea
commit 6fe1971
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/setup.py b/setup.py
@@ -1,13 +1,7 @@
 import os
 import sys
-
+import setuptools
-# Borrowing a trick from nibabel to enable some functionality coming
+from setuptools import setup, find_packages
-# from setuptools.
-# For some commands, use setuptools
-if len(set(('test', 'easy_install')).intersection(sys.argv)) > 0:
-    import setuptools
-
-from setuptools import setup
 
 extra_setuptools_args = {}
 if 'setuptools' in sys.modules:
@@ -31,10 +25,7 @@
       download_url='https://github.com/neurosynth/neurosynth/tarball/%s' % __version__,
       install_requires=['numpy', 'scipy', 'pandas', 'ply', 'scikit-learn',
                         'nibabel', 'six'],
-      packages=["neurosynth",
+      packages=find_packages(),
-                  "neurosynth.base",
-                  "neurosynth.analysis",
-                  "neurosynth.tests"],
       package_data={'neurosynth': ['resources/*'],
                     'neurosynth.tests': ['data/*']
                     },