removing install pytest from travis and run_pytest; both travis and circle run pip install requirements.txt first (circle is building new containers that depend on the current version of the file)

Author: djarecka

.travis.yml

@@ -32,7 +32,7 @@ install:
 - function inst {
   conda config --add channels conda-forge &&
   conda update --yes conda &&
-  conda update --all -y python=$TRAVIS_PYTHON_VERSION pytest &&
+  conda update --all -y python=$TRAVIS_PYTHON_VERSION &&
   conda install -y nipype &&
   rm -r /home/travis/miniconda/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/nipype* &&
   pip install -r requirements.txt &&

docker/circleci/run_pytests.sh

@@ -21,15 +21,9 @@ if [[ "${PYTHON_VERSION}" -lt "30" ]]; then
 fi
 
 # Run tests using pytest
-# NOTE_dj: this has to be improved, help needed.
-# NOTE_dj: pip install can be probably moved to dockerfiles
 # NOTE_dj: not sure about --xunit-file part (not using with pytest for now)
 cd /root/src/nipype/
 make clean
-conda install pytest
-pip install pytest-raisesregexp
-conda install pytest-cov
-conda install click
 py.test --doctest-modules --cov-report xml:/scratch/coverage_py${PYTHON_VERSION}.xml --cov=nipype nipype
 #nosetests -s nipype -c /root/src/nipype/.noserc --xunit-file="/scratch/nosetests_py${PYTHON_VERSION}.xml" --cover-xml-file="/scratch/coverage_py${PYTHON_VERSION}.xml"
 

requirements.txt

@@ -12,7 +12,6 @@ xvfbwrapper
 psutil
 funcsigs
 configparser
-doctest-ignore-unicode
 pytest>=3.0
 pytest-raisesregexp
 pytest-cov