From d75e1eccd0de3a2d3983dea7325b582d17a7f7bb Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Thu, 15 Feb 2024 18:24:20 +0000 Subject: [PATCH] Automated version bump and other updates --- docs/source/wrapyfi.standalone.rst | 16 ---------------- examples/sensors/cam_mic.py | 27 ++++++++++++++++----------- pyproject.toml | 4 +++- wrapyfi/listeners/zeromq.py | 8 +++++--- wrapyfi/publishers/zeromq.py | 16 ++++++++++------ wrapyfi/servers/zeromq.py | 8 +++++--- 6 files changed, 39 insertions(+), 40 deletions(-) diff --git a/docs/source/wrapyfi.standalone.rst b/docs/source/wrapyfi.standalone.rst index 3a30fb1..0c135ef 100644 --- a/docs/source/wrapyfi.standalone.rst +++ b/docs/source/wrapyfi.standalone.rst @@ -4,22 +4,6 @@ wrapyfi.standalone package Submodules ---------- -wrapyfi.standalone.mqtt\_publisher module ------------------------------------------ - -.. automodule:: wrapyfi.standalone.mqtt_publisher - :members: - :undoc-members: - :show-inheritance: - -wrapyfi.standalone.mqtt\_subscriber module ------------------------------------------- - -.. automodule:: wrapyfi.standalone.mqtt_subscriber - :members: - :undoc-members: - :show-inheritance: - wrapyfi.standalone.zeromq\_param\_server module ----------------------------------------------- diff --git a/examples/sensors/cam_mic.py b/examples/sensors/cam_mic.py index 644509c..79bffef 100755 --- a/examples/sensors/cam_mic.py +++ b/examples/sensors/cam_mic.py @@ -175,7 +175,11 @@ def capture_cam_mic(self): pass elif self.enable_video: while True: - self.collect_cam(mware=self.mware, img_width=self.img_width, img_height=self.img_height) + self.collect_cam( + mware=self.mware, + img_width=self.img_width, + img_height=self.img_height, + ) def _mic_callback(self, audio, frames, time, status): """ @@ -291,16 +295,17 @@ def main(args): print(sd.query_devices()) return - cam_mic = CamMic(stream=args.stream, - mic_source=args.mic_source, - mic_rate=args.mic_rate, - mic_chunk=args.mic_chunk, - mic_channels=args.mic_channels, - img_source=args.img_source, - img_width=args.img_width, - img_height=args.img_height, - mware=args.mware, - ) + cam_mic = CamMic( + stream=args.stream, + mic_source=args.mic_source, + mic_rate=args.mic_rate, + mic_chunk=args.mic_chunk, + mic_channels=args.mic_channels, + img_source=args.img_source, + img_width=args.img_width, + img_height=args.img_height, + mware=args.mware, + ) if args.mode == "publish": cam_mic.activate_communication(CamMic.collect_cam, mode="publish") diff --git a/pyproject.toml b/pyproject.toml index c98e75a..d4db4e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "wrapyfi" -version = "0.4.40" +version = "0.4.41" description = "Wrapyfi is a wrapper for simplifying Middleware communication" readme = "README.md" authors = [ @@ -31,6 +31,8 @@ classifiers = [ "Topic :: Scientific/Engineering :: Artificial Intelligence", "Topic :: Scientific/Engineering :: Human Machine Interfaces", "Topic :: System :: Distributed Computing", + "Operating System :: Microsoft :: Windows :: Windows 10", + "Operating System :: Microsoft :: Windows :: Windows 11", ] [project.urls] diff --git a/wrapyfi/listeners/zeromq.py b/wrapyfi/listeners/zeromq.py index ac6448a..7b85d5f 100755 --- a/wrapyfi/listeners/zeromq.py +++ b/wrapyfi/listeners/zeromq.py @@ -26,9 +26,11 @@ if os.name == "nt" and ZEROMQ_PUBSUB_MONITOR_LISTENER_SPAWN == "process": ZEROMQ_PUBSUB_MONITOR_LISTENER_SPAWN = "thread" - logging.warning("[ZeroMQ] Wrapyfi does not support multiprocessing on Windows. Please set " - "the environment variable WRAPYFI_ZEROMQ_PUBSUB_MONITOR_LISTENER_SPAWN='thread'. " - "Switching automatically to 'thread' mode. ") + logging.warning( + "[ZeroMQ] Wrapyfi does not support multiprocessing on Windows. Please set " + "the environment variable WRAPYFI_ZEROMQ_PUBSUB_MONITOR_LISTENER_SPAWN='thread'. " + "Switching automatically to 'thread' mode. " + ) class ZeroMQListener(Listener): diff --git a/wrapyfi/publishers/zeromq.py b/wrapyfi/publishers/zeromq.py index 2585391..ad55286 100644 --- a/wrapyfi/publishers/zeromq.py +++ b/wrapyfi/publishers/zeromq.py @@ -37,15 +37,19 @@ if os.name == "nt" and PROXY_BROKER_SPAWN == "process" and START_PROXY_BROKER: PROXY_BROKER_SPAWN = "thread" - logging.warning("[ZeroMQ] Wrapyfi does not support multiprocessing on Windows. Please set " - "the environment variable WRAPYFI_ZEROMQ_PROXY_BROKER_SPAWN='thread'. " - "Switching automatically to 'thread' mode. ") + logging.warning( + "[ZeroMQ] Wrapyfi does not support multiprocessing on Windows. Please set " + "the environment variable WRAPYFI_ZEROMQ_PROXY_BROKER_SPAWN='thread'. " + "Switching automatically to 'thread' mode. " + ) if os.name == "nt" and ZEROMQ_PUBSUB_MONITOR_LISTENER_SPAWN == "process": ZEROMQ_PUBSUB_MONITOR_LISTENER_SPAWN = "thread" - logging.warning("[ZeroMQ] Wrapyfi does not support multiprocessing on Windows. Please set " - "the environment variable WRAPYFI_ZEROMQ_PUBSUB_MONITOR_LISTENER_SPAWN='thread'. " - "Switching automatically to 'thread' mode. ") + logging.warning( + "[ZeroMQ] Wrapyfi does not support multiprocessing on Windows. Please set " + "the environment variable WRAPYFI_ZEROMQ_PUBSUB_MONITOR_LISTENER_SPAWN='thread'. " + "Switching automatically to 'thread' mode. " + ) class ZeroMQPublisher(Publisher): diff --git a/wrapyfi/servers/zeromq.py b/wrapyfi/servers/zeromq.py index 9a218ad..86aa964 100644 --- a/wrapyfi/servers/zeromq.py +++ b/wrapyfi/servers/zeromq.py @@ -25,9 +25,11 @@ if os.name == "nt" and PROXY_BROKER_SPAWN == "process" and START_PROXY_BROKER: PROXY_BROKER_SPAWN = "thread" - logging.warning("[ZeroMQ] Wrapyfi does not support multiprocessing on Windows. Please set " - "the environment variable WRAPYFI_ZEROMQ_PROXY_BROKER_SPAWN='thread'. " - "Switching automatically to 'thread' mode. ") + logging.warning( + "[ZeroMQ] Wrapyfi does not support multiprocessing on Windows. Please set " + "the environment variable WRAPYFI_ZEROMQ_PROXY_BROKER_SPAWN='thread'. " + "Switching automatically to 'thread' mode. " + ) class ZeroMQServer(Server):