From 47ddfcf58251b0056e32819a99e0a249b80cdc24 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sat, 19 May 2018 22:09:47 -0400 Subject: [PATCH 1/6] CI: Move PyPI deployment to Circle --- .circleci/config.yml | 25 +++++++++++++++++++++++-- .travis.yml | 11 ----------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 57796d6f57..4715d067f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -299,7 +299,7 @@ jobs: - run: *_run_codecov_smoke - store_artifacts: *store_artifacts_kwds - deploy: + deploy_dockerhub: docker: - image: docker:17.10.0-ce-git steps: @@ -330,6 +330,16 @@ jobs: - /tmp/docker/cache/Dockerfile.base-pruned key: dockerfile-cache-v1-{{ .Branch }}-{{ checksum "/tmp/docker/cache/Dockerfile.base-pruned" }} + deploy_pypi: + machine: *machine_kwds + working_directory: /home/circleci/nipype + steps: + - run: + name: Deploy to PyPI + command: | + pip install twine future + python setup.py sdist bdist_wheel + twine upload dist/* workflows: version: 2 @@ -348,7 +358,7 @@ workflows: - test_fmri_spm_nested_fsl_feeds: requires: - compare_base_dockerfiles - - deploy: + - deploy_dockerhub: filters: branches: only: master @@ -357,3 +367,14 @@ workflows: - test_fmri_spm_nested_fsl_feeds - test_py3_fmri_fsl_spm - test_py3_fmri_spm_dartel_multiproc + - deploy_pypi: + filters: + branches: + ignore: /.*/ + tags: + only: /.*/ + requires: + - test_pytest + - test_fmri_spm_nested_fsl_feeds + - test_py3_fmri_fsl_spm + - test_py3_fmri_spm_dartel_multiproc diff --git a/.travis.yml b/.travis.yml index 7735d7ebb4..74d5ebed4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,16 +60,5 @@ install: script: - py.test -v --cov nipype --cov-config .coveragerc --cov-report xml:cov.xml -c nipype/pytest.ini --doctest-modules nipype -deploy: - provider: pypi - user: satra - password: - secure: OCO0FXb4f+pH4Uw7zWCIRp3qOJ1t7rhky4K8MjNU8tyVCJgd6O/Bv8GJgceS0LktPodlAAjB8SxAhTORPAQZ1D/44PJYy3NQIisvej1zjLpaA9TEGfl6W7MqhDpRyMHW+cnSi/n84SAmdr+Z4vOxScDHdwr13EPmGyOIlHMAGnE= - on: - tags: true - repo: nipy/nipype - branch: master - distributions: "sdist bdist_wheel" - after_script: - codecov --file cov.xml --flags unittests -e TRAVIS_JOB_NUMBER From d3374eb9091dc7f5a05655bd2936744d3ae9cede Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sat, 19 May 2018 22:10:07 -0400 Subject: [PATCH 2/6] CI: Dry-run for testing --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4715d067f9..8e77ce34be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -339,7 +339,7 @@ jobs: command: | pip install twine future python setup.py sdist bdist_wheel - twine upload dist/* + # twine upload dist/* workflows: version: 2 @@ -368,11 +368,11 @@ workflows: - test_py3_fmri_fsl_spm - test_py3_fmri_spm_dartel_multiproc - deploy_pypi: - filters: - branches: - ignore: /.*/ - tags: - only: /.*/ + # filters: + # branches: + # ignore: /.*/ + # tags: + # only: /.*/ requires: - test_pytest - test_fmri_spm_nested_fsl_feeds From 6e003986dd11837601acc04b9bd3516eeb077b8d Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sun, 20 May 2018 06:53:22 -0400 Subject: [PATCH 3/6] STY: Drop terminal backslash --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e77ce34be..7bd032f090 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,7 +54,7 @@ _build_main_image_py36: &build_main_image_py36 --tag nipype/nipype:py36 \ --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}" /home/circleci/nipype \ + --build-arg VERSION="${CIRCLE_TAG}" /home/circleci/nipype _build_main_image_py27: &build_main_image_py27 name: Build main image (py27) @@ -68,7 +68,7 @@ _build_main_image_py27: &build_main_image_py27 --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" /home/circleci/nipype \ + --build-arg VERSION="${CIRCLE_TAG}-py27" /home/circleci/nipype _download_test_data: &_download_test_data name: Download test data From e86205d3da183f2dc754782497fec3ec494e7786 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sun, 20 May 2018 06:55:35 -0400 Subject: [PATCH 4/6] CI: Checkout code --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bd032f090..03d122c25a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -334,6 +334,8 @@ jobs: machine: *machine_kwds working_directory: /home/circleci/nipype steps: + - checkout: + path: /home/circleci/nipype - run: name: Deploy to PyPI command: | From 1cef84f1e5e1f405785b2cd5d00d1bea15dcc34c Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sun, 20 May 2018 07:01:19 -0400 Subject: [PATCH 5/6] CI: Install wheel --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 03d122c25a..534c15a333 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -339,7 +339,7 @@ jobs: - run: name: Deploy to PyPI command: | - pip install twine future + pip install twine future wheel python setup.py sdist bdist_wheel # twine upload dist/* From 6de3c387b932363c2c4080d7299b27f817dab3fa Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sun, 20 May 2018 07:06:04 -0400 Subject: [PATCH 6/6] Revert "CI: Dry-run for testing" This reverts commit d3374eb9091dc7f5a05655bd2936744d3ae9cede. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 534c15a333..e885803c00 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -341,7 +341,7 @@ jobs: command: | pip install twine future wheel python setup.py sdist bdist_wheel - # twine upload dist/* + twine upload dist/* workflows: version: 2 @@ -370,11 +370,11 @@ workflows: - test_py3_fmri_fsl_spm - test_py3_fmri_spm_dartel_multiproc - deploy_pypi: - # filters: - # branches: - # ignore: /.*/ - # tags: - # only: /.*/ + filters: + branches: + ignore: /.*/ + tags: + only: /.*/ requires: - test_pytest - test_fmri_spm_nested_fsl_feeds