Test diversion rules

.coveragerc

@@ -0,0 +1,22 @@
+[run]
+branch = True
+
+source =
+    hid_parser
+    hidapi
+    keysyms
+    logitech_receiver
+    solaar
+
+omit =
+    */tests/*
+    */setup.py
+    */__main__.py
+
+[report]
+exclude_lines =
+    pragma: no cover
+    if __name__ == '__main__':
+    if typing.TYPE_CHECKING
+
+fail_under = 40

.github/workflows/tests.yml

@@ -31,6 +31,17 @@ jobs:
       run: |
         make test
 
+    - name: Upload coverage to Codecov
+      if: github.ref == 'refs/heads/master'
+      uses: codecov/codecov-action@v4.5.0
+      with:
+        directory: ./coverage/reports/
+        env_vars: OS, PYTHON
+        files: ./coverage.xml
+        flags: unittests
+        name: codecov-umbrella
+        token: ${{ secrets.CODECOV_TOKEN }}
+
   macos-tests:
     runs-on: macos-latest
 
@@ -55,4 +66,14 @@ jobs:
         make install_pip PIP_ARGS='.["test"]'
     - name: Run tests on macOS
       run: |
-        export DYLD_LIBRARY_PATH=$(brew --prefix hidapi)/lib:$DYLD_LIBRARY_PATH && pytest --cov=lib/ tests/
+        export DYLD_LIBRARY_PATH=$(brew --prefix hidapi)/lib:$DYLD_LIBRARY_PATH && pytest --cov --cov-report=xml
+    - name: Upload coverage to Codecov
+      if: github.ref == 'refs/heads/master'
+      uses: codecov/codecov-action@v4.5.0
+      with:
+        directory: ./coverage/reports/
+        env_vars: OS, PYTHON
+        files: ./coverage.xml
+        flags: unittests
+        name: codecov-umbrella
+        token: ${{ secrets.CODECOV_TOKEN }}

Makefile

@@ -66,4 +66,4 @@ lint:
 
 test:
 	@echo "Running Solaar tests"
-	pytest --cov=lib/ tests/
+	pytest --cov --cov-report=xml

README.md

@@ -13,6 +13,7 @@ that are otherwise ignored by the Linux input system.
 <a href="https://pwr-solaar.github.io/Solaar/installation">Manual Installation</a>
 
 
+[![codecov](https://codecov.io/gh/pwr-Solaar/Solaar/graph/badge.svg?token=D7YWFEWID6)](https://codecov.io/gh/pwr-Solaar/Solaar)
 [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](../LICENSE.txt)
 
 <p align="center">

bin/solaar

@@ -25,6 +25,7 @@ def init_paths():
     import sys
 
     # Python 3 might have problems converting back to UTF-8 in case of Unicode surrogates
+    decoded_path = None
     try:
         decoded_path = sys.path[0]
         sys.path[0].encode(sys.getfilesystemencoding())

lib/hid_parser/__init__.py

@@ -560,7 +560,8 @@ def parse(self, data: Sequence[int]) -> Dict[Usage, UsageValue]:
                 )
                 continue
 
-            if usage in self._usages and all(usage_type not in self._INCOMPATIBLE_TYPES for usage_type in usage.usage_types):
+            not_incompatible_type = all(usage_type not in self._INCOMPATIBLE_TYPES for usage_type in usage.usage_types)
+            if usage in self._usages and not_incompatible_type:
                 usage_values[usage] = UsageValue(self, True)
 
         return usage_values
@@ -820,14 +821,28 @@ def _parse(self, level: int = 0, file: TextIO = sys.stdout) -> None:  # noqa: C9
                     if data is None:
                         raise InvalidReportDescriptor("Invalid output item")
                     self._append_items(
-                        offset_output, self._output, report_id, report_count, report_size, usages, data, {**glob, **local}
+                        offset_output,
+                        self._output,
+                        report_id,
+                        report_count,
+                        report_size,
+                        usages,
+                        data,
+                        {**glob, **local},
                     )
 
                 elif tag == TagMain.FEATURE:
                     if data is None:
                         raise InvalidReportDescriptor("Invalid feature item")
                     self._append_items(
-                        offset_feature, self._feature, report_id, report_count, report_size, usages, data, {**glob, **local}
+                        offset_feature,
+                        self._feature,
+                        report_id,
+                        report_count,
+                        report_size,
+                        usages,
+                        data,
+                        {**glob, **local},
                     )
 
                 # clear local

lib/hidapi/__init__.py

@@ -1,47 +0,0 @@
-## Copyright (C) 2012-2013  Daniel Pavel
-##
-## This program 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 2 of the License, or
-## (at your option) any later version.
-##
-## This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-"""Generic Human Interface Device API."""
-
-import platform
-
-if platform.system() in ("Darwin", "Windows"):
-    from hidapi.hidapi_impl import close  # noqa: F401
-    from hidapi.hidapi_impl import enumerate  # noqa: F401
-    from hidapi.hidapi_impl import find_paired_node  # noqa: F401
-    from hidapi.hidapi_impl import find_paired_node_wpid  # noqa: F401
-    from hidapi.hidapi_impl import get_manufacturer  # noqa: F401
-    from hidapi.hidapi_impl import get_product  # noqa: F401
-    from hidapi.hidapi_impl import get_serial  # noqa: F401
-    from hidapi.hidapi_impl import monitor_glib  # noqa: F401
-    from hidapi.hidapi_impl import open  # noqa: F401
-    from hidapi.hidapi_impl import open_path  # noqa: F401
-    from hidapi.hidapi_impl import read  # noqa: F401
-    from hidapi.hidapi_impl import write  # noqa: F401
-else:
-    from hidapi.udev_impl import close  # noqa: F401
-    from hidapi.udev_impl import enumerate  # noqa: F401
-    from hidapi.udev_impl import find_paired_node  # noqa: F401
-    from hidapi.udev_impl import find_paired_node_wpid  # noqa: F401
-    from hidapi.udev_impl import get_manufacturer  # noqa: F401
-    from hidapi.udev_impl import get_product  # noqa: F401
-    from hidapi.udev_impl import get_serial  # noqa: F401
-    from hidapi.udev_impl import monitor_glib  # noqa: F401
-    from hidapi.udev_impl import open  # noqa: F401
-    from hidapi.udev_impl import open_path  # noqa: F401
-    from hidapi.udev_impl import read  # noqa: F401
-    from hidapi.udev_impl import write  # noqa: F401
-
-__version__ = "0.9"

lib/hidapi/common.py

@@ -1,18 +1,20 @@
+from __future__ import annotations
+
 import dataclasses
 
 
 @dataclasses.dataclass
 class DeviceInfo:
     path: str
-    bus_id: str
+    bus_id: str | None
     vendor_id: str
     product_id: str
-    interface: str
-    driver: str
-    manufacturer: str
-    product: str
-    serial: str
-    release: str
+    interface: str | None
+    driver: str | None
+    manufacturer: str | None
+    product: str | None
+    serial: str | None
+    release: str | None
     isDevice: bool
-    hidpp_short: str
-    hidpp_long: str
+    hidpp_short: str | None
+    hidpp_long: str | None