Remove dependencies from setup.py and add documentation to explain

ngardiner · Aug 12, 2021 · 16ade71 · 16ade71
1 parent 1faf4f5
commit 16ade71
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/docker+pypi.yml b/.github/workflows/docker+pypi.yml
@@ -91,7 +91,7 @@ jobs:
         .
 
     - name: Publish distribution package to Test PyPI
-      uses: pypa/gh-action-pypi-publish@master
+      uses: ngardiner/gh-action-pypi-publish-proxy@master
       with:
         password: ${{ secrets.TEST_PYPI_API_TOKEN }}
         skip_existing: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 This document logs the changes per release of TWCManager.
 
-## v1.2.3 - Current development version
+## v1.3.0 - Latest Development Version
+
+## v1.2.3 - 2021-08-10
 
   * **NOTE**: v1.2.3 contains a potentially breaking change for users of OpenWB or the Legacy Web Interface
      * As of v1.2.3, the Legacy Web Interface and its dependencies such as lighttpd and php are no longer installed by default.

diff --git a/docs/modules/EMS_P1Monitor.md b/docs/modules/EMS_P1Monitor.md
@@ -8,6 +8,14 @@ The P1 Monitor (https://www.ztatz.nl/) EMS module allows fetching of Consumption
 
 On each policy request this EMS module request data from the /api/v1/phase endpoint of your P1 Monitor taking a configurable number of samples. It receives both Consumption and Production data of each phase and will calculate a trimmed average (cutting of 10% of the minimum and maximum values) to get a value that is not influenced by any spikes on the net (e.g. a Quooker periodically heating up for a couple of seconds). By default the P1 Monitor API reports new values each 10 seconds, so when taking 6 samples it will give you an average Consumption/Production over 60 seconds. When having 3 phases the total Production on all phases is reported and for Consumption it will report the phase with the highest load multiplied by 3.
 
+### Dependencies
+
+The P1Monitor module requires numpy and scipy installed locally to operate. We do not install these dependencies automatically, but you can install them with:
+
+```
+apt-get install python3-numpy python3-scipy
+```
+
 ### Status
 
 | Detail          | Value                          |

diff --git a/setup.py b/setup.py
@@ -20,21 +20,13 @@
         "jinja2==2.11.2; python_version == '3.5'",
         "jinja2>=2.11.2; python_version >= '3.6'",
         "MarkupSafe < 2.0.0; python_version < '3.6'",
-        "numpy==1.16.6; python_version == '3.4'",
-        "numpy==1.18.5; python_version == '3.5'",
-        "numpy==1.19.5; python_version == '3.6'",
-        "numpy>=1.21.1; python_version >= '3.7'",
         "ocpp",
         "paho_mqtt>=1.5.0",
         "pyModbusTCP>=0.1.8",
         "pymysql==0.9.3; python_version < '3.6'",
         "pymysql; python_version >= '3.6'",
         "pyserial>=3.4",
         "requests>=2.23.0",
-        "scipy==1.2.3; python_version == '3.4'",
-        "scipy==1.4.1; python_version == '3.5'",
-        "scipy==1.5.4; python_version == '3.6'",
-        "scipy>=1.7.0; python_version >= '3.7'",
         "sentry_sdk>=0.11.2",
         "sysv_ipc < 1.1.0; python_version < '3.6'",
         "sysv_ipc >= 1.0.1; python_version >= '3.6'",