Permalink
Browse files

setup/testing tweaks

  • Loading branch information...
1 parent 1c285e4 commit 52463865f294482680bd0ee82471687754e814d7 @tyarkoni tyarkoni committed Sep 17, 2015
Showing with 9 additions and 7 deletions.
  1. +0 −3 .travis.yml
  2. +2 −2 ci/show-python-package-versions.py
  3. +4 −1 setup.cfg
  4. +3 −1 setup.py
View
@@ -8,7 +8,6 @@ env:
global:
- TEST_RUN_FOLDER="/tmp" # folder where the tests are run from
- DEFAULT_TO_LATEST=true # use latest package versions if not explicitly set
- - NIBABEL_VERSION="2.0.0" # temporary--remove after fixing install_requires
matrix:
- DISTRIB="conda" PYTHON_VERSION="2.7"
# - DISTRIB="neurodebian" PYTHON_VERSION="2.7"
@@ -28,8 +27,6 @@ before_script:
- rm -rf build
- rm -f tags
-clean: clean-build clean-pyc clean-so clean-ctags
-
script:
- python ci/show-python-package-versions.py
- (cd "$TEST_RUN_FOLDER" && nosetests -s neurosynth)
@@ -2,7 +2,7 @@
import sys
DEPENDENCIES = ['numpy', 'scipy', 'sklearn', 'matplotlib', 'nibabel',
- 'sklearn', 'ply', 'pandas']
+ 'ply', 'pandas']
def print_package_version(package_name, indent=' '):
@@ -24,4 +24,4 @@ def print_package_version(package_name, indent=' '):
print('Dependencies versions')
for package_name in DEPENDENCIES:
print_package_version(package_name)
- print('=' * 120)
+ print('=' * 120)
View
@@ -1,2 +1,5 @@
[metadata]
-description-file = README.md
+description-file = README.md
+
+[bdist_wheel]
+universal = 1
View
@@ -28,7 +28,9 @@
maintainer='Tal Yarkoni',
maintainer_email='tyarkoni@gmail.com',
url='http://github.com/neurosynth/neurosynth',
- download_url = 'https://github.com/neurosynth/neurosynth/tarball/%s' % __version__,
+ download_url='https://github.com/neurosynth/neurosynth/tarball/%s' % __version__,
+ install_requires=['numpy', 'scipy', 'pandas', 'ply', 'sklearn',
+ 'nibabel', 'six']
packages=["neurosynth",
"neurosynth.base",
"neurosynth.analysis",

0 comments on commit 5246386

Please sign in to comment.