Merge pull request #161 from satra/fix/circle

fix: vtk tools build error

Author: satra

.circleci/config.yml

@@ -24,9 +24,10 @@ jobs:
             ln -sv /usr/lib/x86_64-linux-gnu /usr/lib64
             conda config --set show_channel_urls yes --set always_yes yes
             conda config --add channels conda-forge
-            conda update conda conda-env
-            conda env create --quiet
+            conda create -n $ENV_NAME python=3.6 pip
             source activate $ENV_NAME
+            conda install -y cmake mesalib vtk pandas matplotlib \
+                colormath nipype tbb-devel nose
             conda info --envs
             python setup.py install
             mkdir $vtk_cpp_tools && cd $vtk_cpp_tools && cmake ../ && make

environment.yml

@@ -1,5 +1,5 @@
 # Generated by Neurodocker version 0.4.1
-# Timestamp: 2018-09-13 15:00:27 UTC
+# Timestamp: 2018-10-05 14:45:31 UTC
 # 
 # Thank you for using Neurodocker. If you discover any issues
 # or ways to improve this software, please submit an issue or
@@ -131,6 +131,8 @@ RUN export PATH="/opt/miniconda-latest/bin:$PATH" \
            matplotlib \
            colormath \
            nipype \
+           tbb-devel \
+           nose \
     && sync && conda clean -tipsy && sync \
     && bash -c "source activate mb \
     &&   pip install  --no-cache-dir \
@@ -242,7 +244,9 @@ RUN echo '{ \
     \n          "pandas", \
     \n          "matplotlib", \
     \n          "colormath", \
-    \n          "nipype" \
+    \n          "nipype", \
+    \n          "tbb-devel", \
+    \n          "nose" \
     \n        ], \
     \n        "pip_install": [ \
     \n          "datalad[full]", \

install/Dockerfile

@@ -55,7 +55,7 @@ docker run --rm kaczmarj/neurodocker:0.4.1 generate docker \
   --run 'ln -s /usr/lib/x86_64-linux-gnu /usr/lib64' \
   --miniconda \
     conda_install="python=3.6 pip jupyter cmake mesalib vtk pandas \
-      matplotlib colormath nipype" \
+      matplotlib colormath nipype tbb-devel nose" \
     pip_install="datalad[full] duecredit" \
     create_env="mb" \
     activate=true \