Merge pull request #1504 from shoshber/mockdep

WIP/FIX clean up dependency, installation

Author: Shoshana Berleant

.travis.yml

@@ -45,7 +45,6 @@ install:
 - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then conda install --yes vtk; fi
 - pip install python-coveralls
 - pip install nose-cov
-- pip install mock
 # Add tvtk (PIL is required by blockcanvas)
 # Install mayavi (see https://github.com/enthought/mayavi/issues/271)
 - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
@@ -56,8 +55,7 @@ install:
   pip install https://github.com/dmsurti/mayavi/archive/4d4aaf315a29d6a86707dd95149e27d9ed2225bf.zip;
   pip install -e git+https://github.com/enthought/ets.git#egg=ets;
   fi
-- pip install -r requirements.txt  # finish remaining requirements
-- python setup.py install
+- pip install -e .
 script:
 - python -W once:FSL:UserWarning:nipype `which nosetests` --with-doctest --with-cov --cover-package nipype --cov-config .coveragerc --logging-level=DEBUG --verbosity=3
 after_success:

circle.yml

@@ -21,7 +21,7 @@ dependencies:
     # Set up python environment
     - pip install --upgrade pip
     - pip install -e .
-    - pip install matplotlib sphinx ipython boto coverage dipy mock
+    - pip install matplotlib sphinx ipython boto coverage dipy
     # Add tvtk
     - pip install http://effbot.org/downloads/Imaging-1.1.7.tar.gz
     - pip install -e git+https://github.com/enthought/etsdevtools.git#egg=etsdevtools

doc/users/install.rst

@@ -24,7 +24,7 @@ or::
 
         git clone https://github.com/nipy/nipype.git
 
-Check out the list of nipype's `current dependencies <https://github.com/nipy/nipype/blob/master/requirements.txt>`_.
+Check out the list of nipype's `current dependencies <https://github.com/shoshber/nipype/blob/master/nipype/info.py#L105>`_.
 
 Install
 -------
@@ -61,8 +61,7 @@ If you downloaded the source distribution named something
 like ``nipype-x.y.tar.gz``, then unpack the tarball, change into the
 ``nipype-x.y`` directory and install nipype using::
 
-    pip install -r requirements.txt
-    python setup.py install
+    pip install -e .
 
 **Note:** Depending on permissions you may need to use ``sudo``.
 

nipype/info.py

@@ -142,5 +142,6 @@ def get_nipype_gitversion():
             "future>=%s" % FUTURE_MIN_VERSION,
             "simplejson>=%s" % SIMPLEJSON_MIN_VERSION,
             "prov>=%s" % PROV_MIN_VERSION,
+            "mock",
             "xvfbwrapper"]
 STATUS = 'stable'

requirements.txt

@@ -1,11 +1 @@
-numpy>=1.6.2
-scipy>=0.11
-networkx>=1.7
-traits>=4.3
-python-dateutil>=1.5
-nibabel>=2.0.1
-nose>=1.2
-future==0.15.2
-simplejson>=3.8.0
-prov>=1.4.0
-xvfbwrapper
+Nipype no longer maintains this file. Use ``pip install \-e .`` instead.