Fix: Use try/except with allow_module_level=True for optional dependency tests

Author: RonanB96

.github/workflows/release.yml

@@ -51,6 +51,11 @@ jobs:
         artifact: [wheel, sdist]
     steps:
       - uses: actions/checkout@v6
+        with:
+          sparse-checkout: |
+            tests/
+            pyproject.toml
+            .gitignore
 
       - uses: actions/setup-python@v6
         with:
@@ -80,10 +85,10 @@ jobs:
 
       - name: Run packaging smoke tests against installed ${{ matrix.artifact }}
         run: |
-          cd /tmp
-          python -m pytest "$GITHUB_WORKSPACE/tests/gatt/test_uuid_registry.py" \
-            --override-ini="pythonpath=" \
+          python -m pytest tests/ \
             -m packaging \
+            --ignore=tests/docs \
+            --override-ini="pythonpath=" \
             -v
 
   publish-pypi:

.vscode/settings.json

@@ -2,5 +2,8 @@
     "chat.tools.terminal.autoApprove": {
         "bluetoothctl": true,
         "hciconfig": true
-    }
+    },
+    "python.defaultInterpreterPath": "${workspaceFolder}/../../../.venv/bin/python",
+    "python.venvPath": "${workspaceFolder}/../../../",
+    "python.analysis.extraPaths": ["${workspaceFolder}/src"]
 }

src/bluetooth_sig/gatt/uuid_registry.py

@@ -383,7 +383,7 @@ def get_service_info(self, key: str | BluetoothUUID) -> ServiceInfo | None:
                     if canonical_key in self._services:
                         return self._services[canonical_key]
                 except ValueError:
-                    logger.warning("UUID normalization failed for service lookup: %s", search_key)
+                    pass  # UUID normalization failed, continue to alias lookup
 
                 # Check alias index (normalized to lowercase)
                 alias_key = self._service_aliases.get(search_key.lower())
@@ -411,7 +411,7 @@ def get_characteristic_info(self, identifier: str | BluetoothUUID) -> Characteri
                     if canonical_key in self._characteristics:
                         return self._characteristics[canonical_key]
                 except ValueError:
-                    logger.warning("UUID normalization failed for characteristic lookup: %s", search_key)
+                    pass  # UUID normalization failed, continue to alias lookup
 
                 # Check alias index (normalized to lowercase)
                 alias_key = self._characteristic_aliases.get(search_key.lower())
@@ -439,7 +439,7 @@ def get_descriptor_info(self, identifier: str | BluetoothUUID) -> DescriptorInfo
                     if canonical_key in self._descriptors:
                         return self._descriptors[canonical_key]
                 except ValueError:
-                    logger.warning("UUID normalization failed for descriptor lookup: %s", search_key)
+                    pass  # UUID normalization failed, continue to alias lookup
 
                 # Check alias index (normalized to lowercase)
                 alias_key = self._descriptor_aliases.get(search_key.lower())

src/bluetooth_sig/registry/base.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import logging
 import threading
 from abc import ABC, abstractmethod
 from collections.abc import Callable
@@ -18,8 +17,6 @@
 from bluetooth_sig.types.registry import BaseUuidInfo, generate_basic_aliases
 from bluetooth_sig.types.uuid import BluetoothUUID
 
-logger = logging.getLogger(__name__)
-
 T = TypeVar("T")
 E = TypeVar("E", bound=Enum)  # For enum-keyed registries
 C = TypeVar("C")  # For class types
@@ -213,8 +210,7 @@ def get_info(self, identifier: str | BluetoothUUID) -> U | None:
                 if canonical_key in self._canonical_store:
                     return self._canonical_store[canonical_key]
             except ValueError:
-                logger.warning("UUID normalization failed for registry lookup: %s", search_key)
-
+                pass  # UUID normalization failed, continue to alias lookup
             # Check alias index (normalized to lowercase)
             alias_key = self._alias_index.get(search_key.lower())
             if alias_key and alias_key in self._canonical_store:

tests/conftest.py

@@ -1,8 +1,4 @@
-"""Pytest configuration helpers.
-
-Ensure repository root and `src/` are on `sys.path` so tests can import
-local packages without per-test sys.path hacks.
-"""
+"""Pytest configuration helpers."""
 
 from __future__ import annotations
 
