pyvera 0.3.15__tar.gz → 0.3.16__tar.gz

{pyvera-0.3.15 → pyvera-0.3.16}/PKG-INFO

@@ -1,25 +1,26 @@
 Metadata-Version: 2.1
 Name: pyvera
-Version: 0.3.15
+Version: 0.3.16
 Summary: Python API for talking to Veracontrollers
-Home-page: https://github.com/pavoni/pyvera
+Home-page: https://github.com/maximvelichko/pyvera
 License: GPL2
 Keywords: vera,api
 Author: James Cole
-Requires-Python: >=3.5,<4.0
+Requires-Python: >=3.8,<4.0
+Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: requests (>=2.22.0)
-Project-URL: Repository, https://github.com/pavoni/pyvera
+Project-URL: Repository, https://github.com/maximvelichko/pyvera
 Description-Content-Type: text/markdown
 
-# pyVera ![Build status](https://github.com/pavoni/pyvera/workflows/Build/badge.svg) ![PyPi version](https://img.shields.io/pypi/v/pyvera) ![PyPi downloads](https://img.shields.io/pypi/dm/pyvera)
+# pyVera ![Build status](https://github.com/maximvelichko/pyvera/workflows/Build/badge.svg) ![PyPi version](https://img.shields.io/pypi/v/pyvera) ![PyPi downloads](https://img.shields.io/pypi/dm/pyvera)
 
 A simple Python library to control devices via the Vera controller (http://getvera.com/).
 

{pyvera-0.3.15 → pyvera-0.3.16}/README.md

@@ -1,4 +1,4 @@
-# pyVera ![Build status](https://github.com/pavoni/pyvera/workflows/Build/badge.svg) ![PyPi version](https://img.shields.io/pypi/v/pyvera) ![PyPi downloads](https://img.shields.io/pypi/dm/pyvera)
+# pyVera ![Build status](https://github.com/maximvelichko/pyvera/workflows/Build/badge.svg) ![PyPi version](https://img.shields.io/pypi/v/pyvera) ![PyPi downloads](https://img.shields.io/pypi/dm/pyvera)
 
 A simple Python library to control devices via the Vera controller (http://getvera.com/).
 

{pyvera-0.3.15 → pyvera-0.3.16}/pyproject.toml

@@ -1,19 +1,23 @@
 [tool.poetry]
 name = "pyvera"
-version = "0.3.15"
+version = "0.3.16"
 description = "Python API for talking to Veracontrollers"
 
 license = "GPL2"
 
 authors = [
     "James Cole",
-    "Greg Dowling <mail@gregdowling.com>"
+    "Greg Dowling <mail@gregdowling.com>",
+    "Max Velitchko"
+]
+classifiers = [
+    "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
 ]
 
 readme = 'README.md'
 
-repository = "https://github.com/pavoni/pyvera"
-homepage = "https://github.com/pavoni/pyvera"
+repository = "https://github.com/maximvelichko/pyvera"
+homepage = "https://github.com/maximvelichko/pyvera"
 
 keywords = ['vera', 'api']
 
@@ -22,22 +26,22 @@ requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.dependencies]
-python = "^3.5 || ^3.6 || ^3.7 || ^3.8"
+python = ">=3.8,<4.0"
 requests = ">=2.22.0"
 
 [tool.poetry.dev-dependencies]
-black = {version = "==19.3b0", python = "^3.7"}
-coverage = "==4.5.4"
+black = {version = "==23.10.1", python = "^3.7"}
+coverage = "==7.3.2"
 flake8 = "==3.7.8"
 isort = "==4.3.21"
-mypy = "==0.740"
+mypy = "==1.6.1"
 pydocstyle = "==4.0.1"
-pylint = "==2.4.3"
-pytest = "==5.2.1"
-pytest-cov = "==2.8.1"
+pylint = "==3.0.2"
+pytest = "==7.4.2"
+pytest-cov = "==4.1.0"
 responses = "==0.10.6"
 toml = "==0.10.0"  # Needed by isort and others.
-wheel = "==0.33.6"  # Needed for successful compile of other modules.
+wheel = "==0.38.1"  # Needed for successful compile of other modules.
 
 [tool.black]
 target-version = ["py35", "py36", "py37", "py38"]

{pyvera-0.3.15 → pyvera-0.3.16}/pyvera/__init__.py

@@ -1227,7 +1227,6 @@ class VeraLock(VeraDevice):
         # Loop to create a list of codes
         codes = []
         for code in raw_code_list:
-
             try:
                 # Strip off trailing semicolon
                 # Create a list from csv
@@ -1259,17 +1258,17 @@ class VeraThermostat(VeraDevice):
         """Set current goal temperature / setpoint."""
 
         self.set_service_value(
-            self.thermostat_setpoint, "CurrentSetpoint", "NewCurrentSetpoint", temp
+            self._thermostat_setpoint, "CurrentSetpoint", "NewCurrentSetpoint", temp
         )
 
-        self.set_cache_value("setpoint", temp)
+        self.set_cache_value(self._setpoint_cache_value_name, temp)
 
     def get_current_goal_temperature(self, refresh: bool = False) -> Optional[float]:
         """Get current goal temperature / setpoint."""
         if refresh:
             self.refresh()
         try:
-            return float(self.get_value("setpoint"))
+            return float(self.get_value(self._setpoint_cache_value_name))
         except (TypeError, ValueError):
             return None
 
@@ -1344,6 +1343,54 @@ class VeraThermostat(VeraDevice):
         """Set fan to cycle."""
         self.set_fan_mode("PeriodicOn")
 
+    def _has_double_setpoints(self) -> bool:
+        """Determines if a thermostate has two setpoints"""
+        if self.get_value("setpoint"):
+            return False
+
+        if self.get_value("heatsp") and self.get_value("coolsp"):
+            return True
+
+        return False
+
+    def _is_heating_recommended(self) -> bool:
+        mode = self.get_value("mode")
+        state = self.get_value("hvacstate")
+
+        if mode == "HeatOn":
+            return True
+
+        if mode == "CoolOn":
+            return False
+
+        if state == "Heating":
+            return True
+
+        if state == "Cooling":
+            return False
+
+        return True
+
+    @property
+    def _setpoint_cache_value_name(self) -> str:
+        if self._has_double_setpoints():
+            if self._is_heating_recommended():
+                return "heatsp"
+            else:
+                return "coolsp"
+        else:
+            return "setpoint"
+
+    @property
+    def _thermostat_setpoint(self) -> str:
+        if self._has_double_setpoints():
+            if self._is_heating_recommended():
+                return self.thermostat_heat_setpoint
+            else:
+                return self.thermostat_cool_setpoint
+        else:
+            return self.thermostat_setpoint
+
 
 class VeraSceneController(VeraDevice):
     """Class to represent a scene controller."""

pyvera-0.3.15/setup.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['pyvera']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['requests>=2.22.0']
-
-setup_kwargs = {
-    'name': 'pyvera',
-    'version': '0.3.15',
-    'description': 'Python API for talking to Veracontrollers',
-    'long_description': '# pyVera ![Build status](https://github.com/pavoni/pyvera/workflows/Build/badge.svg) ![PyPi version](https://img.shields.io/pypi/v/pyvera) ![PyPi downloads](https://img.shields.io/pypi/dm/pyvera)\n\nA simple Python library to control devices via the Vera controller (http://getvera.com/).\n\nBased on https://github.com/jamespcole/home-assistant-vera-api\n\nAdditions to support subscriptions and some additional devices\n\nHow to use\n----------\n\n\n    >>> import pyvera\n\n    >>> controller = pyvera.VeraController("http://192.168.1.161:3480/")\n    >>> devices = controller.get_devices(\'On/Off Switch\')\n    >>> devices\n    [VeraSwitch (id=15 category=On/Off Switch name=Bookcase Uplighters), VeraSwitch (id=16 category=On/Off Switch name=Bookcase device)]\n\n    >>> devices[1]\n    VeraSwitch (id=15 category=On/Off Switch name=Bookcase Uplighters)\n\n    >>> devices[1].is_switched_on()\n    False\n\n    >>> devices[1].switch_on()\n    >>> devices[1].is_switched_on()\n    True\n\n    >>> devices[1].switch_off()\n\n\nExamples\n-------\n\nThere is some example code (that can also help with tracing and debugging) in the `examples` directory.\n\nThis will list your vera devices\n~~~~\n$ ./examples/list_devices.py -u http://192.168.1.161:3480\n~~~~\n\nThis will show you events on a particular device (get the id from the example above)\n~~~~\n$ ./examples/device_listener.py -u http://192.168.1.161:3480/  -i 26\n~~~~\n\nIf you have locks - this will show you information about them.\n~~~~\n$ ./examples/show_lock_info.py -u http://192.168.1.161:3480/\n~~~~\n\nView existing locks and PINs:\n~~~~\n$ ./examples/show_lock_info.py -u http://192.168.1.161:3480/\n~~~~\n\nSet a new door lock code on device 335:\n~~~~\n$ ./examples/set_door_code.py -u http://192.168.1.161:3480/ -i 335 -n "John Doe" -p "5678"\n~~~~\n\nClear a existing door lock code from device 335:\n~~~~\n$ ./examples/delete_door_code.py -u http://192.168.1.161:3480/ -i 335 -n "John Doe"\n~~~~\n\nDebugging\n-------\nYou may use the PYVERA_LOGLEVEL environment variable to output more verbose messages to the console.  For instance, to show all debug level messages using the list-devices implementation in the example directory, run something similar to:\n~~~~\n$ PYVERA_LOGLEVEL=DEBUG ./examples/list-devices.py -u http://192.168.1.161:3480\n~~~~\n\nDebugging inside home assistant\n-------\nIf you\'re running pyvera inside home assistant and need the debugging log traces, add the following to your `configuration.yaml`\n\n\n~~~~\nlogger:\n    logs:\n        pyvera: debug\n~~~~\n\nDeveloping\n-------\nSetup and builds are fully automated. You can run build pipeline locally by running.\n~~~~\n# Setup, build, lint and test the code.\n./scripts/build.sh\n~~~~\n\nLicense\n-------\nThe initial code was initially was written by James Cole and released under the BSD license. The rest is released under the MIT license.\n\n',
-    'author': 'James Cole',
-    'author_email': None,
-    'maintainer': None,
-    'maintainer_email': None,
-    'url': 'https://github.com/pavoni/pyvera',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'python_requires': '>=3.5,<4.0',
-}
-
-
-setup(**setup_kwargs)