specify mock dependency in info.py instead

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

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

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'