.gitignore

@@ -1,4 +1 @@
-*~
-*.pyc
-dist/
 rattail_tempmon.egg-info/

CHANGELOG.md

@@ -1,53 +0,0 @@
-
-# Changelog
-All notable changes to rattail-tempmon will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-
-## v0.4.6 (2024-08-19)
-
-### Fix
-
-- avoid deprecated base class for config extension
-
-## v0.4.5 (2024-07-02)
-
-### Fix
-
-- fix signature for calls to `get_engines()`
-
-## v0.4.4 (2024-07-02)
-
-### Fix
-
-- avoid deprecated function for engine config
-
-## v0.4.3 (2024-07-01)
-
-### Fix
-
-- remove references, dependency for `six` package
-
-## v0.4.2 (2024-07-01)
-
-### Fix
-
-- remove legacy command definitions
-
-## v0.4.1 (2024-06-14)
-
-### Fix
-
-- fallback to `importlib_metadata` on older python
-
-## v0.4.0 (2024-06-10)
-
-### Feat
-
-- switch from setup.cfg to pyproject.toml + hatchling
-
-
-## Older Releases
-
-Please see `docs/OLDCHANGES.rst` for older release notes.

CHANGES.rst

@@ -2,10 +2,6 @@
 CHANGELOG
 =========
 
-NB. this file contains "old" release notes only.  for newer releases
-see the `CHANGELOG.md` file in the source root folder.
-
-
 0.3.0 (2024-05-30)
 ------------------
 

README.rst

@@ -1,5 +1,6 @@
 
-# rattail-tempmon
+rattail-tempmon
+===============
 
 Rattail is a retail software framework, released under the GNU General Public
 License.
@@ -7,5 +8,6 @@ License.
 This is the ``rattail-tempmon`` package, which provides a database schema, and
 client/server daemons for recording and processing temperature data.
 
-Please see Rattail's [home page](https://rattailproject.org/) for more
+Please see Rattail's `home page`_ for more information.
-information.
+
+.. _home page: https://rattailproject.org/

pyproject.toml

