Merge remote-tracking branch 'origin/develop' into python3-build

Author: robkooper

CHANGELOG.md

@@ -5,14 +5,27 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## 2.2.0 - 2019-04-03
+
+### Fixed
+- Code is now compatible with both Python 2 and Python 3.
+- RabbitMQ queue name can be different from extractor name.
+- Updated dependencies.
+- A race condition existed where an ACK could be lost, resulting in an extractor not processing more messages [CATSPYC-1](https://opensource.ncsa.illinois.edu/jira/browse/CATSPYC-1)
+- Error decoding messages where filename contains non-ascii characters[CATSPYC-18](https://opensource.ncsa.illinois.edu/jira/browse/CATSPYC-18)
+
 ### Changed
 - files.upload_preview and collections.upload_preview does not require section_id for metadata [CATS-935](https://opensource.ncsa.illinois.edu/jira/browse/CATS-935)
+- Extractors will not register by default to clowder [CATSPYC-1](https://opensource.ncsa.illinois.edu/jira/browse/CATSPYC-1)
 
 ### Added
-- Email notification when extraction is done
-  [CATSPYC-17] (https://opensource.ncsa.illinois.edu/jira/browse/CATSPYC-17) 
-- Docker compose file for starting up the Clowder stack
-  [BD-2226](https://opensource.ncsa.illinois.edu/jira/browse/BD-2226)
+- Simple R extractor. Allows wrapping R code as a clowder extractor, see sample-extractors/wordcount-simple-r-extractor for an example.
+- Email notification when extraction is done [CATSPYC-17](https://opensource.ncsa.illinois.edu/jira/browse/CATSPYC-17)
+- Docker compose file for starting up the Clowder stack [BD-2226](https://opensource.ncsa.illinois.edu/jira/browse/BD-2226)
+- PyClowder will now send heartbeats on extractors exchange, processes can listen for broadcast to get notified when new extractors come online.
+- Monitor application to leverage new heartbeat send out by extractors
+- Extractors now send version and name to clowder as part of the agent information.
 
 ## 2.1.1 - 2018-07-12
 

release.sh

@@ -20,16 +20,25 @@ $(dirname $0)/docker.sh
 
 # check branch and set version
 if [ "${BRANCH}" = "master" ]; then
-    VERSION=${VERSION:-"2.1.1 2.1 2 latest"}
+    VERSION=$(grep version setup.py | sed "s/.*'\([0-9\.]*\)'.*/\1/")
+    TAGS="latest"
+    TMPVERSION="${VERSION}"
+    OLDVERSION=""
+    while [ "$OLDVERSION" != "$TMPVERSION" ]; do
+       TAGS="${TAGS} ${TMPVERSION}"
+       OLDVERSION="${TMPVERSION}"
+       TMPVERSION=$(echo ${OLDVERSION} | sed 's/\.[0-9]*$//')
+    done
 elif [ "${BRANCH}" = "develop" ]; then
     VERSION="develop"
+    TAGS="${VERSION}"
 else
     exit 0
 fi
 
 # tag all images and push if needed
 for i in pyclowder pyclowder-python3 extractors-monitor extractors-wordcount; do
-    for v in ${VERSION}; do
+    for v in ${TAGS}; do
         if [ "$v" != "latest" -o "$SERVER" != "" ]; then
             ${DEBUG} docker tag clowder/${i}:latest ${SERVER}clowder/${i}:${v}
         fi

setup.py

@@ -9,7 +9,7 @@ def description():
 
 
 setup(name='pyclowder',
-      version='2.1.1',
+      version='2.2.0',
       packages=find_packages(),
       description='Python SDK for the Clowder Data Management System',
       long_description=description(),