Merge pull request pytroll#3 from adybbroe/publish-different-fileform…

…ats-separately

Publish different fileformats separately

.git_archival.txt

@@ -0,0 +1 @@
+ref-names: $Format:%D$

bin/viirs_af_runner.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2019 Pytroll
+# Copyright (c) 2019, 2020 Pytroll
 
 # Author(s):
 
@@ -172,7 +172,7 @@ def spawn_cspp(sdrfiles, service):
 
 
 def publish_af(publisher, result_files, mda, **kwargs):
-    """Publish the messages that SDR files are ready
+    """Publish the messages that VIIRS AF EDR files are ready
     """
     if not result_files:
         return
@@ -189,38 +189,43 @@ def publish_af(publisher, result_files, mda, **kwargs):
         to_send["orig_orbit_number"] = to_send["orbit_number"]
         to_send["orbit_number"] = kwargs['orbit']
 
-    to_send["dataset"] = []
-    for result_file in result_files:
-        filename = os.path.basename(result_file)
-        to_send[
-            'dataset'].append({'uri': urlunsplit(('ssh', socket.gethostname(),
-                                                  result_file, '', '')),
-                               'uid': filename})
-
     publish_topic = kwargs.get('publish_topic', 'Unknown')
     site = kwargs.get('site', 'unknown')
     environment = kwargs.get('environment', 'unknown')
 
-    to_send['format'] = 'EDR'
-    to_send['type'] = 'NETCDF'
     to_send['data_processing_level'] = '2'
-    to_send['start_time'], to_send['end_time'] = get_edr_times(filename)
-
-    LOG.debug('Site = %s', site)
-    LOG.debug('Publish topic = %s', publish_topic)
-    for topic in publish_topic:
-        msg = Message('/'.join(('',
-                                topic,
-                                to_send['format'],
-                                to_send['data_processing_level'],
-                                site,
-                                environment,
-                                'polar',
-                                'direct_readout')),
-                      "dataset", to_send).encode()
-
-    LOG.debug("sending: " + str(msg))
-    publisher.send(msg)
+    to_send['format'] = 'edr'
+
+    for result_file in result_files:
+        to_send['uri'] = urlunsplit(('ssh', socket.gethostname(),
+                                     result_file, '', ''))
+        filename = os.path.basename(result_file)
+        to_send['uid'] = filename
+        if filename.endswith('nc'):
+            to_send['type'] = 'netcdf'
+        elif filename.endswith('txt'):
+            to_send['type'] = 'txt'
+        else:
+            LOG.error("File type unknown! Don't publish. Filename = %s", filename)
+            return
+
+        to_send['start_time'], to_send['end_time'] = get_edr_times(filename)
+
+        LOG.debug('Site = %s', site)
+        LOG.debug('Publish topic = %s', publish_topic)
+        for topic in publish_topic:
+            msg = Message('/'.join(('',
+                                    topic,
+                                    to_send['format'],
+                                    to_send['data_processing_level'],
+                                    site,
+                                    environment,
+                                    'polar',
+                                    'direct_readout')),
+                          "file", to_send).encode()
+
+            LOG.debug("sending: " + str(msg))
+            publisher.send(msg)
 
 
 def viirs_active_fire_runner(options, service_name):

setup.cfg

@@ -1,7 +1,14 @@
+[options]
+setup_requires =
+    setuptools_scm
+    setuptools_scm_git_archive
+
 [bdist_rpm]
 requires=posttroll
 release=1
 
+no-autoreq=True
+
 [bdist_wheel]
 universal=1
 

setup.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2019 Pytroll
+# Copyright (c) 2019, 2020 Pytroll
 
 # Author(s):
 
@@ -23,15 +23,16 @@
 """
 """
 
-
 from setuptools import setup
-import imp
-
-version = imp.load_source(
-    'viirs_active_fires.version', 'viirs_active_fires/version.py')
+try:
+    # HACK: https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286
+    # Stop setuptools_scm from including all repository files
+    import setuptools_scm.integration
+    setuptools_scm.integration.find_files = lambda _: []
+except ImportError:
+    pass
 
 setup(name="pytroll-active-fire-runner",
-      version=version.__version__,
       description='Pytroll runner for the VIIRS active fires',
       author='Adam Dybroe',
       author_email='adam.dybroe@smhi.se',
@@ -48,4 +49,5 @@
       data_files=[],
       zip_safe=False,
       install_requires=['posttroll'],
+      use_scm_version=True,
       )

viirs_active_fires/__init__.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2019 Adam.Dybbroe
+# Copyright (c) 2019, 2020 Adam.Dybbroe
 
 # Author(s):
 
@@ -20,15 +20,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""
-"""
+"""Package initializer for viirs_active_fires."""
 
+from pkg_resources import get_distribution, DistributionNotFound
 import yaml
 try:
     from yaml import UnsafeLoader
 except ImportError:
     from yaml import Loader as UnsafeLoader
 
+try:
+    __version__ = get_distribution(__name__).version
+except DistributionNotFound:
+    # package is not installed
+    pass
+
 
 def get_config(configfile, service, procenv):
     """Get the configuration from file"""