black, flake8 -> ruff

.github/workflows/ci.yml

@@ -19,12 +19,9 @@ jobs:
           python-version: "3.12"
       - name: Install Poetry
         uses: abatilo/actions-poetry@v4.0.0
-      - name: Poetry Install
-        run: poetry install
-      - name: Run flake8
-        run: poetry run flake8
-      - name: Run black
-        run: poetry run black --verbose --check .
+      - run: poetry install
+      - run: poetry run ruff check
+      - run: poetry run ruff format --check
 
   docs:
     runs-on: ubuntu-latest

.gitignore

@@ -2,6 +2,7 @@ docs/cli.txt
 .vscode/
 public/
 *.orig
+.ruff_cache/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

README.rst

@@ -1,7 +1,7 @@
 monitorcontrol
 ##############
 
-|PyPi Version| |Build Status| |Documentation Status| |Coverage Status| |Black|
+|PyPi Version| |Build Status| |Documentation Status| |Coverage Status| |Ruff|
 
 Python monitor control using the VESA Monitor Control Command Set (MCCS)
 over the Display Data Channel Command Interface Standard (DDC-CI).
@@ -38,5 +38,6 @@ Full documentation including examples are avaliable in the `docs <https://newam.
    :target: https://coveralls.io/github/newAM/monitorcontrol?branch=master
 .. |Documentation Status| image:: https://img.shields.io/badge/docs-latest-blue
    :target: https://newam.github.io/monitorcontrol
-.. |Black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
-   :target: https://github.com/psf/black
+.. |Ruff| image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Ruff

monitorcontrol/monitorcontrol.py

@@ -463,7 +463,9 @@ def get_input_source(self) -> InputSource:
         try:
             return InputSource(value)
         except ValueError:
-            raise InputSourceValueError(f"{value} is not a valid InputSource", value)
+            raise InputSourceValueError(
+                f"{value} is not a valid InputSource", value
+            ) from None
 
     def set_input_source(self, value: Union[int, str, InputSource]):
         """

monitorcontrol/vcp/vcp_linux.py

@@ -279,14 +279,14 @@ def get_vcp_capabilities(self):
             # remove checksum from length
 
             # unpack the payload
-            reply_code, payload = struct.unpack(f">B{length-1}s", payload)
+            reply_code, payload = struct.unpack(f">B{length - 1}s", payload)
             length -= 1
 
             if reply_code != self.GET_VCP_CAPS_REPLY:
                 raise VCPIOError(f"received unexpected response code: {reply_code}")
 
             # unpack the payload
-            offset, payload = struct.unpack(f">H{length-2}s", payload)
+            offset, payload = struct.unpack(f">H{length - 2}s", payload)
             length -= 2
 
             if length > 0:

pyproject.toml

@@ -13,13 +13,10 @@ python = "^3.9"
 pyudev = { version = ">=0.23,<0.25", markers = "sys_platform != 'win32'" }
 
 [tool.poetry.dev-dependencies]
-black = "24.8.0"
 coveralls = "^3"
-flake8 = { version = "^7", python = ">=3.8.1,<4.0" }
-flake8-bugbear = { version = "^24.12.12", python = ">=3.8.1,<4.0" }
-pep8-naming = "~0.14"
 pytest = "^8"
 pytest-cov = "^5"
+ruff = "^0.9.1"
 sphinx = "^7.1"
 sphinx-rtd-theme = "^3"
 toml = "~0.10"
@@ -31,3 +28,7 @@ monitorcontrol = "monitorcontrol.__main__:main"
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.ruff.lint]
+# Add flake8-bugbear and pep8-naming rules
+extend-select = ["B", "N"]

tests/test_cli.py

@@ -59,11 +59,11 @@ def test_set_input_source(value: str):
 
 
 def test_get_monitors():
-    with get_monitors_mock, mock.patch.object(
-        Monitor, "get_input_source"
-    ) as input_source_api_mock, mock.patch.object(
-        Monitor, "get_vcp_capabilities"
-    ) as vcp_capabilities_api_mock:
+    with (
+        get_monitors_mock,
+        mock.patch.object(Monitor, "get_input_source") as input_source_api_mock,
+        mock.patch.object(Monitor, "get_vcp_capabilities") as vcp_capabilities_api_mock,
+    ):
         main(["--get-monitors"])
         input_source_api_mock.assert_called()
         vcp_capabilities_api_mock.assert_called()