feat: move to v0.4.0

Many small changes to get tests passing.

.github/dependabot.yml

@@ -19,6 +19,6 @@ updates:
       interval: "weekly"
     target-branch: "main"
     commit-message:
-      prefix: "pip stable"
+      prefix: "pip runtime"
       prefix-development: "pip dev"
     open-pull-requests-limit: 3

.github/workflows/code-analysis.yml

@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   analyze:
-    name: Analyze
+    name: Code Analysis
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         language: [ "python" ]
-        python-version: [ "3.9", "3.10", "3.11" ]
+        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
 
     steps:
       - name: Checkout repository
@@ -49,6 +49,8 @@ jobs:
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
+        with:
+          languages: ${{ matrix.language }}
 
       - name: Run pip audit
         uses: pypa/[email protected]

.github/workflows/test-package.yml

@@ -2,9 +2,9 @@ name: Test Package
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "develop" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "develop" ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.9", "3.10", "3.11" ]
+        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
     permissions:
       contents: read
       pull-requests: write

CONTRIBUTING.md

@@ -54,7 +54,7 @@ source .venv-test/bin/activate
 python -m pip install --upgrade pip setuptools wheel
 python -m pip install --upgrade -r requirements.txt
 
-SERVER_MONITOR_AGENT_VERSION='0.3.0'
+SERVER_MONITOR_AGENT_VERSION='0.4.0'
 pip install --index-url https://test.pypi.org/simple/ --no-deps server-monitor-agent==$SERVER_MONITOR_AGENT_VERSION
 ```
 

VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

ansible/roles/app/vars/main.yml

@@ -9,10 +9,11 @@ ubuntu_apt_source_mirror_security: http://security.ubuntu.com/ubuntu
 ubuntu_package_source_file: /etc/apt/sources.list
 
 python_versions:
-  - '3.7'
+  - '3.8'
   - '3.9'
   - '3.10'
   - '3.11'
+  - '3.12'
 
 # general
 guest_data_dir: "/home/{{ guest_user_name }}/data"

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "server-monitor-agent"
 description = "Utility to run checks on a server and send notifications."
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: Apache Software License",
@@ -72,17 +72,19 @@ src_paths = [
 legacy_tox_ini = """
 [tox]
 isolated_build = True
-envlist = py39,py310,py311
+envlist = py38,py39,py310,py311,py312
 
 [testenv]
 #recreate = true
 deps =
     -r requirements.txt
     -r requirements-dev.txt
+set_env =
+    PYTHONDEVMODE=1
 commands =
     server-monitor-agent --help
     server-monitor-agent --version
-    coverage run -m pytest --tb=no --durations=5
+    coverage run -m pytest --tb=long --durations=5
 """
 
 [tool.pydocstyle]

requirements-dev.txt

@@ -32,6 +32,4 @@ types-PyYAML
 types-requests
 types-backports
 types-urllib3
-pyre-check; platform_system != "Windows"
-openapi-python-client
-pytype;python_version<"3.9"
+openapi-python-client

requirements.txt

@@ -8,5 +8,6 @@ PyYAML==6.0.1
 boltons==23.1.1
 click==8.1.7
 beartype==0.16.4
-importlib_metadata; python_version<"3.8"
+importlib-resources
+importlib-metadata
 backports.zoneinfo[tzdata];python_version<"3.9"

src/server_monitor_agent/agent/cli.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import argparse
 import os
 import pathlib

src/server_monitor_agent/agent/command.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import logging
 from pathlib import Path
 

src/server_monitor_agent/agent/common.py

@@ -4,8 +4,13 @@
 import subprocess
 import typing
 from datetime import datetime
-from importlib import metadata, resources
-from zoneinfo import ZoneInfo
+import importlib_resources
+import importlib_metadata
+
+try:
+    import zoneinfo
+except ImportError:
+    from backports import zoneinfo
 
 APP_NAME_DASH = "server-monitor-agent"
 APP_NAME_UNDER = "server_monitor_agent"
@@ -26,14 +31,14 @@ def get_hostname() -> str:
 def get_version() -> typing.Optional[str]:
     """Get the version of this package."""
     try:
-        dist = metadata.distribution(APP_NAME_DASH)
+        dist = importlib_metadata.distribution(APP_NAME_DASH)
         return dist.version
-    except metadata.PackageNotFoundError:
+    except importlib_metadata.PackageNotFoundError:
         # ignore error
         pass
 
     try:
-        with resources.path(APP_NAME_UNDER, "entry.py") as p:
+        with importlib_resources.path(APP_NAME_UNDER, "entry.py") as p:
             return (p.parent.parent.parent / "VERSION").read_text().strip()
     except FileNotFoundError:
         # ignore error
@@ -69,7 +74,7 @@ class CheckReport(abc.ABC):
     description: str
 
     def __post_init__(self):
-        self._timestamp_formatted = datetime.now(ZoneInfo(self.time_zone)).isoformat(
+        self._timestamp_formatted = datetime.now(zoneinfo.ZoneInfo(self.time_zone)).isoformat(
             timespec="seconds"
         )