Merge pull request #13 from altor/0.4.2

0.4.2

Dockerfile

@@ -1,4 +1,4 @@
-FROM powerapi/powerapi:0.6
+FROM powerapi/powerapi:0.6.7
 
 WORKDIR /opt/rapl_formula
 USER powerapi

README.md

@@ -9,7 +9,12 @@ Use RAPL data collected with the
 power consumption measures (in Watt). The power consumption measures are store
 in a MongoDB database.
 
-# Usage
+# Quick start
+
+We detail here how to quickly start rapl-formula and connect it to a hwpc-sensor
+using a mongoDB instance.
+
+For more detail see our documentation [here](http://powerapi.org)
 
 ## Get input data
 

rapl_formula/__init__.py

@@ -29,4 +29,4 @@
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"

rapl_formula/__main__.py

@@ -42,7 +42,7 @@
 from powerapi.filter import Filter
 from powerapi.report import HWPCReport
 from powerapi.dispatcher import DispatcherActor, RouteTable
-from powerapi.cli.tools import generate_pullers, generate_pushers
+from powerapi.cli.tools import PullerGenerator, PusherGenerator
 
 from rapl_formula.rapl_formula_actor import RAPLFormulaActor
 
@@ -54,7 +54,8 @@ class BadActorInitializationError(Exception):
 def launch_powerapi(config, logger):
 
     # Pusher
-    pushers = generate_pushers(config)
+    pusher_generator = PusherGenerator()
+    pushers = pusher_generator.generate(config)
 
     # Formula
     formula_factory = (lambda name, verbose:
@@ -71,7 +72,8 @@ def launch_powerapi(config, logger):
     # Puller
     report_filter = Filter()
     report_filter.filter(lambda msg: True, dispatcher)
-    pullers = generate_pullers(config, report_filter)
+    puller_generator = PullerGenerator(report_filter)
+    pullers = puller_generator.generate(config)
 
     # Setup signal handler
     def term_handler(_, __):

setup.cfg

@@ -22,7 +22,7 @@ test_suite = tests
 setup_requires =
     pytest-runner >=3.9.2
 install_requires =
-    powerapi == 0.6.*
+    powerapi >= 0.6.7
 tests_require =
     pytest >=3.9.2
     mock >=2.0