fix #47 now the name = queue name

clowder-framework · Aug 2, 2022 · e9e9610 · e9e9610
1 parent 05ec79e
commit e9e9610
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.6.0 - 2022-06-14
+
+This will change how clowder sees the extractors. If you have an extractor, and you specify
+the queue name (eiter as command line argument or environment variable) the name of the
+extractor shown in clowder, will be the name of the queue.
+
+### Changed
+- when you set the RABBITMQ_QUEUE it will change the name of the extractor as well in the
+  extractor_info document. [#47](https://github.com/clowder-framework/pyclowder/issues/47)
+
 ## 2.5.1 - 2022-03-04
 
 ### Changed

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ create new extractors.
 Install using pip (for most recent versions see: https://pypi.org/project/pyclowder/):
 
 ```
-pip install pyclowder==2.5.1
+pip install pyclowder==2.6.0
 ```
 
 Install pyClowder on your system by cloning this repo:

diff --git a/description.rst b/description.rst
@@ -14,7 +14,7 @@ Installation
 Install using pip (for most recent versions see: https://pypi.org/project/pyclowder/):
 
 ```
-pip install pyclowder==2.5.1
+pip install pyclowder==2.6.0
 ```
 
 Install pyClowder on your system by cloning this repo:

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.5'
+version = u'2.6'
 # The full version, including alpha/beta/rc tags.
-release = u'2.5.1'
+release = u'2.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/pyclowder/extractors.py b/pyclowder/extractors.py
@@ -123,6 +123,10 @@ def setup(self):
         """
         self.args = self.parser.parse_args()
 
+        # fix extractor_info based on the queue name
+        if self.args.rabbitmq_queuename and self.extractor_info['name'] != self.args.rabbitmq_queuename:
+            self.extractor_info['name'] = self.args.rabbitmq_queuename
+
         # use command line option for ssl_verify
         if 'sslverify' in self.args:
             self.ssl_verify = self.args.sslverify

diff --git a/sample-extractors/wordcount/requirements.txt b/sample-extractors/wordcount/requirements.txt
@@ -1 +1 @@
-pyclowder==2.5.1
+pyclowder==2.6.0
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name='pyclowder',
-    version='2.5.1',
+    version='2.6.0',
     description='Python SDK for the Clowder Data Management System',
     long_description=long_description,