@@ -28,12 +24,6 @@
 ROOT = Path(__file__).resolve().parent.parent
 # Export ROOT_DIR for tests that need to construct paths relative to project root
 ROOT_DIR = ROOT
-if str(ROOT) not in sys.path:
-    sys.path.insert(0, str(ROOT))
-
-SRC = ROOT / "src"
-if SRC.exists() and str(SRC) not in sys.path:
-    sys.path.insert(0, str(SRC))
 
 
 def pytest_collection_modifyitems(config: pytest.Config, items: list[pytest.Item]) -> None:

tests/docs/html/test_accessibility_static.py

@@ -12,7 +12,12 @@
 from pathlib import Path
 
 import pytest
-from bs4 import BeautifulSoup, Tag
+
+# Skip this entire module if beautifulsoup4 is not installed
+try:
+    from bs4 import BeautifulSoup, Tag
+except ModuleNotFoundError:
+    pytest.skip("beautifulsoup4 not installed", allow_module_level=True)
 
 
 @pytest.mark.built_docs

tests/docs/html/test_content_quality_static.py

@@ -9,7 +9,12 @@
 from pathlib import Path
 
 import pytest
-from bs4 import BeautifulSoup
+
+# Skip this entire module if beautifulsoup4 is not installed
+try:
+    from bs4 import BeautifulSoup
+except ModuleNotFoundError:
+    pytest.skip("beautifulsoup4 not installed", allow_module_level=True)
 
 
 @pytest.mark.built_docs

tests/docs/html/test_structure_static.py

@@ -10,7 +10,12 @@
 from pathlib import Path
 
 import pytest
-from bs4 import BeautifulSoup
+
+# Skip this entire module if beautifulsoup4 is not installed
+try:
+    from bs4 import BeautifulSoup
+except ModuleNotFoundError:
+    pytest.skip("beautifulsoup4 not installed", allow_module_level=True)
 
 
 @pytest.mark.built_docs

tests/docs/test_readme_badges.py

@@ -7,7 +7,12 @@
 from urllib.parse import urlparse
 
 import pytest
-import requests
+
+# Skip this entire module if requests is not installed
+try:
+    import requests
+except ModuleNotFoundError:
+    pytest.skip("requests not installed", allow_module_level=True)
 
 
 def _is_trusted_domain(url: str, trusted_domains: list[str]) -> bool:

tests/gatt/test_uuid_registry.py

@@ -15,9 +15,9 @@
 from bluetooth_sig.gatt.services.battery_service import BatteryService
 from bluetooth_sig.gatt.services.environmental_sensing import EnvironmentalSensingService
 from bluetooth_sig.gatt.uuid_registry import UuidRegistry
+from bluetooth_sig.registry.utils import find_bluetooth_sig_path
 from bluetooth_sig.types.gatt_services import ServiceDiscoveryData
 from bluetooth_sig.types.uuid import BluetoothUUID
-from tests.conftest import ROOT_DIR
 
 
 @pytest.fixture(scope="session")
@@ -191,7 +191,8 @@ def test_invalid_uuid_lookup(mock_uuid_registry: UuidRegistry) -> None:
 @pytest.mark.packaging
 def test_yaml_file_presence() -> None:
     """Test that required YAML files exist."""
-    base_path = ROOT_DIR / "bluetooth_sig" / "assigned_numbers" / "uuids"
+    base_path = find_bluetooth_sig_path()
+    assert base_path is not None, "Cannot locate bluetooth_sig data path (submodule or installed package)"
 
     assert (base_path / "service_uuids.yaml").exists(), "Service UUIDs YAML file missing"
     assert (base_path / "characteristic_uuids.yaml").exists(), "Characteristic UUIDs YAML file missing"
@@ -200,7 +201,8 @@ def test_yaml_file_presence() -> None:
 @pytest.fixture(scope="session")
 def yaml_data() -> dict[str, Any]:
     """Load YAML data once per session for performance."""
-    base_path = ROOT_DIR / "bluetooth_sig" / "assigned_numbers" / "uuids"
+    base_path = find_bluetooth_sig_path()
+    assert base_path is not None, "Cannot locate bluetooth_sig data path"
 
     # Load service data
     service_file = base_path / "service_uuids.yaml"