Merge branch 'dev' into outdoor-camera-support

.github/workflows/codeql.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 🏗 Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
 
       - name: 🚀 Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 William Scanlon, 2018-2023 Aaron Bach
+Copyright (c) 2016 William Scanlon, 2018-2024 Aaron Bach
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

docs/conf.py

@@ -23,7 +23,7 @@
 author = "Aaron Bach"
 
 # The full version, including alpha/beta/rc tags
-release = "2023.10.0"
+release = "2023.12.0"
 
 
 # -- General configuration ---------------------------------------------------

docs/websocket.md

@@ -120,7 +120,7 @@ The `event_type` property will be one of the following values:
 - `camera_motion_detected`
 - `connection_lost`
 - `connection_restored`
-- `disarmed_by_master_pin`
+- `disarmed_by_keypad`
 - `disarmed_by_remote`
 - `doorbell_detected`
 - `entity_test`

pyproject.toml

@@ -42,7 +42,7 @@ warn_unused_ignores = true
 
 [tool.poetry]
 name = "simplisafe-python"
-version = "2023.10.0"
+version = "2023.12.0"
 description = "A Python3, async interface to the SimpliSafe API"
 readme = "README.md"
 authors = ["Aaron Bach <[email protected]>"]
@@ -67,7 +67,7 @@ aiohttp = ">=3.9.0b0"
 backoff = ">=1.11.1"
 beautifulsoup4 = ">=4.11.1"
 certifi = ">=2023.07.22"
-python = ">=3.10,<=3.12"
+python = "^3.10"
 voluptuous = ">=0.11.7"
 websockets = ">=8.1"
 yarl = ">=1.9.2"
@@ -92,7 +92,7 @@ pytest-cov = "^4.0.0"
 pyupgrade = "^3.1.0"
 pyyaml = "^6.0.1"
 requests = ">=2.31.0"
-ruff = ">=0.0.261,<0.1.8"
+ruff = ">=0.0.261,<0.1.12"
 safety = "^2.3.1"
 sphinx-rtd-theme = ">=1,<3"
 typing-extensions = "^4.8.0"

script/setup

@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-if command -v "rtx"; then
-  rtx install
+if command -v "mise"; then
+  mise install
 fi
 
 # Install all dependencies:

simplipy/websocket.py

@@ -41,7 +41,7 @@
 EVENT_CAMERA_MOTION_DETECTED: Final = "camera_motion_detected"
 EVENT_CONNECTION_LOST: Final = "connection_lost"
 EVENT_CONNECTION_RESTORED: Final = "connection_restored"
-EVENT_DISARMED_BY_MASTER_PIN: Final = "disarmed_by_master_pin"
+EVENT_DISARMED_BY_KEYPAD: Final = "disarmed_by_keypad"
 EVENT_DISARMED_BY_REMOTE: Final = "disarmed_by_remote"
 EVENT_DOORBELL_DETECTED: Final = "doorbell_detected"
 EVENT_DEVICE_TEST: Final = "device_test"
@@ -70,7 +70,7 @@
     1301: EVENT_POWER_OUTAGE,
     1350: EVENT_CONNECTION_LOST,
     1381: EVENT_SENSOR_NOT_RESPONDING,
-    1400: EVENT_DISARMED_BY_MASTER_PIN,
+    1400: EVENT_DISARMED_BY_KEYPAD,
     1406: EVENT_ALARM_CANCELED,
     1407: EVENT_DISARMED_BY_REMOTE,
     1409: EVENT_SECRET_ALERT_TRIGGERED,

tests/test_websocket.py

@@ -27,7 +27,7 @@
     WebsocketError,
 )
 from simplipy.websocket import (
-    EVENT_DISARMED_BY_MASTER_PIN,
+    EVENT_DISARMED_BY_KEYPAD,
     Watchdog,
     WebsocketClient,
     websocket_event_from_payload,
@@ -138,7 +138,7 @@ def test_create_event(ws_message_event: dict[str, Any]) -> None:
         ws_message_event: A websocket event payload.
     """
     event = websocket_event_from_payload(ws_message_event)
-    assert event.event_type == EVENT_DISARMED_BY_MASTER_PIN
+    assert event.event_type == EVENT_DISARMED_BY_KEYPAD
     assert event.info == "System Disarmed by Master PIN"
     assert event.system_id == 12345
     assert event.timestamp == datetime(2021, 9, 29, 23, 14, 46, tzinfo=timezone.utc)