Merge pull request #2284 from FCP-INDI/fix/check_s3-version

⏪️ Revert "[pre-commit.ci] auto fixes from pre-commit.com hooks (651cfa5)"

Author: birajstha

.github/Dockerfiles/C-PAC.develop-jammy.Dockerfile

@@ -14,7 +14,7 @@
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
-FROM ghcr.io/fcp-indi/c-pac/stage-base:standard-v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:standard-v1.8.8.dev1
 LABEL org.opencontainers.image.description="Full C-PAC image"
 LABEL org.opencontainers.image.source=https://github.com/FCP-INDI/C-PAC
 USER root
@@ -42,7 +42,7 @@ RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache/* \
     && apt-get autoremove -y \
     && ldconfig \
     && chmod 777 / \
-    && chmod 777 $(ls / | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 sys | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 proc)
+    && chmod 777 $(ls / | grep -v sys | grep -v proc)
 ENV PYTHONUSERBASE=/home/c-pac_user/.local
 ENV PATH=$PATH:/home/c-pac_user/.local/bin \
     PYTHONPATH=$PYTHONPATH:$PYTHONUSERBASE/lib/python3.10/site-packages \

.github/Dockerfiles/C-PAC.develop-lite-jammy.Dockerfile

@@ -14,7 +14,7 @@
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
-FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.8.dev1
 LABEL org.opencontainers.image.description="Full C-PAC image without FreeSurfer"
 LABEL org.opencontainers.image.source=https://github.com/FCP-INDI/C-PAC
 USER root
@@ -43,7 +43,7 @@ RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache/* \
     && apt-get autoremove -y \
     && ldconfig \
     && chmod 777 / \
-    && chmod 777 $(ls / | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 sys | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 proc)
+    && chmod 777 $(ls / | grep -v sys | grep -v proc)
 ENV PYTHONUSERBASE=/home/c-pac_user/.local
 ENV PATH=$PATH:/home/c-pac_user/.local/bin \
     PYTHONPATH=$PYTHONPATH:$PYTHONUSERBASE/lib/python3.10/site-packages \

.github/Dockerfiles/base-standard.Dockerfile

@@ -16,7 +16,7 @@
 # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
 FROM ghcr.io/fcp-indi/c-pac/freesurfer:6.0.0-min.neurodocker-jammy AS freesurfer
 
-FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.8.dev1
 LABEL org.opencontainers.image.description="NOT INTENDED FOR USE OTHER THAN AS A STAGE IMAGE IN A MULTI-STAGE BUILD \
 Standard software dependencies for C-PAC standard images"
 LABEL org.opencontainers.image.source=https://github.com/FCP-INDI/C-PAC
@@ -56,7 +56,7 @@ RUN apt-get autoremove -y \
     && rm -rf results.txt \
     && ldconfig \
     && chmod 777 / /home/c-pac_user \
-    && chmod 777 $(ls / | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 sys | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 proc)
+    && chmod 777 $(ls / | grep -v sys | grep -v proc)
 
 # set user
 USER c-pac_user

CPAC/anat_preproc/ants.py

@@ -43,7 +43,7 @@
 """
 
 from collections import OrderedDict
-from importlib.resources import as_file, files
+from importlib.resources import files
 from logging import getLogger
 from typing import Literal
 

Dockerfile

@@ -14,7 +14,7 @@
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
-FROM ghcr.io/fcp-indi/c-pac/stage-base:standard-v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:standard-v1.8.8.dev1
 LABEL org.opencontainers.image.description="Full C-PAC image"
 LABEL org.opencontainers.image.source=https://github.com/FCP-INDI/C-PAC
 USER root
@@ -42,7 +42,7 @@ RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache/* \
     && apt-get autoremove -y \
     && ldconfig \
     && chmod 777 / \
-    && chmod 777 $(ls / | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 sys | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 proc)
+    && chmod 777 $(ls / | grep -v sys | grep -v proc)
 ENV PYTHONUSERBASE=/home/c-pac_user/.local
 ENV PATH=$PATH:/home/c-pac_user/.local/bin \
     PYTHONPATH=$PYTHONPATH:$PYTHONUSERBASE/lib/python3.10/site-packages \

variant-lite.Dockerfile

@@ -14,7 +14,7 @@
 
 # You should have received a copy of the GNU Lesser General Public
 # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>.
-FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1
+FROM ghcr.io/fcp-indi/c-pac/stage-base:lite-v1.8.8.dev1
 LABEL org.opencontainers.image.description="Full C-PAC image without FreeSurfer"
 LABEL org.opencontainers.image.source=https://github.com/FCP-INDI/C-PAC
 USER root
@@ -43,7 +43,7 @@ RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache/* \
     && apt-get autoremove -y \
     && ldconfig \
     && chmod 777 / \
-    && chmod 777 $(ls / | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 sys | grep -v1.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev11.8.8.dev1 proc)
+    && chmod 777 $(ls / | grep -v sys | grep -v proc)
 ENV PYTHONUSERBASE=/home/c-pac_user/.local
 ENV PATH=$PATH:/home/c-pac_user/.local/bin \
     PYTHONPATH=$PYTHONPATH:$PYTHONUSERBASE/lib/python3.10/site-packages \