Fixes for SR2024 image

.github/workflows/pypi.yml

@@ -28,6 +28,6 @@ jobs:
       - name: Install dependencies
         run: poetry install
       - name: Build and publish to pypi
-        uses: JRubics/poetry-publish@v1.6
+        uses: JRubics/poetry-publish@v1.17
         with:
           pypi_token: ${{ secrets.PYPI_TOKEN }}

.github/workflows/tests.yml

@@ -3,7 +3,6 @@ name: Tests
 on:
   push:
     branches:
-      - "*"
   pull_request:
 
 jobs:
@@ -12,11 +11,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python: [3.8, 3.9, "3.10"]
+        python: [3.8, 3.9, "3.10", "3.11"]
+      fail-fast: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
       - name: Install APT dependencies
@@ -25,7 +25,7 @@ jobs:
         run: pip install poetry
       - name: Use in-project virtualenv
         run: poetry config virtualenvs.in-project true
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: .venv/
           key: ${{ runner.os }}-${{ matrix.python }}-pip-${{ hashFiles('poetry.lock') }}-${{ hashFiles('pyproject.toml') }}
@@ -38,4 +38,5 @@ jobs:
       - name: Unit tests
         run: make test-cov
       - name: Build Docs
+        if: matrix.python != '3.11'
         run: make docs

astoria/__init__.py

@@ -4,4 +4,4 @@
     "__version__",
 ]
 
-__version__ = "0.11.1"
+__version__ = "0.11.3"

astoria/astprocd/usercode_lifecycle.py

@@ -2,8 +2,9 @@
 
 import asyncio
 import logging
+import sys
 from datetime import datetime, timedelta
-from os import environ
+from os import environ, fsync
 from signal import SIGKILL, SIGTERM
 from string import Template
 from typing import IO, Callable, Dict, Optional
@@ -110,7 +111,7 @@ async def run_process(self) -> None:
                 )
                 self._process_end_event.clear()
                 self._process = await asyncio.create_subprocess_exec(
-                    "python3",
+                    sys.executable,
                     "-u",
                     self._entrypoint,
                     stdin=asyncio.subprocess.DEVNULL,
@@ -207,6 +208,7 @@ def log(
         ) -> None:
             fh.write(data)
             fh.flush()
+            fsync(fh.fileno())
             self._log_helper.send(
                 pid=pid,
                 priority=log_line_idx,

astoria/astwifid.py

@@ -210,7 +210,7 @@ def generate_hostapd_config(self) -> None:
             "bridge": self._bridge,
             "ssid": self._ssid,
             "country_code": self._region,
-            "channel": 7,
+            "channel": 6,
             "hw_mode": "g",
             # Bit field: bit0 = WPA, bit1 = WPA2
             "wpa": 2,

astoria/common/metadata.py

@@ -61,7 +61,10 @@ def get_os_version_info(cls) -> Dict[str, str]:
         """
         system = platform.system()
         if system == "Linux":
-            return cls.get_os_release_info()
+            if Path('/etc/srobo-release').exists():
+                return cls.get_os_release_info(Path('/etc/srobo-release'))
+            else:
+                return cls.get_os_release_info()
         elif system == "Darwin":
             return cls.get_macos_release_info()
         return {}

astoria/common/mqtt/broadcast_helper.py

@@ -51,7 +51,7 @@ async def _handle_broadcast(
         except JSONDecodeError:
             LOGGER.warning(f"Broadcast event {self._name} contained invalid JSON")
 
-    def send(self, **kwargs: Any) -> None:  # type: ignore
+    def send(self, **kwargs: Any) -> None:
         """Send an event."""
         data = self._schema(
             event_name=self._schema.name,

astoria/common/mqtt/wrapper.py

@@ -12,6 +12,7 @@
     Match,
     Optional,
     TypeVar,
+    Union,
 )
 from uuid import UUID
 
@@ -25,7 +26,7 @@
 
 LOGGER = logging.getLogger(__name__)
 
-Handler = Callable[[Match[str], str], Coroutine[Any, Any, None]]  # type: ignore
+Handler = Callable[[Match[str], str], Coroutine[Any, Any, None]]
 RequestT = TypeVar("RequestT", bound=ManagerRequest)
 
 
@@ -230,12 +231,14 @@ async def wait_dependencies(self) -> None:
         if len(self._dependencies) > 0:
             LOGGER.debug("Waiting for " + ", ".join(self._dependencies))
 
-            tasks = [asyncio.gather(
-                *(event.wait() for event in self._dependency_events.values()),
-            )]
+            tasks: List[Union[asyncio.Future[Any], asyncio.Task[Any]]] = [
+                asyncio.gather(
+                    *(event.wait() for event in self._dependency_events.values()),
+                ),
+            ]
 
             if self._no_dependency_event is not None:
-                tasks.append(self._no_dependency_event.wait())  # type: ignore
+                tasks.append(asyncio.create_task(self._no_dependency_event.wait()))
 
             await asyncio.wait(
                 tasks,

mypy.ini

@@ -10,7 +10,6 @@ no_implicit_optional = True
 disallow_any_unimported = True
 # disallow_any_expr = True
 #disallow_any_decorated = True
-disallow_any_explicit = True
 disallow_subclassing_any = True
 disallow_any_generics = True
 
@@ -20,9 +19,3 @@ disallow_incomplete_defs = True
 disallow_untyped_decorators = True
 
 check_untyped_defs = True
-
-[mypy-dbus_next.*]
-disallow_any_explicit = False
-
-[mypy-gmqtt.*]
-disallow_any_explicit = False