Merge pull request #22 from clowder-framework/no-bindings

pyclowder 2.4.0 release

Author: robkooper

.github/workflows/ci.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/pypi.yaml

@@ -8,6 +8,7 @@ jobs:
   publish:
     name: Build and publish python packages
     runs-on: ubuntu-18.04
+
     steps:
       - uses: actions/checkout@v2
 

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.4.0 - 2021-02-22
+
+### Changed
+- clowder is no longer the default exchange. Exchanges are no longer used and
+  this is deprecated.
+- fix check for thread is_alive, fixes warning in python 3.9
+
+### Removed
+- Removed the extractors.<queue_name> since it was not used.
+
 ## 2.3.4 - 2020-10-04
 
 ### Fixed

docs/source/conf.py

@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.1'
+version = u'2.4'
 # The full version, including alpha/beta/rc tags.
-release = u'2.1.1'
+release = u'2.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pyclowder/connectors.py

@@ -661,7 +661,6 @@ def connect(self):
 
         # declare the queue in case it does not exist
         self.channel.queue_declare(queue=self.rabbitmq_queue, durable=True)
-        self.channel.queue_declare(queue='extractors.' + self.rabbitmq_queue, durable=True)
         self.channel.queue_declare(queue='error.'+self.rabbitmq_queue, durable=True)
 
         # register with an exchange

pyclowder/extractors.py

@@ -63,7 +63,7 @@ def __init__(self):
         if not rabbitmq_queuename:
             rabbitmq_queuename = self.extractor_info['name']
         rabbitmq_uri = os.getenv('RABBITMQ_URI', "amqp://guest:[email protected]/%2f")
-        rabbitmq_exchange = os.getenv('RABBITMQ_EXCHANGE', "clowder")
+        rabbitmq_exchange = os.getenv('RABBITMQ_EXCHANGE', "")
         clowder_url = os.getenv("CLOWDER_URL", "")
         registration_endpoints = os.getenv('REGISTRATION_ENDPOINTS', "")
         logging_config = os.getenv("LOGGING")

pyclowder/files.py

@@ -47,6 +47,7 @@ def download(connector, host, key, fileid, intermediatefileid=None, ext=""):
     result = connector.get(url, stream=True, verify=connector.ssl_verify if connector else True)
 
     (inputfile, inputfilename) = tempfile.mkstemp(suffix=ext)
+
     try:
         with os.fdopen(inputfile, "wb") as outputfile:
             for chunk in result.iter_content(chunk_size=10*1024):

setup.py

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