diff --git a/.travis.yml b/.travis.yml index ca29323e5f..7e77dba508 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ install: conda config --add channels conda-forge && conda update --yes conda && conda update --all -y python=$TRAVIS_PYTHON_VERSION && - conda install -y nipype && + conda install -y nipype icu==56.1 && rm -r /home/travis/miniconda/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/nipype* && pip install -r requirements.txt && pip install -e .[$NIPYPE_EXTRAS]; } diff --git a/doc/devel/interface_specs.rst b/doc/devel/interface_specs.rst index 166598df64..2f7d63496e 100644 --- a/doc/devel/interface_specs.rst +++ b/doc/devel/interface_specs.rst @@ -353,7 +353,7 @@ CommandLine be fixed it's recommended to just use ``usedefault``. ``sep`` - For List traits the string with witch elements of the list will be joined. + For List traits the string with which elements of the list will be joined. ``name_source`` Indicates the list of input fields from which the value of the current File