Skip to content

Commit 9eaa2a3

Browse files
authored
Merge pull request #2587 from effigies/ci/circle_pypi_deploy
CI: Move PyPI deployment to Circle
2 parents b547aa7 + 6de3c38 commit 9eaa2a3

File tree

2 files changed

+27
-15
lines changed

2 files changed

+27
-15
lines changed

.circleci/config.yml

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ _build_main_image_py36: &build_main_image_py36
5454
--tag nipype/nipype:py36 \
5555
--build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
5656
--build-arg VCS_REF="$(git rev-parse --short HEAD)" \
57-
--build-arg VERSION="${CIRCLE_TAG}" /home/circleci/nipype \
57+
--build-arg VERSION="${CIRCLE_TAG}" /home/circleci/nipype
5858
5959
_build_main_image_py27: &build_main_image_py27
6060
name: Build main image (py27)
@@ -68,7 +68,7 @@ _build_main_image_py27: &build_main_image_py27
6868
--build-arg PYTHON_VERSION_MINOR=7 \
6969
--build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \
7070
--build-arg VCS_REF="$(git rev-parse --short HEAD)" \
71-
--build-arg VERSION="${CIRCLE_TAG}-py27" /home/circleci/nipype \
71+
--build-arg VERSION="${CIRCLE_TAG}-py27" /home/circleci/nipype
7272
7373
_download_test_data: &_download_test_data
7474
name: Download test data
@@ -299,7 +299,7 @@ jobs:
299299
- run: *_run_codecov_smoke
300300
- store_artifacts: *store_artifacts_kwds
301301

302-
deploy:
302+
deploy_dockerhub:
303303
docker:
304304
- image: docker:17.10.0-ce-git
305305
steps:
@@ -330,6 +330,18 @@ jobs:
330330
- /tmp/docker/cache/Dockerfile.base-pruned
331331
key: dockerfile-cache-v1-{{ .Branch }}-{{ checksum "/tmp/docker/cache/Dockerfile.base-pruned" }}
332332

333+
deploy_pypi:
334+
machine: *machine_kwds
335+
working_directory: /home/circleci/nipype
336+
steps:
337+
- checkout:
338+
path: /home/circleci/nipype
339+
- run:
340+
name: Deploy to PyPI
341+
command: |
342+
pip install twine future wheel
343+
python setup.py sdist bdist_wheel
344+
twine upload dist/*
333345
334346
workflows:
335347
version: 2
@@ -348,7 +360,7 @@ workflows:
348360
- test_fmri_spm_nested_fsl_feeds:
349361
requires:
350362
- compare_base_dockerfiles
351-
- deploy:
363+
- deploy_dockerhub:
352364
filters:
353365
branches:
354366
only: master
@@ -357,3 +369,14 @@ workflows:
357369
- test_fmri_spm_nested_fsl_feeds
358370
- test_py3_fmri_fsl_spm
359371
- test_py3_fmri_spm_dartel_multiproc
372+
- deploy_pypi:
373+
filters:
374+
branches:
375+
ignore: /.*/
376+
tags:
377+
only: /.*/
378+
requires:
379+
- test_pytest
380+
- test_fmri_spm_nested_fsl_feeds
381+
- test_py3_fmri_fsl_spm
382+
- test_py3_fmri_spm_dartel_multiproc

.travis.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,5 @@ install:
6060
script:
6161
- py.test -v --cov nipype --cov-config .coveragerc --cov-report xml:cov.xml -c nipype/pytest.ini --doctest-modules nipype
6262

63-
deploy:
64-
provider: pypi
65-
user: satra
66-
password:
67-
secure: OCO0FXb4f+pH4Uw7zWCIRp3qOJ1t7rhky4K8MjNU8tyVCJgd6O/Bv8GJgceS0LktPodlAAjB8SxAhTORPAQZ1D/44PJYy3NQIisvej1zjLpaA9TEGfl6W7MqhDpRyMHW+cnSi/n84SAmdr+Z4vOxScDHdwr13EPmGyOIlHMAGnE=
68-
on:
69-
tags: true
70-
repo: nipy/nipype
71-
branch: master
72-
distributions: "sdist bdist_wheel"
73-
7463
after_script:
7564
- codecov --file cov.xml --flags unittests -e TRAVIS_JOB_NUMBER

0 commit comments

Comments
 (0)