From ca606f3c183a82fa6dccc7c41438b03d7353c03d Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 10 Aug 2018 18:03:23 -0400 Subject: [PATCH 1/2] DOC: Update changelog --- doc/changelog/1.X.X-changelog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/changelog/1.X.X-changelog b/doc/changelog/1.X.X-changelog index 18e4598f94..ba1489f89b 100644 --- a/doc/changelog/1.X.X-changelog +++ b/doc/changelog/1.X.X-changelog @@ -1,3 +1,20 @@ +1.1.2 (August 11, 2018) +======================= + +Hot-fix release, resolving incorrect dependencies in 1.1.1 wheel. + +##### [Full changelog](https://github.com/nipy/nipype/milestone/23?closed=1) + + * FIX: Read BIDS config.json under grabbids or layout (https://github.com/nipy/nipype/pull/2679) + * FIX: Node __repr__ and detailed graph expansion (https://github.com/nipy/nipype/pull/2669) + * FIX: Prevent double-collapsing of nested lists by OutputMultiObject (https://github.com/nipy/nipype/pull/2673) + * ENH: Add interface to SPM realign_unwarp (https://github.com/nipy/nipype/pull/2635) + * MAINT: Fix wheel build to ensure futures is only required in Python 2 (https://github.com/nipy/nipype/pull/2678) + * MAINT: ensure interface _cmd only includes executable (https://github.com/nipy/nipype/pull/2674) + * MAINT: Issue template: Pretty print platform details (https://github.com/nipy/nipype/pull/2671) + * CI: removing travis_retry for pip install pytest xdist 1.22.5 (https://github.com/nipy/nipype/pull/2664) + + 1.1.1 (July 30, 2018) ===================== From e8a5198b132ccc77e1c08eeab7630b838f0f76e4 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 10 Aug 2018 18:04:48 -0400 Subject: [PATCH 2/2] CI: Only run PyPI pre-checks on rel/* and tags --- .circleci/config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 502c5f5d78..72bdd5056e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -409,7 +409,12 @@ workflows: version: 2 build_test_deploy: jobs: - - pypi_precheck + - pypi_precheck: + filters: + branches: + only: /rel\/.*/ + tags: + only: /.*/ - compare_base_dockerfiles: filters: tags: