Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update expected versions #703

Merged
merged 2 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
2 changes: 1 addition & 1 deletion pycromanager/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version_info = (0, 29, 5)
version_info = (0, 29, 6)
__version__ = ".".join(map(str, version_info))
2 changes: 1 addition & 1 deletion pycromanager/zmq_bridge/bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand Down