Merged v1.8 release into master

dsmrreader · Jun 14, 2017 · 89b79be · 89b79be
1 parent e5e2e72
commit 89b79be
Show file tree

Hide file tree

Showing 53 changed files with 2,146 additions and 873 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,30 +1,28 @@
 language: python
 
+# https://docs.travis-ci.com/user/languages/python/
 python:
   - 3.4
   - 3.5
   - 3.5-dev
+  - 3.6
   - 3.6-dev
-  - nightly # currently points to 3.7-dev
+  - 3.7-dev
 
 matrix:
   allow_failures:
-    # Was never supported by dsmrreader anyway.
-    - python: 2.7
-
-    # Support dropped since Django 1.9. It actually breaks in Django.
-    - python: 3.3
-
-    # Not officially supported by DSMR-reader, but we want to look ahead.
+    # Look ahead.
+    - python: 3.5-dev
     - python: 3.6-dev
+    - python: 3.7-dev
     - python: nightly
 
 services:
   - postgresql
   - mysql
 
 addons:
-  # 9.5 is not yet available for container based builds: https://docs.travis-ci.com/user/database-setup/#PostgreSQL
+  # https://docs.travis-ci.com/user/database-setup/#PostgreSQL
   postgresql: "9.4"
 
 env:

diff --git a/docs/_static/screenshots/mqtt_broker.png b/docs/_static/screenshots/mqtt_broker.png
diff --git a/docs/_static/screenshots/mqtt_json.png b/docs/_static/screenshots/mqtt_json.png
diff --git a/docs/_static/screenshots/mqtt_raw.png b/docs/_static/screenshots/mqtt_raw.png
diff --git a/docs/_static/screenshots/mqtt_split.png b/docs/_static/screenshots/mqtt_split.png
diff --git a/docs/api.rst b/docs/api.rst
@@ -293,6 +293,8 @@ Creates a reading from direct values, omitting the need for the telegram.
     Therefor inserting historic data might require you to delete all aggregated data using the ``./manage.py dsmr_backend_delete_aggregated_data`` command.
 
     This will process all readings again, from the very first start, and aggregate them (and **will** take a long time depending on your reading count).
+
+    Please note that the datalogger may interfere. If your stats are not correctly after regenerating, try it again while having your datalogger disabled.
 
 
 URI

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -18,6 +18,17 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin
 
 
 
+v1.8.0 - 2017-06-14
+^^^^^^^^^^^^^^^^^^^
+
+**Tickets resolved in this release:**
+
+- [`#141 <https://github.com/dennissiemensma/dsmr-reader/issues/141>`_] Add MQTT support to publish readings
+- [`#331 <https://github.com/dennissiemensma/dsmr-reader/issues/331>`_] Requirements update (June 2016)
+- [`#299 <https://github.com/dennissiemensma/dsmr-reader/issues/299>`_] Support Python 3.6
+
+
+
 v1.7.0 - 2017-05-04
 ^^^^^^^^^^^^^^^^^^^
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -6,10 +6,12 @@ DSMR Reader's documentation
 
    intro
    screenshots
+   requirements
    installation
    application
    settings
    api
+   mqtt
    troubleshooting
    faq
    changelog

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -10,57 +10,6 @@ Installation
     :depth: 2
 
 
-Dependencies & requirements
----------------------------
-- **RaspberryPi 2 or 3**
-
-.. note::
-
-    - **Alternative #1**: You can also run it on any server near your smart meter, as long as it satisfies the other requirements.
-
-    - **Alternative #2**: The application supports receiving P1 telegrams using an API, so you can also run it on a server outside your home. (:doc:`API DOCS<api>`)
-
-.. warning::
-
-    The RaspberryPi 1 tends to be **too slow** for this project, as it requires multi core processing.
-
-    You can however run just the datalogger client on an old RaspberryPi, :doc:`see for the API for a howto and example scripts<api>`.
-
-- **Raspbian OS**
-
- - Recommended and tested with, but any OS satisfying the requirements should do fine.
-
-- **Python 3.4+**
-
-.. warning::
-
-    Support for ``Python 3.3`` has been **discontinued** since ``DSMR-reader v1.5`` (due to Django).
-
-- **PostgreSQL 9+ database**
-
-.. warning::
-
-    Support for ``MySQL`` has been **deprecated** since ``DSMR-reader v1.6`` and will be discontinued completely in a later release.
-    Please use a PostgreSQL database instead. Users already running MySQL will be supported in migrating at a later moment.
-
-- **Smart Meter** with support for **at least DSMR 4.x+** and a **P1 telegram port**
-
- - Tested so far with Landis+Gyr E350, Kaifa.
-
-- **Minimal 1 GB of disk space on RaspberryPi (card)** (for application installation & virtualenv). 
-
- - More disk space is required for storing all reader data captured (optional). I generally advise to use a 8+ GB SD card. 
- - The readings will take about 90+ percent of the disk space. Retention is on it's way for a future release in 2017. 
-
-- **Smart meter P1 data cable** 
-
- - Can be purchased online and they cost around 15 tot 20 Euro's each.
-
-- **Basic Linux knowledge for deployment, debugging and troubleshooting**
-
- - It just really helps if you know what you are doing.
-
-
 1. Database backend (PostgreSQL)
 --------------------------------
 

diff --git a/docs/locale/nl/LC_MESSAGES/api.mo b/docs/locale/nl/LC_MESSAGES/api.mo
-Original file line number
+Diff line change
@@ Expand Up @@
         Therefor inserting historic data might require you to delete all aggregated data using the ``./manage.py dsmr_backend_delete_aggregated_data`` command.
         This will process all readings again, from the very first start, and aggregate them (and **will** take a long time depending on your reading count).
+        Please note that the datalogger may interfere. If your stats are not correctly after regenerating, try it again while having your datalogger disabled.
     URI
@@ Expand Down @@