Add setuptools to install

bids-apps · Jun 25, 2020 · 5f593f5 · 5f593f5
1 parent f7435b6
commit 5f593f5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
 # Generated by Neurodocker version 0.4.2-3-gf7055a1
-# Timestamp: 2020-06-04 13:51:08 UTC
-#
+# Timestamp: 2020-06-25 20:45:40 UTC
+# 
 # Thank you for using Neurodocker. If you discover any issues
 # or ways to improve this software, please submit an issue or
 # pull request on our GitHub repository:
-#
+# 
 #     https://github.com/kaczmarj/neurodocker
 
 FROM ubuntu:xenial
@@ -52,6 +52,7 @@ RUN apt-get update -qq \
            python3-pip \
            python3-pandas \
            python-pip \
+           python3-setuptools \
            libsm-dev \
            libx11-dev \
            libxt-dev \
@@ -165,8 +166,8 @@ RUN echo '{ \
     \n        "python3", \
     \n        "python3-pip", \
     \n        "python3-pandas", \
-    \n        "python2.7", \
     \n        "python-pip", \
+    \n        "python3-setuptools", \
     \n        "libsm-dev", \
     \n        "libx11-dev", \
     \n        "libxt-dev", \

diff --git a/Singularity b/Singularity
@@ -1,10 +1,10 @@
 # Generated by Neurodocker version 0.4.2-3-gf7055a1
-# Timestamp: 2020-06-04 13:51:09 UTC
-#
+# Timestamp: 2020-06-25 20:45:41 UTC
+# 
 # Thank you for using Neurodocker. If you discover any issues
 # or ways to improve this software, please submit an issue or
 # pull request on our GitHub repository:
-#
+# 
 #     https://github.com/kaczmarj/neurodocker
 
 Bootstrap: docker
@@ -47,6 +47,7 @@ apt-get install -y -q --no-install-recommends \
     python3-pip \
     python3-pandas \
     python-pip \
+    python3-setuptools \
     libsm-dev \
     libx11-dev \
     libxt-dev \
@@ -133,8 +134,8 @@ echo '{
 \n        "python3",
 \n        "python3-pip",
 \n        "python3-pandas",
-\n        "python2.7",
 \n        "python-pip",
+\n        "python3-setuptools",
 \n        "libsm-dev",
 \n        "libx11-dev",
 \n        "libxt-dev",

diff --git a/generate_freesurfer_images.sh b/generate_freesurfer_images.sh
@@ -46,7 +46,7 @@ docker run --rm ${image} generate docker \
   --base ubuntu:xenial \
   --pkg-manager apt \
   --install tcsh bc tar libgomp1 perl-modules wget curl \
-    python3 python3-pip python3-pandas python-pip \
+    python3 python3-pip python3-pandas python-pip python3-setuptools \
     libsm-dev libx11-dev libxt-dev libxext-dev libglu1-mesa \
   --freesurfer version=6.0.1 install_path=/opt/freesurfer \
   --run-bash 'pip3 install nibabel pandas==0.21.0' \
@@ -80,7 +80,7 @@ docker run --rm ${image} generate singularity \
   --base ubuntu:xenial \
   --pkg-manager apt \
   --install tcsh bc tar libgomp1 perl-modules wget curl \
-    python3 python3-pip python3-pandas python-pip \
+    python3 python3-pip python3-pandas python-pip python3-setuptools \
     libsm-dev libx11-dev libxt-dev libxext-dev libglu1-mesa \
   --freesurfer version=6.0.1 install_path=/opt/freesurfer \
   --run-bash 'pip3 install nibabel pandas==0.21.0' \