make dockerfile python 3.6 compatible

Author: oesteban

Dockerfile

@@ -60,16 +60,16 @@ RUN conda config --add channels conda-forge --add channels intel && \
     conda update -q conda && \
     chmod +x /usr/local/miniconda/bin/*; sync && \
     conda install -y python=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} \
-                     mkl=2017.0.1 \
-                     numpy=1.11.2 \
-                     scipy=0.18.1 \
-                     scikit-learn=0.17.1 \
-                     matplotlib=1.5.3 \
-                     pandas=0.19.0 \
-                     libxml2=2.9.4 \
-                     libxslt=1.1.29 \
+                     mkl \
+                     numpy \
+                     scipy \
+                     scikit-learn \
+                     matplotlib \
+                     pandas \
+                     libxml2 \
+                     libxslt \
                      traits=4.6.0 \
-                     psutil=5.0.1 \
+                     psutil \
                      icu=58.1 && \
     find /usr/local/miniconda/ -exec chmod 775 {} +
 

circle.yml

@@ -39,7 +39,7 @@ dependencies:
         timeout: 6000
     - e=1 && for i in {1..5}; do docker build --rm=false -t nipype/nipype:py27 --build-arg PYTHON_VERSION_MAJOR=2 --build-arg PYTHON_VERSION_MINOR=7 --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg VERSION=$CIRCLE_TAG-py27 . && e=0 && break || sleep 15; done && [ "$e" -eq "0" ] :
         timeout: 6000
-    - docker save -o $HOME/docker/cache.tar ubuntu:xenial-20161213 nipype/base:latest nipype/nipype:latest nipype/nipype_test:py27 nipype/nipype_test:py35 :
+    - docker save -o $HOME/docker/cache.tar ubuntu:xenial-20161213 nipype/base:latest nipype/nipype:py35 nipype/nipype:py27 :
         timeout: 6000
 
 test: