From 46d1db146e4488b1e9fda11417d97be4b86f2ca2 Mon Sep 17 00:00:00 2001 From: Henry Pinkard <7969470+henrypinkard@users.noreply.github.com> Date: Fri, 29 Sep 2023 07:43:22 -0700 Subject: [PATCH] update expected versions --- java/src/main/java/org/micromanager/internal/zmq/ZMQServer.java | 2 +- pycromanager/_version.py | 2 +- pycromanager/zmq_bridge/bridge.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/src/main/java/org/micromanager/internal/zmq/ZMQServer.java b/java/src/main/java/org/micromanager/internal/zmq/ZMQServer.java index 42866f42..bb766e17 100644 --- a/java/src/main/java/org/micromanager/internal/zmq/ZMQServer.java +++ b/java/src/main/java/org/micromanager/internal/zmq/ZMQServer.java @@ -37,7 +37,7 @@ public class ZMQServer extends ZMQSocketWrapper { //map of objects that exist in some client of the server protected final ConcurrentHashMap externalObjects_ = new ConcurrentHashMap(); - public static final String VERSION = "5.0.0"; + public static final String VERSION = "5.1.0"; private static Function classMapper_; private static ZMQServer mainServer_; diff --git a/pycromanager/_version.py b/pycromanager/_version.py index fc883cc8..e0584853 100644 --- a/pycromanager/_version.py +++ b/pycromanager/_version.py @@ -1,2 +1,2 @@ -version_info = (0, 29, 5) +version_info = (0, 29, 6) __version__ = ".".join(map(str, version_info)) diff --git a/pycromanager/zmq_bridge/bridge.py b/pycromanager/zmq_bridge/bridge.py index ecb835d7..229d2116 100644 --- a/pycromanager/zmq_bridge/bridge.py +++ b/pycromanager/zmq_bridge/bridge.py @@ -223,7 +223,7 @@ class _Bridge: DEFAULT_PORT = 4827 DEFAULT_TIMEOUT = 500 - _EXPECTED_ZMQ_SERVER_VERSION = "5.0.0" + _EXPECTED_ZMQ_SERVER_VERSION = "5.1.0" _bridge_creation_lock = threading.Lock() _cached_bridges_by_port_and_thread = {}