Merge pull request #688 from cjkrolak/develop

update main from develop

.gitignore

@@ -10,3 +10,5 @@ supervisor-env.txt
 *.ini
 *.json
 .settings
+dist/
+**.egg-info/

setup.cfg

@@ -8,8 +8,8 @@ known-modules = :[dns, blink, blink_config, email_notification, emulator, emulat
                   kumolocal_config, mmm, mmm_config, sht31, sht31_config, supervise, supervisor_flask_server, thermostat_api, thermostat_common, unit_test_common, utilities]
 
 [metadata]
-name = thermostatsupervisor
-version = 0.0.1
+name = Thermostatsupervisor
+# version = 0.0.0 will read version from package __init__  
 author = Christopher Krolak
 author_email = [email protected]
 description = Monitor remote thermostats and correct deviations from schedule.
@@ -19,15 +19,37 @@ url = https://github.com/cjkrolak/ThermostatSupervisor
 # project_urls =
 #    Bug Tracker = 
 classifiers =
-    Programming Language :: Python :: 3
     License :: OSI Approved :: MIT License
     Operating System :: OS Independent
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    Intended Audience :: End Users/Desktop
+    Environment :: Console
+    Framework :: Flask
+    Framework :: IDLE
+    Natural Language :: English
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
+    Topic :: Home Automation
 
 [options]
-package_dir =
-    = thermostatsupervisor
+# package_dir variable was causing issue with build.py, so rem'd it out, not sure if this will
+# break something else or not.
+# package_dir =
+#    = thermostatsupervisor
 packages = find:
-python_requires = >=3.7
+python_requires = >=3.9
+install_requires = 
+    dnspython
+    munch
+    psutil
+
+keywords = 
+    thermostat
+    automation
+    supervise
 
 [options.packages.find]
 where = .

setup.py

@@ -7,8 +7,9 @@
 import os
 
 # third party libraries
-from setuptools import setup, find_packages
+from setuptools import setup
 
+# local imports
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -50,32 +51,5 @@ def get_version(rel_path):
 
 
 setup(
-    name="Thermostatsupervisor",
     version=get_version("thermostatsupervisor/__init__.py"),
-    author="Christopher Krolak",
-    author_email="[email protected]",
-    description="supervisor to detect and correct thermostat deviations",
-    url="https://github.com/cjkrolak/Thermostatsupervisor",
-    long_description_content_type="text/markdown",
-    long_description=long_description,
-    license="MIT",
-    packages=["thermostatsupervisor"],
-    python_requires='>=3',
-    install_requires=["dnspython", "munch", "psutil"],
-    keywords=["thermostat", "automation", "supervise"],
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Developers",
-        "Intended Audience :: End Users/Desktop",
-        "Environment :: Console",
-        "Framework :: Flask",
-        "Framework :: IDLE",
-        "Natural Language :: English",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Operating System :: OS Independent",
-        "Topic :: Home Automation",
-    ]
 )

tests/__init__.py

@@ -1 +1,7 @@
-# file is intentionally left empty
+"""Package identifier file"""
+
+# local imports
+from thermostatsupervisor.__init__ import __version__  # noqa F401
+
+# package name
+name = 'tests'

thermostatsupervisor/__init__.py

@@ -1,7 +1,7 @@
 """Package identifier file"""
 
-# package name
-name = 'thermostatsupervisor'
+# local imports
 
-# version info is in _version file, this is a placeholder used for unit test.
-__version__ = "0.0.0"
+# package name
+name = 'Thermostatsupervisor'
+__version__ = "1.0.5"

thermostatsupervisor/blink.py

@@ -1,10 +1,13 @@
 """Blink Camera."""
+# built-in imports
 import asyncio
 import os
 import sys
 import time
 import traceback
 
+# third party imports
+
 # local imports
 from thermostatsupervisor import blink_config
 from thermostatsupervisor import thermostat_api as api