Require pystorm 3.1.0 and support ReliableSpout (#355)

pystorm · Jan 26, 2017 · 4fe9a37 · 4fe9a37
1 parent 6b62136
commit 4fe9a37
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/doc/source/api.rst b/doc/source/api.rst
@@ -35,16 +35,22 @@ emit tuples into streams.
 .. autoclass:: streamparse.Spout
     :show-inheritance:
 
+.. autoclass:: streamparse.ReliableSpout
+    :show-inheritance:
+
+
 Bolts
 ^^^^^
 
 .. autoclass:: streamparse.Bolt
     :show-inheritance:
 
-
 .. autoclass:: streamparse.BatchingBolt
     :show-inheritance:
 
+.. autoclass:: streamparse.TicklessBatchingBolt
+    :show-inheritance:
+
 
 Logging
 -------

diff --git a/requirements.txt b/requirements.txt
@@ -5,6 +5,6 @@ requests
 prettytable
 setuptools
 simplejson
-pystorm>=3.0.3
+pystorm>=3.1.0
 thriftpy>=0.3.2
 ruamel.yaml
diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@ def readme():
     'prettytable',
     'six>=1.5',
     'simplejson',
-    'pystorm>=3.0.3',
+    'pystorm>=3.1.0',
     'thriftpy>=0.3.2',
     'ruamel.yaml'
 ]

diff --git a/streamparse/__init__.py b/streamparse/__init__.py
@@ -10,9 +10,9 @@
 
 from . import bolt, cli, component, decorators, dsl, spout, storm
 from .dsl import Grouping, Stream, Topology
-from .storm import (BatchingBolt, Bolt, JavaBolt, JavaSpout, ShellBolt,
-                    ShellSpout, Spout, StormHandler, TicklessBatchingBolt,
-                    Tuple)
+from .storm import (BatchingBolt, Bolt, JavaBolt, JavaSpout, ReliableSpout,
+                    ShellBolt, ShellSpout, Spout, StormHandler,
+                    TicklessBatchingBolt, Tuple)
 from .version import __version__, VERSION
 
 # Enable default NullHandler to prevent "No handlers could be found for logger"
@@ -30,6 +30,7 @@
     'Grouping',
     'JavaBolt',
     'JavaSpout',
+    'ReliableSpout',
     'ShellBolt',
     'ShellSpout',
     'Spout',

diff --git a/streamparse/storm/__init__.py b/streamparse/storm/__init__.py
@@ -6,4 +6,4 @@
 
 from .bolt import BatchingBolt, Bolt, JavaBolt, ShellBolt, TicklessBatchingBolt
 from .component import Component, StormHandler
-from .spout import JavaSpout, ShellSpout, Spout
+from .spout import JavaSpout, ShellSpout, ReliableSpout, Spout
diff --git a/streamparse/storm/spout.py b/streamparse/storm/spout.py
@@ -129,3 +129,8 @@ def spec(cls, name=None, par=None, config=None):
                                                     cls.__name__),
                               name=name, par=par, config=config,
                               outputs=cls.outputs)
+
+
+class ReliableSpout(pystorm.spout.ReliableSpout, Spout):
+    """pystorm ReliableSpout with streamparse-specific additions"""
+    pass