Merge pull request #703 from henrypinkard/main

update expected versions
micro-manager · Sep 29, 2023 · 3a9547e · 3a9547e
2 parents 10b05eb + a77de41
commit 3a9547e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 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
@@ -37,7 +37,7 @@ public class ZMQServer extends ZMQSocketWrapper {
    //map of objects that exist in some client of the server
    protected final ConcurrentHashMap<String, Object> externalObjects_ = new ConcurrentHashMap<String, Object>();
 
-   public static final String VERSION = "5.0.0";
+   public static final String VERSION = "5.1.0";
 
    private static Function<Class, Object> classMapper_;
    private static ZMQServer mainServer_;

diff --git 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
@@ -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 = {}