From e56954448e89704242a384bf628fb140a0fa0846 Mon Sep 17 00:00:00 2001 From: Brian LaFond <52360893+iroxusux@users.noreply.github.com> Date: Mon, 8 Jun 2026 14:26:22 -0400 Subject: [PATCH] feat: update version to 3.6.7 and rename id property to id_ across interfaces and models --- README.md | 2 +- pyproject.toml | 2 +- pyrox/interfaces/base.py | 2 +- pyrox/models/base.py | 2 +- pyrox/models/test/test_base.py | 4 ++-- pyrox/models/test/test_connection.py | 18 +++++++++--------- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index bc67ddc..593976d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Python Version](https://img.shields.io/badge/python-3.13+-blue.svg)](https://www.python.org/downloads/) [![License](https://img.shields.io/badge/license-GPL--3.0-green.svg)](LICENSE) ![Development Status](https://img.shields.io/badge/status-beta-orange.svg) -![Version](https://img.shields.io/badge/version-3.6.6-blue.svg) +![Version](https://img.shields.io/badge/version-3.6.7-blue.svg) **Pyrox** is a Python back-end engine and application framework built on **PyQt6**. It provides a rich set of interfaces, models, services, and abstractions for building industrial automation and desktop applications. Pyrox is designed to be used as a foundation — downstream projects like [ControlRox](https://github.com/iroxusux/ControlRox) build their entire application layer on top of it. diff --git a/pyproject.toml b/pyproject.toml index 325b1b8..930913e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "pyrox" -version = "3.6.6" +version = "3.6.7" authors = [{ name = "Brian LaFond", email = "Brian.L.LaFond@gmail.com" }] description = "Python based irox engine." readme = "README.md" diff --git a/pyrox/interfaces/base.py b/pyrox/interfaces/base.py index 2413165..165997d 100644 --- a/pyrox/interfaces/base.py +++ b/pyrox/interfaces/base.py @@ -53,7 +53,7 @@ def set_id(self, id_: str) -> None: ... @property @abstractmethod - def id(self) -> str: ... + def id_(self) -> str: ... class INameable(ABC): diff --git a/pyrox/models/base.py b/pyrox/models/base.py index f5d96a0..8fb8eab 100644 --- a/pyrox/models/base.py +++ b/pyrox/models/base.py @@ -165,7 +165,7 @@ def set_id(self, id_: str) -> None: self._id = id_ @property - def id(self) -> str: + def id_(self) -> str: """Get the ID of this object.""" return self.get_id() diff --git a/pyrox/models/test/test_base.py b/pyrox/models/test/test_base.py index 5fa23f1..6ed8696 100644 --- a/pyrox/models/test/test_base.py +++ b/pyrox/models/test/test_base.py @@ -146,7 +146,7 @@ def test_set_id_updates_existing(self): def test_id_property(self): obj = HasId(id_="property-id") - assert obj.id == "property-id" + assert obj.id_ == "property-id" class TestNameable: @@ -369,7 +369,7 @@ def test_set_all_attributes(self): def test_properties_access(self): obj = CoreMixin(id_="prop-id", name="Prop Name", description="Prop Desc") - assert obj.id == "prop-id" + assert obj.id_ == "prop-id" assert obj.name == "Prop Name" assert obj.description == "Prop Desc" diff --git a/pyrox/models/test/test_connection.py b/pyrox/models/test/test_connection.py index 39c5697..1fb4b81 100644 --- a/pyrox/models/test/test_connection.py +++ b/pyrox/models/test/test_connection.py @@ -8,18 +8,18 @@ class _Sensor(IConnectable): def __init__(self, id_: str): super().__init__() - self.id_ = id_ + self._id = id_ self.on_activate_callbacks: list = [] self.on_deactivate_callbacks: list = [] def get_id(self) -> str: - return self.id_ + return self._id def set_id(self, id_: str) -> None: - self.id_ = id_ + self._id = id_ @property - def id(self) -> str: + def id_(self) -> str: return self.get_id() def get_inputs(self) -> dict[str, Any]: @@ -35,19 +35,19 @@ def get_outputs(self) -> dict[str, Any]: class _Motor(IConnectable): def __init__(self, id_: str): super().__init__() - self.id_ = id_ + self._id = id_ self.speed = 0.0 self.start_called = False self.stop_called = False def get_id(self) -> str: - return self.id_ + return self._id def set_id(self, id_: str) -> None: - self.id_ = id_ + self._id = id_ @property - def id(self) -> str: + def id_(self) -> str: return self.get_id() def start(self): @@ -881,7 +881,7 @@ class TestConnectable: def test_initialization_with_id(self): """Test initialization with ID.""" obj = Connectable(id_="test_obj_1") - assert obj.id == "test_obj_1" + assert obj.id_ == "test_obj_1" def test_inherits_from_hasid(self): """Test that Connectable inherits from HasId."""