Merge branch 'main' into bump-version

ddkohler · web-flow · commit 6365b1886eb8 · 2025-12-20T00:54:45.000-08:00
diff --git a/.github/workflows/python-pytest.yml b/.github/workflows/python-pytest.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
 
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,4 @@ coverage.xml
 # vim
 *.sw?
 
+/.vscode
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,14 +2,14 @@ ci:
   autoupdate_schedule: 'monthly'
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v6.0.0
     hooks:
     -   id: trailing-whitespace
     -   id: no-commit-to-branch
         args: [-b, main]
 
-  - repo: https://github.com/psf/black
-    rev: 23.10.1
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.11.0
     hooks:
       - id: black
         name: black
@@ -18,7 +18,7 @@ repos:
         types: [python]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.6.1
+    rev: v1.19.0
     hooks:
       - id: mypy
         exclude: ^tests/.*
diff --git a/yaqc/yaqc/__init__.py b/yaqc/yaqc/__init__.py
@@ -1,6 +1,5 @@
 """Generic yaq client."""
 
-
 from .__version__ import *
 from ._client import *
 from . import _avro_numpy
diff --git a/yaqc/yaqc/__version__.py b/yaqc/yaqc/__version__.py
@@ -1,6 +1,5 @@
 """Define version."""
 
-
 import pathlib
 import subprocess
 
diff --git a/yaqc/yaqc/_properties.py b/yaqc/yaqc/_properties.py
@@ -1,6 +1,5 @@
 """Class representing single property, see YEP-111."""
 
-
 Getter = object()
 
 
diff --git a/yaqd-core/CHANGELOG.md b/yaqd-core/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 ## [2025.11.0]
 
 ### Fixed
+- removed asyncio syntax that was removed in python 3.14
 - type hints for IsSensor attributes are appropriate for _n_-dimensional data
 
 ## [2023.11.0]
diff --git a/yaqd-core/README.md b/yaqd-core/README.md
@@ -8,4 +8,4 @@
 
 Core python package for implementing yaq daemons, and associated utilities.
 
