From 93fdc5757be1050cd6569562061d91e5411a7856 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 13 Aug 2018 08:57:19 -0400 Subject: [PATCH 1/9] CI: Test 3.7-dev, remove fmri extra from Travis --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc60cab99c..284d291dfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ python: - 3.4 - 3.5 - 3.6 +- 3.7-dev env: global: @@ -16,16 +17,16 @@ env: - EXTRA_PIP_FLAGS="--find-links=$EXTRA_WHEELS" matrix: - INSTALL_DEB_DEPENDECIES=true - NIPYPE_EXTRAS="doc,tests,fmri,profiler" + NIPYPE_EXTRAS="doc,tests,profiler" CI_SKIP_TEST=1 - INSTALL_DEB_DEPENDECIES=false - NIPYPE_EXTRAS="doc,tests,fmri,profiler" + NIPYPE_EXTRAS="doc,tests,profiler" CI_SKIP_TEST=1 - INSTALL_DEB_DEPENDECIES=true - NIPYPE_EXTRAS="doc,tests,fmri,profiler,duecredit,ssh" + NIPYPE_EXTRAS="doc,tests,profiler,duecredit,ssh" CI_SKIP_TEST=1 - INSTALL_DEB_DEPENDECIES=true - NIPYPE_EXTRAS="doc,tests,fmri,profiler" + NIPYPE_EXTRAS="doc,tests,profiler" EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS" CI_SKIP_TEST=1 From 839bf4fd18e2d5ea4c7ffd662d874a8bb0fb3857 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 13 Aug 2018 09:39:38 -0400 Subject: [PATCH 2/9] CI: Try Python 3.7 matrix entry --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 284d291dfc..7abccdf954 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,12 @@ python: - 3.4 - 3.5 - 3.6 -- 3.7-dev + +matrix: + include: + - python: 3.7 + dist: xenial + sudo: true env: global: From 6f19d956e0992d7b4201b0d42b42be12f7f30ad1 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 15 Aug 2018 10:11:54 -0400 Subject: [PATCH 3/9] CI: Do not run Circle tests on Travis-focused branches --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 72bdd5056e..0bdab056f8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -418,7 +418,7 @@ workflows: - compare_base_dockerfiles: filters: tags: - only: /.*/ + ignore: /^(ci\/)?travis.*/ - test_pytest: filters: tags: From 1a39fa423ce39a2f4086426ba502dff27dd2b520 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 15 Aug 2018 10:13:00 -0400 Subject: [PATCH 4/9] CI: Move tests to Xenial --- .travis.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7abccdf954..7d17e70288 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ -dist: trusty -sudo: required +dist: xenial +sudo: true language: python # our build matrix @@ -8,12 +8,7 @@ python: - 3.4 - 3.5 - 3.6 - -matrix: - include: - - python: 3.7 - dist: xenial - sudo: true +- 3.7 env: global: From ddce7e2d5acffea02134502cfd395f3e5f3070de Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 15 Aug 2018 10:14:43 -0400 Subject: [PATCH 5/9] CI: Ignore branches, not tags --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0bdab056f8..d5a559b17b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -417,8 +417,10 @@ workflows: only: /.*/ - compare_base_dockerfiles: filters: - tags: + branches: ignore: /^(ci\/)?travis.*/ + tags: + only: /.*/ - test_pytest: filters: tags: From c5a2eed1d971ce9f173c64fd10f7c730b62756c7 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 15 Aug 2018 10:31:53 -0400 Subject: [PATCH 6/9] CI: Separate matrix for 3.4 --- .travis.yml | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7d17e70288..13ab956b5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,12 @@ language: python # our build matrix python: - 2.7 -- 3.4 - 3.5 - 3.6 - 3.7 +# NOTE: Any changes to the matrix section should be duplicated below for +# Python 3.4 env: global: - EXTRA_WHEELS="https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.ssl.cf2.rackcdn.com" @@ -30,6 +31,36 @@ env: EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS" CI_SKIP_TEST=1 +# Python 3.4 is only available on Trusty, so we need to duplicate the +# env matrix specifically for it. +matrix: + include: + - python: 3.4 + dist: trusty + env: + - INSTALL_DEB_DEPENDECIES=true + NIPYPE_EXTRAS="doc,tests,profiler" + CI_SKIP_TEST=1 + - python: 3.4 + dist: trusty + env: + - INSTALL_DEB_DEPENDECIES=false + NIPYPE_EXTRAS="doc,tests,profiler" + CI_SKIP_TEST=1 + - python: 3.4 + dist: trusty + env: + - INSTALL_DEB_DEPENDECIES=true + NIPYPE_EXTRAS="doc,tests,profiler,duecredit,ssh" + CI_SKIP_TEST=1 + - python: 3.4 + dist: trusty + env: + - INSTALL_DEB_DEPENDECIES=true + NIPYPE_EXTRAS="doc,tests,profiler" + EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS" + CI_SKIP_TEST=1 + addons: apt: packages: From 7bc3319aa17602505656626b71e82ee3264ede54 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 15 Aug 2018 10:34:01 -0400 Subject: [PATCH 7/9] CI: Attempt again to ignore travis branches --- .circleci/config.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d5a559b17b..9ee6b86889 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -423,17 +423,28 @@ workflows: only: /.*/ - test_pytest: filters: + branches: + ignore: /^(ci\/)?travis.*/ tags: only: /.*/ requires: - compare_base_dockerfiles - test_py3_fmri_fsl_spm: + filters: + branches: + ignore: /^(ci\/)?travis.*/ requires: - compare_base_dockerfiles - test_py3_fmri_spm_dartel_multiproc: + filters: + branches: + ignore: /^(ci\/)?travis.*/ requires: - compare_base_dockerfiles - test_fmri_spm_nested_fsl_feeds: + filters: + branches: + ignore: /^(ci\/)?travis.*/ requires: - compare_base_dockerfiles - deploy_dockerhub: From ac8b67fa457f2a703bbc971619f0d12d67fa4894 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 15 Aug 2018 10:36:33 -0400 Subject: [PATCH 8/9] CI: Remove non-working Circle filters --- .circleci/config.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9ee6b86889..72bdd5056e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -417,34 +417,21 @@ workflows: only: /.*/ - compare_base_dockerfiles: filters: - branches: - ignore: /^(ci\/)?travis.*/ tags: only: /.*/ - test_pytest: filters: - branches: - ignore: /^(ci\/)?travis.*/ tags: only: /.*/ requires: - compare_base_dockerfiles - test_py3_fmri_fsl_spm: - filters: - branches: - ignore: /^(ci\/)?travis.*/ requires: - compare_base_dockerfiles - test_py3_fmri_spm_dartel_multiproc: - filters: - branches: - ignore: /^(ci\/)?travis.*/ requires: - compare_base_dockerfiles - test_fmri_spm_nested_fsl_feeds: - filters: - branches: - ignore: /^(ci\/)?travis.*/ requires: - compare_base_dockerfiles - deploy_dockerhub: From 026d68ca941b8e82d536a7cc928e0561220a7aca Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 15 Aug 2018 11:39:46 -0400 Subject: [PATCH 9/9] CI: Install nipy dependencies when installing AFNI/FSL from NeuroDebian --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13ab956b5a..6aaec256d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,16 +18,16 @@ env: - EXTRA_PIP_FLAGS="--find-links=$EXTRA_WHEELS" matrix: - INSTALL_DEB_DEPENDECIES=true - NIPYPE_EXTRAS="doc,tests,profiler" + NIPYPE_EXTRAS="doc,tests,nipy,profiler" CI_SKIP_TEST=1 - INSTALL_DEB_DEPENDECIES=false NIPYPE_EXTRAS="doc,tests,profiler" CI_SKIP_TEST=1 - INSTALL_DEB_DEPENDECIES=true - NIPYPE_EXTRAS="doc,tests,profiler,duecredit,ssh" + NIPYPE_EXTRAS="doc,tests,nipy,profiler,duecredit,ssh" CI_SKIP_TEST=1 - INSTALL_DEB_DEPENDECIES=true - NIPYPE_EXTRAS="doc,tests,profiler" + NIPYPE_EXTRAS="doc,tests,nipy,profiler" EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS" CI_SKIP_TEST=1 @@ -39,7 +39,7 @@ matrix: dist: trusty env: - INSTALL_DEB_DEPENDECIES=true - NIPYPE_EXTRAS="doc,tests,profiler" + NIPYPE_EXTRAS="doc,tests,nipy,profiler" CI_SKIP_TEST=1 - python: 3.4 dist: trusty @@ -51,13 +51,13 @@ matrix: dist: trusty env: - INSTALL_DEB_DEPENDECIES=true - NIPYPE_EXTRAS="doc,tests,profiler,duecredit,ssh" + NIPYPE_EXTRAS="doc,tests,nipy,profiler,duecredit,ssh" CI_SKIP_TEST=1 - python: 3.4 dist: trusty env: - INSTALL_DEB_DEPENDECIES=true - NIPYPE_EXTRAS="doc,tests,profiler" + NIPYPE_EXTRAS="doc,tests,nipy,profiler" EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS" CI_SKIP_TEST=1