@@ -1,52 +0,0 @@
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-
-[project]
-name = "rattail-tempmon"
-version = "0.4.6"
-description = "Retail Software Framework - Temperature monitoring add-on"
-readme = "README.md"
-authors = [{name = "Lance Edgar", email = "lance@edbob.org"}]
-license = {text = "GNU GPL v3+"}
-classifiers = [
-        "Development Status :: 3 - Alpha",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
-        "Natural Language :: English",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Topic :: Office/Business",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-]
-dependencies = [
-        "rattail[db]",
-        "sqlsoup",
-]
-
-
-[project.urls]
-Homepage = "https://rattailproject.org"
-Repository = "https://forgejo.wuttaproject.org/rattail/rattail-tempmon"
-Changelog = "https://forgejo.wuttaproject.org/rattail/rattail-tempmon/src/branch/master/CHANGELOG.md"
-
-
-[project.entry-points."rattail.config.extensions"]
-tempmon = "rattail_tempmon.config:TempmonConfigExtension"
-
-
-[project.entry-points."rattail.typer_imports"]
-rattail_tempmon = "rattail_tempmon.commands"
-
-
-[project.entry-points."rattail.emails"]
-rattail_tempmon = "rattail_tempmon.emails"
-
-
-[tool.commitizen]
-version_provider = "pep621"
-tag_format = "v$version"
-update_changelog_on_bump = true

rattail_tempmon/_version.py

@@ -1,9 +1,3 @@
 # -*- coding: utf-8; -*-
 
-try:
+__version__ = '0.3.0'
-    from importlib.metadata import version
-except ImportError:
-    from importlib_metadata import version
-
-
-__version__ = version('rattail-tempmon')

rattail_tempmon/commands.py

@@ -32,7 +32,7 @@ from pathlib import Path
 import typer
 from typing_extensions import Annotated
 
-from rattail.commands import rattail_typer
+from rattail.commands import rattail_typer, Subcommand, ImportSubcommand
 from rattail.commands.typer import importer_command, typer_get_runas_user
 from rattail.commands.importing import ImportCommandHandler
 
@@ -156,6 +156,33 @@ def tempmon_server(
         daemon.stop()
 
 
+class ExportHotCooler(ImportSubcommand):
+    """
+    Export data from Rattail-Tempmon to HotCooler
+    """
+    name = 'export-hotcooler'
+    description = __doc__.strip()
+    handler_spec = 'rattail_tempmon.hotcooler.importing.tempmon:FromTempmonToHotCooler'
+
+
+class PurgeTempmon(Subcommand):
+    """
+    Purge stale data from Tempmon database
+    """
+    name = 'purge-tempmon'
+    description = __doc__.strip()
+
+    def add_parser_args(self, parser):
+        parser.add_argument('--keep', metavar='DAYS', required=True, type=int,
+                            help="Number of days for which data should be kept.")
+        parser.add_argument('--dry-run', action='store_true',
+                            help="Go through the full motions and allow logging etc. to "
+                            "occur, but rollback (abort) the transaction at the end.")
+
+    def run(self, args):
+        do_purge(self.config, args.keep, dry_run=args.dry_run, progress=self.progress)
+
+
 def do_purge(config, keep_days, dry_run=False, progress=None):
     from rattail_tempmon.db import Session, model
     from rattail.db.util import finalize_session
@@ -178,3 +205,76 @@ def do_purge(config, keep_days, dry_run=False, progress=None):
                       message="Purging stale readings")
     log.info("deleted %s stale readings", len(readings))
     finalize_session(session, dry_run=dry_run)
+
+
+class TempmonClient(Subcommand):
+    """
+    Manage the tempmon-client daemon
+    """
+    name = 'tempmon-client'
+    description = __doc__.strip()
+
+    def add_parser_args(self, parser):
+        subparsers = parser.add_subparsers(title='subcommands')
+
+        start = subparsers.add_parser('start', help="Start daemon")
+        start.set_defaults(subcommand='start')
+        stop = subparsers.add_parser('stop', help="Stop daemon")
+        stop.set_defaults(subcommand='stop')
+
+        parser.add_argument('-p', '--pidfile',
+                            help="Path to PID file.", metavar='PATH')
+        parser.add_argument('-D', '--daemonize', action='store_true',
+                            help="Daemonize when starting.")
+
+    def run(self, args):
+        from rattail_tempmon.client import make_daemon
+
+        daemon = make_daemon(self.config, args.pidfile)
+        if args.subcommand == 'start':
+            daemon.start(args.daemonize)
+        elif args.subcommand == 'stop':
+            daemon.stop()
+
+
+class TempmonServer(Subcommand):
+    """
+    Manage the tempmon-server daemon
+    """
+    name = 'tempmon-server'
+    description = __doc__.strip()
+
+    def add_parser_args(self, parser):
+        subparsers = parser.add_subparsers(title='subcommands')
+
+        start = subparsers.add_parser('start', help="Start daemon")
+        start.set_defaults(subcommand='start')
+        stop = subparsers.add_parser('stop', help="Stop daemon")
+        stop.set_defaults(subcommand='stop')
+
+        parser.add_argument('-p', '--pidfile',
+                            help="Path to PID file.", metavar='PATH')
+        parser.add_argument('-D', '--daemonize', action='store_true',
+                            help="Daemonize when starting.")
+
+    def run(self, args):
+        from rattail_tempmon.server import make_daemon
+
+        daemon = make_daemon(self.config, args.pidfile)
+        if args.subcommand == 'start':
+            daemon.start(args.daemonize)
+        elif args.subcommand == 'stop':
+            daemon.stop()
+
+
+class TempmonProblems(Subcommand):
+    """
+    Email report(s) of various Tempmon data problems
+    """
+    name = 'tempmon-problems'
+    description = __doc__.strip()
+
+    def run(self, args):
+        from rattail_tempmon import problems
+
+        problems.disabled_probes(self.config, progress=self.progress)

rattail_tempmon/config.py

@@ -1,8 +1,8 @@
-# -*- coding: utf-8; -*-
+# -*- coding: utf-8 -*-
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2024 Lance Edgar
+#  Copyright © 2010-2017 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -24,13 +24,14 @@
 Tempmon config extension
 """
 
-from wuttjamaican.db import get_engines
+from __future__ import unicode_literals, absolute_import
-from wuttjamaican.conf import WuttaConfigExtension
 
+from rattail.config import ConfigExtension
+from rattail.db.config import get_engines
 from rattail_tempmon.db import Session
 
 
-class TempmonConfigExtension(WuttaConfigExtension):
+class TempmonConfigExtension(ConfigExtension):
     """
     Config extension for tempmon; adds tempmon DB engine/Session etc.  Expects
     something like this in your config:
@@ -52,10 +53,10 @@ class TempmonConfigExtension(WuttaConfigExtension):
     def configure(self, config):
 
         # tempmon
-        config.tempmon_engines = get_engines(config, 'rattail_tempmon.db')
+        config.tempmon_engines = get_engines(config, section='rattail_tempmon.db')
         config.tempmon_engine = config.tempmon_engines.get('default')
         Session.configure(bind=config.tempmon_engine)
 
         # hotcooler
-        config.hotcooler_engines = get_engines(config, 'hotcooler.db')
+        config.hotcooler_engines = get_engines(config, section='hotcooler.db')
         config.hotcooler_engine = config.hotcooler_engines.get('default')

rattail_tempmon/server.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2024 Lance Edgar
+#  Copyright © 2010-2018 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -24,10 +24,13 @@
 Tempmon server daemon
 """
 
+from __future__ import unicode_literals, absolute_import
+
 import time
 import datetime
 import logging
 
+import six
 import humanize
 from sqlalchemy import orm
 from sqlalchemy.exc import OperationalError
@@ -88,7 +91,7 @@ class TempmonServerDaemon(Daemon):
                 # first time after DB stop.  but in the case of DB stop,
                 # subsequent errors will instead match the second test
                 if error.connection_invalidated or (
-                        'could not connect to server: Connection refused' in str(error)):
+                        'could not connect to server: Connection refused' in six.text_type(error)):
 
                     # only suppress logging for 3 failures, after that we let them go
                     # TODO: should make the max attempts configurable
@@ -96,7 +99,7 @@ class TempmonServerDaemon(Daemon):
                         log_error = False
                         log.debug("database connection failure #%s: %s",
                                   self.failed_checks,
-                                  str(error))
+                                  six.text_type(error))
 
             # send error email unless we're suppressing it for now
             if log_error:

setup.cfg

@@ -0,0 +1,50 @@
+# -*- coding: utf-8; -*-
+
+[metadata]
+name = rattail-tempmon
+version = attr: rattail_tempmon.__version__
+author = Lance Edgar
+author_email = lance@edbob.org
+url = https://rattailproject.org/
+license = GNU GPL v3
+description = Retail Software Framework - Temperature monitoring add-on
+long_description = file: README.rst
+classifiers =
+        Development Status :: 3 - Alpha
+        Intended Audience :: Developers
+        License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+        Natural Language :: English
+        Operating System :: OS Independent
+        Programming Language :: Python
+        Programming Language :: Python :: 3
+        Topic :: Office/Business
+        Topic :: Software Development :: Libraries :: Python Modules
+
+
+[options]
+install_requires =
+        rattail[db]
+        six
+        sqlsoup
+
+packages = find:
+include_package_data = True
+
+
+[options.entry_points]
+
+rattail.subcommands =
+        export-hotcooler = rattail_tempmon.commands:ExportHotCooler
+        purge-tempmon = rattail_tempmon.commands:PurgeTempmon
+        tempmon-client = rattail_tempmon.commands:TempmonClient
+        tempmon-problems = rattail_tempmon.commands:TempmonProblems
+        tempmon-server = rattail_tempmon.commands:TempmonServer
+
+rattail.typer_imports =
+        rattail_tempmon = rattail_tempmon.commands
+
+rattail.config.extensions =
+        tempmon = rattail_tempmon.config:TempmonConfigExtension
+
+rattail.emails =
+        rattail_tempmon = rattail_tempmon.emails

setup.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8; -*-
+################################################################################
+#
+#  Rattail -- Retail Software Framework
+#  Copyright © 2010-2023 Lance Edgar
+#
+#  This file is part of Rattail.
+#
+#  Rattail is free software: you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation, either version 3 of the License, or (at your option) any later
+#  version.
+#
+#  Rattail is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  Rattail.  If not, see <http://www.gnu.org/licenses/>.
+#
+################################################################################
+"""
+setup script for rattail-tempmon
+"""
+
+from setuptools import setup
+
+setup()

tasks.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  Rattail -- Retail Software Framework
-#  Copyright © 2010-2024 Lance Edgar
+#  Copyright © 2010-2023 Lance Edgar
 #
 #  This file is part of Rattail.
 #
@@ -30,14 +30,16 @@ import shutil
 from invoke import task
 
 
+here = os.path.abspath(os.path.dirname(__file__))
+exec(open(os.path.join(here, 'rattail_tempmon', '_version.py')).read())
+
+
 @task
 def release(c):
     """
     Release a new version of `rattail-tempmon`
     """
-    if os.path.exists('dist'):
-        shutil.rmtree('dist')
     if os.path.exists('rattail_tempmon.egg-info'):
         shutil.rmtree('rattail_tempmon.egg-info')
     c.run('python -m build --sdist')
-    c.run('twine upload dist/*')
+    c.run('twine upload dist/rattail-tempmon-{}.tar.gz'.format(__version__))