ENH: Automatically update CHANGES after merge

Author: oesteban

.circleci/config.yml

@@ -190,6 +190,24 @@ jobs:
           fingerprints:
             - "ae:95:0c:cc:09:84:64:99:92:82:b7:b5:f4:a7:e9:23"
 
+      - run:
+          name: Checkout origin/master
+          command: |
+            git config user.email "${GITHUB_EMAIL}"
+            git config user.name "CircleCI Deploy"
+            git fetch origin
+            git checkout -f origin/master
+
+      - run:
+          name: Update CHANGES if this is a merge commit
+          command: |
+            if (( $( git cat-file -p HEAD | sed -n '/^parent [0-9a-f]*$/p' | wc -l ) > 1 )); then
+              bash update_changes.sh
+              git add CHANGES.rst
+              git commit -m "auto: Update CHANGES [skip ci]"
+              git push origin HEAD:master
+            fi
+
       - run:
           name: Check whether skeleton needs an update
           command: |
@@ -201,10 +219,6 @@ jobs:
       - run:
           name: Push skeleton back to TemplateFlow's client repo
           command: |
-            git config user.email "${GITHUB_EMAIL}"
-            git config user.name "CircleCI Deploy"
-            git fetch origin
-            git checkout -f origin/master
             cp /tmp/resources/templateflow-skel.{zip,md5} templateflow/conf/
             git add templateflow/conf/templateflow-skel.{zip,md5}
             git commit -m "auto: Update S3 skeleton file and checksum [skip ci]"

CHANGES.rst

@@ -1,3 +1,7 @@
+Upcoming release
+================
+
+
 0.4.1 (July 20, 2019)
 =====================
 

update_changes.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Collects the pull-requests since the latest release and
+# aranges them in the CHANGES.rst.txt file.
+#
+# This is a script to be run before releasing a new version.
+#
+# Usage /bin/bash update_changes.sh 1.0.1
+#
+
+# Setting      # $ help set
+set -u         # Treat unset variables as an error when substituting.
+set -x         # Print command traces before executing command.
+
+# Check whether the Upcoming release header is present
+head -1 CHANGES.rst | grep -q Upcoming
+UPCOMING=$?
+if [[ "$UPCOMING" == "0" ]]; then
+    head -n3  CHANGES.rst >> newchanges
+fi
+
+# Search for PRs since previous release
+git show --pretty='format:  * %b %s'  HEAD | sed 's/Merge pull request \#\([^\d]*\)\ from\ .*/(\#\1)/' >> newchanges
+
+# Add back the Upcoming header if it was present
+if [[ "$UPCOMING" == "0" ]]; then
+    tail -n+4 CHANGES.rst >> newchanges
+else
+    cat CHANGES.rst >> newchanges
+fi
+
+# Replace old CHANGES.rst with new file
+mv newchanges CHANGES.rst
+