Skip to content

CI/DOCKER: Hard code miniconda 4.3.31 #2454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,28 @@ jobs:
- run: *_run_codecov_coverage
- store_artifacts: *store_artifacts_kwds
- store_test_results: *store_artifacts_kwds
- run:
name: Build docs (py36)
no_output_timeout: 30m
environment: *test_environment
command: bash -ux /home/circleci/nipype/.circleci/test_py3_docs.sh
- store_artifacts:
path: /home/circleci/work/docs
- run:
name: Save Docker images to workspace if on master
no_output_timeout: 60m
command: |
if [ "$CIRCLE_BRANCH" = "master" -a -z "$CIRCLE_PULL_REQUEST" ]; then
docker save nipype/nipype:base \
nipype/nipype:latest \
nipype/nipype:py27 \
nipype/nipype:py36 | gzip -1 > /tmp/docker/nipype-base-latest-py36-py27.tar.gz \
&& du -h /tmp/docker/nipype-base-latest-py36-py27.tar.gz
fi
- persist_to_workspace:
root: /tmp
paths:
- docker

test_py3_fmri_fsl_spm:
machine: *machine_kwds
Expand All @@ -200,11 +222,6 @@ jobs:
- run: *_get_codecov
- run: *_download_test_data
- run: *prepare_working_directory
- run:
name: Run FSL FEEDS pipeline (py36)
no_output_timeout: 40m
environment: *test_environment
command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_fsl_feeds_linear_l1.sh
- run:
name: Run FSL reuse pipeline (py36)
no_output_timeout: 40m
Expand Down Expand Up @@ -252,7 +269,7 @@ jobs:
- run: *_run_codecov_smoke
- store_artifacts: *store_artifacts_kwds

test_fmri_spm_nested_multiproc:
test_fmri_spm_nested_fsl_feeds:
machine: *machine_kwds
working_directory: /home/circleci/nipype
steps:
Expand All @@ -279,30 +296,13 @@ jobs:
no_output_timeout: 30m
environment: *test_environment
command: bash -ux /home/circleci/nipype/.circleci/test_py2_fmri_spm_nested_multiproc_l2.sh
- run: *_run_codecov_smoke
- store_artifacts: *store_artifacts_kwds
- run:
name: Build docs (py36)
no_output_timeout: 30m
name: Run FSL FEEDS pipeline (py36)
no_output_timeout: 40m
environment: *test_environment
command: bash -ux /home/circleci/nipype/.circleci/test_py3_docs.sh
- store_artifacts:
path: /home/circleci/work/docs
- run:
name: Save Docker images to workspace if on master
no_output_timeout: 60m
command: |
if [ "$CIRCLE_BRANCH" = "master" -a -z "$CIRCLE_PULL_REQUEST" ]; then
docker save nipype/nipype:base \
nipype/nipype:latest \
nipype/nipype:py27 \
nipype/nipype:py36 | gzip -1 > /tmp/docker/nipype-base-latest-py36-py27.tar.gz \
&& du -h /tmp/docker/nipype-base-latest-py36-py27.tar.gz
fi
- persist_to_workspace:
root: /tmp
paths:
- docker
command: bash -ux /home/circleci/nipype/.circleci/test_py3_fmri_fsl_feeds_linear_l1.sh
- run: *_run_codecov_smoke
- store_artifacts: *store_artifacts_kwds

deploy:
docker:
Expand Down Expand Up @@ -350,7 +350,7 @@ workflows:
- test_py3_fmri_spm_dartel_multiproc:
requires:
- compare_base_dockerfiles
- test_fmri_spm_nested_multiproc:
- test_fmri_spm_nested_fsl_feeds:
requires:
- compare_base_dockerfiles
- deploy:
Expand All @@ -359,6 +359,6 @@ workflows:
only: master
requires:
- test_pytest
- test_fmri_spm_nested_multiproc
- test_fmri_spm_nested_fsl_feeds
- test_py3_fmri_fsl_spm
- test_py3_fmri_spm_dartel_multiproc
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ before_install:
fi;

# handle python operations separately to reduce timeouts
- wget https://repo.continuum.io/miniconda/Miniconda${TRAVIS_PYTHON_VERSION:0:1}-latest-Linux-x86_64.sh
- wget https://repo.continuum.io/miniconda/Miniconda${TRAVIS_PYTHON_VERSION:0:1}-4.3.31-Linux-x86_64.sh
-O /home/travis/.cache/conda.sh
- bash ${HOME}/.cache/conda.sh -b -p ${HOME}/conda
- export PATH=${HOME}/conda/bin:$PATH
Expand Down
1 change: 1 addition & 0 deletions docker/generate_dockerfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ function generate_main_dockerfile() {
--user neuro \
--miniconda env_name=neuro \
activate=true \
miniconda_version=4.3.31 \
--copy docker/files/run_builddocs.sh docker/files/run_examples.sh \
docker/files/run_pytests.sh nipype/external/fsl_imglob.py /usr/bin/ \
--copy . /src/nipype \
Expand Down