Skip to content

Commit

Permalink
test updates wrt container behavior
Browse files Browse the repository at this point in the history
This PR removes the generation of a Singularity recipe given problems wrt the `--copy` argument in `neurodocker`. Furthermore, it adds a new branch that aims to host tests for future updates concerning the container behavior, as well as adds  the printing the list of meta-data files that will be evaluated.
  • Loading branch information
PeerHerholz committed Apr 13, 2021
1 parent e49ae2d commit eb1f0c3
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 117 deletions.
21 changes: 11 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated by Neurodocker version 0.5.0
# Timestamp: 2020-09-16 16:07:32 UTC
# Your version: 0.6.0 Latest version: 0.7.0
# Generated by Neurodocker version 0.6.0
# Timestamp: 2021-04-13 14:10:53 UTC
#
# Thank you for using Neurodocker. If you discover any issues
# or ways to improve this software, please submit an issue or
Expand Down Expand Up @@ -72,17 +73,17 @@ RUN export PATH="/opt/miniconda-latest/bin:$PATH" \
&& sync && conda clean --all && sync \
&& conda create -y -q --name bidsonym \
&& conda install -y -q --name bidsonym \
'python=3.6' \
'numpy' \
'nipype' \
'nibabel' \
'pandas' \
"python=3.6" \
"numpy" \
"nipype" \
"nibabel" \
"pandas" \
&& sync && conda clean --all && sync \
&& bash -c "source activate bidsonym \
&& pip install --no-cache-dir \
'deepdefacer' \
'tensorflow' \
'scikit-image'" \
"deepdefacer" \
"tensorflow" \
"scikit-image"" \
&& rm -rf ~/.cache/pip/* \
&& sync \
&& sed -i '$isource activate bidsonym' $ND_ENTRYPOINT
Expand Down
105 changes: 0 additions & 105 deletions Singularity

This file was deleted.

3 changes: 3 additions & 0 deletions bidsonym/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ def check_meta_data(bids_dir, subject_label, prob_fields=None):
'_desc-headerinfo.csv'),
index=False)

print('the following meta-data files will be checked:')
print(*list_meta_files, sep='\n')

for meta_file in list_meta_files:

with open(meta_file, 'r') as json_file:
Expand Down
4 changes: 2 additions & 2 deletions generate_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
set -e

generate_docker() {
docker run --rm kaczmarj/neurodocker:0.5.0 generate docker \
docker run --rm kaczmarj/neurodocker:0.6.0 generate docker \
--base neurodebian:stretch-non-free \
--pkg-manager apt \
--install fsl-core git num-utils gcc g++ curl build-essential nano\
Expand Down Expand Up @@ -34,7 +34,7 @@ generate_docker() {
}

generate_singularity() {
docker run --rm kaczmarj/neurodocker:0.5.0 generate singularity \
docker run --rm kaczmarj/neurodocker:0.6.0 generate singularity \
--base neurodebian:stretch-non-free \
--pkg-manager apt \
--install fsl-complete git num-utils gcc g++ curl build-essential\
Expand Down

0 comments on commit eb1f0c3

Please sign in to comment.