-Documentation at https://yaqd-core-python.yaq.fyi
+Homepage at https://yaq.fyi
diff --git a/yaqd-core/pyproject.toml b/yaqd-core/pyproject.toml
@@ -28,7 +28,6 @@ classifiers = [
 
 [project.urls]
 "Home Page" = "https://yaq.fyi"
-Documentation = "http://yaq-core-python.yaq.fyi/"
 Source = "https://github.com/yaq-project/yaq-python"
 Issues = "https://github.com/yaq-project/yaq-python/issues"
 
diff --git a/yaqd-core/yaqd_core/__version__.py b/yaqd-core/yaqd_core/__version__.py
@@ -1,6 +1,5 @@
 """Define version."""
 
-
 import pathlib
 import subprocess
 
diff --git a/yaqd-core/yaqd_core/_has_mapping.py b/yaqd-core/yaqd_core/_has_mapping.py
@@ -14,9 +14,9 @@ def __init__(
         self, name: str, config: Dict[str, Any], config_filepath: pathlib.Path
     ):
         super().__init__(name, config, config_filepath)
-        self.__mappings: Dict[
-            str, Any
-        ] = dict()  # don't interact directly, use property
+        self.__mappings: Dict[str, Any] = (
+            dict()
+        )  # don't interact directly, use property
         self._mapping_id: int = 0
         self._channel_mappings: Dict[str, List[str]] = dict()
         self._mapping_units: Dict[str, str] = dict()
diff --git a/yaqd-core/yaqd_core/_has_turret.py b/yaqd-core/yaqd_core/_has_turret.py
@@ -12,8 +12,7 @@ def set_turret(self, identifier: str):
         self._busy = True
 
     @abstractmethod
-    def get_turret_options(self):
-        ...
+    def get_turret_options(self): ...
 
     def get_turret(self):
         return self._state["turret"]
diff --git a/yaqd-core/yaqd_core/_is_daemon.py b/yaqd-core/yaqd_core/_is_daemon.py
@@ -123,17 +123,7 @@ def _traits(cls) -> List[str]:
 
     @classmethod
     def main(cls):
-        """Run the event loop."""
-        loop = asyncio.get_event_loop()
-        if sys.platform.startswith("win"):
-            signals = ()
-        else:
-            signals = (signal.SIGHUP, signal.SIGTERM, signal.SIGINT)
-        for s in signals:
-            loop.add_signal_handler(
-                s, lambda s=s: asyncio.create_task(cls.shutdown_all(s, loop))
-            )
-
+        """parse arguments and start the event loop"""
         parser = argparse.ArgumentParser()
         parser.add_argument(
             "--config",
@@ -199,19 +189,26 @@ def main(cls):
         with open(config_filepath, "rb") as f:
             config_file = tomli.load(f)
 
-        loop.create_task(cls._main(config_filepath, config_file, args))
+        # Run the event loop
         try:
-            loop.run_forever()
+            asyncio.run(cls._main(config_filepath, config_file, args))
         except asyncio.CancelledError:
             pass
-        finally:
-            loop.close()
 
     @classmethod
     async def _main(cls, config_filepath, config_file, args=None):
-        """Parse command line arguments, start event loop tasks."""
+        """Parse command line arguments, run event loop."""
         loop = asyncio.get_running_loop()
-        cls.__servers = []
+        if sys.platform.startswith("win"):
+            signals = ()
+        else:
+            signals = (signal.SIGHUP, signal.SIGTERM, signal.SIGINT)
+        for s in signals:
+            loop.add_signal_handler(
+                s, lambda s=s: asyncio.create_task(cls.shutdown_all(s, loop))
+            )
+
+        cls.__servers = set()
         for section in config_file:
             if section == "shared-settings":
                 continue
@@ -225,7 +222,7 @@ async def _main(cls, config_filepath, config_file, args=None):
 
         while cls.__servers:
             awaiting = cls.__servers
-            cls.__servers = []
+            cls.__servers = set()
             await asyncio.wait(awaiting)
             await asyncio.sleep(1)
         loop.stop()
@@ -252,7 +249,9 @@ def server(daemon):
             server(daemon), config.get("host", ""), config.get("port", None)
         )
         daemon._server = ser
-        cls.__servers.append(asyncio.create_task(ser.serve_forever()))
+        task = asyncio.create_task(ser.serve_forever())
+        cls.__servers.add(task)
+        task.add_done_callback(cls.__servers.discard)
 
     @classmethod
     def _parse_config(cls, config_file, section, args=None):
@@ -297,16 +296,7 @@ async def shutdown_all(cls, sig, loop):
         # This is done after cancelling so that shutdown tasks which require the loop
         # are not themselves cancelled.
         [d.close() for d in cls._daemons]
-        tasks = [
-            t
-            for t in asyncio.all_tasks()
-            if (
-                t is not asyncio.current_task()
-                and "serve_forever" not in t.get_coro().__repr__()
-            )
-        ]
-        for task in tasks:
-            logger.info(task.get_coro())
+        tasks = [t for t in asyncio.all_tasks() if t is not asyncio.current_task()]
         await asyncio.gather(*tasks, return_exceptions=True)
         [d._save_state() for d in cls._daemons]
         if hasattr(signal, "SIGHUP") and sig == signal.SIGHUP:
diff --git a/yaqd-core/yaqd_core/_protocol.py b/yaqd-core/yaqd_core/_protocol.py
@@ -28,7 +28,7 @@ def connection_made(self, transport):
         self.transport = transport
         self.unpacker = avrorpc.Unpacker(self._avro_protocol)
         self._daemon._connection_made(peername)
-        self.task = asyncio.get_event_loop().create_task(self.process_requests())
+        self.task = asyncio.get_running_loop().create_task(self.process_requests())
 
     def data_received(self, data):
         """Process an incomming request."""
diff --git a/yaqd-fakes/yaqd_fakes/__init__.py b/yaqd-fakes/yaqd_fakes/__init__.py
@@ -1,3 +1,3 @@
-""" fake yaq daemons, for testing purposes
-"""
+"""fake yaq daemons, for testing purposes"""
+
 from .__version__ import *
diff --git a/yaqd-fakes/yaqd_fakes/__version__.py b/yaqd-fakes/yaqd_fakes/__version__.py
@@ -1,6 +1,5 @@
 """Define version."""
 
-
 import pathlib
 import subprocess
 
diff --git a/yaqd-fakes/yaqd_fakes/_fake_sensor.py b/yaqd-fakes/yaqd_fakes/_fake_sensor.py
@@ -28,7 +28,7 @@ def __init__(self, name, config, config_filepath):
                 self._channel_generators[name] = random_walk(min_, max_)
             else:
                 raise Exception(f"channel kind {kwargs['kind']} not recognized")
-        asyncio.get_event_loop().create_task(self._update_measurements())
+        asyncio.get_running_loop().create_task(self._update_measurements())
 
     async def _update_measurements(self):
         while True:
diff --git a/yaqd-fakes/yaqd_fakes/_signal_generators.py b/yaqd-fakes/yaqd_fakes/_signal_generators.py
@@ -1,6 +1,5 @@
 """Generators for fake sensor signal generation."""
 
-
 import random
 
 

Original file line number	Diff line number	Diff line change
`@@ -52,3 +52,4 @@ coverage.xml`
`52`	`52`	`# vim`
`53`	`53`	`*.sw?`
`54`	`54`
	`55`	`+/.vscode`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`"""Class representing single property, see YEP-111."""`
`2`	`2`
`3`		`-`
`4`	`3`	`Getter = object()`
`5`	`4`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@`
`8`	`8`
`9`	`9`	`Core python package for implementing yaq daemons, and associated utilities.`
`10`	`10`
`11`		`-Documentation at https://yaqd-core-python.yaq.fyi`
	`11`	`+Homepage at https://yaq.fyi`