Merge pull request #59 from altor/release_0.4.0

Release 0.4.0

Author: altor

Dockerfile

@@ -5,6 +5,6 @@ WORKDIR /opt/powerapi
 USER powerapi
 
 COPY --chown=powerapi . /tmp/powerapi
-RUN pip3 install --user --no-cache-dir "/tmp/powerapi[mongodb]" && rm -r /tmp/powerapi
+RUN pip3 install --user --no-cache-dir "/tmp/powerapi[mongodb, influxdb]" && rm -r /tmp/powerapi
 
-ENTRYPOINT ["/bin/echo", "This Docker image should be used as a base for another image and should not be executed directly."]
+ENTRYPOINT ["/bin/echo", "This Docker image should be used as a base for another image and should not be executed directly."]

README.md

@@ -13,7 +13,7 @@ As a middleware toolkit, PowerAPI offers the capability of assembling power mete
 
 PowerAPI is an open-source project developed by the [Spirals research group](https://team.inria.fr/spirals) (University of Lille 1 and Inria) and fully managed with [setuptools](https://pypi.org/project/setuptools/).
 
-The documentation is available [here](https://powerapi.readthedocs.io).
+The documentation is available [here](https://powerapi.org).
 
 ## Mailing list
 You can follow the latest news and asks questions by subscribing to our <a href="mailto:[email protected]?subject=subscribe powerapi">mailing list</a>.

powerapi/__init__.py

@@ -27,4 +27,4 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = "0.3.4"
+__version__ = "0.4.0"

powerapi/actor/supervisor.py

@@ -98,7 +98,7 @@ def launch_actor(self, actor, start_message=True):
 
         if start_message:
             actor.send_control(StartMessage())
-            msg = actor.receive_control(1000)
+            msg = actor.receive_control(2000)
             if isinstance(msg, ErrorMessage):
                 raise ActorInitError(msg.error_message)
             elif msg is None:

powerapi/database/__init__.py

@@ -31,15 +31,13 @@
 from powerapi.database.base_db import BaseDB, IterDB, DBError
 from powerapi.database.csvdb import CsvDB, CsvBadFilePathError
 from powerapi.database.csvdb import CsvBadCommonKeysError, HeaderAreNotTheSameError
-from powerapi.database.influxdb import InfluxDB, CantConnectToInfluxDBException
 try:
     from powerapi.database.mongodb import MongoDB, MongoBadDBError
 
 except ImportError:
     logging.getLogger().info("PyMongo is not installed.")
 
 try:
-    from influxdb import InfluxDBClient
-    from influxdb.exceptions import InfluxDBClientError, InfluxDBServerError
+    from powerapi.database.influxdb import InfluxDB, CantConnectToInfluxDBException
 except ImportError:
     logging.getLogger().info("influx-client is not installed.")