From 67079bef3852ae493ebde56d90a4d05c27ef1a97 Mon Sep 17 00:00:00 2001 From: Dmitri Svetlov <123213937+dmitrisvetlov@users.noreply.github.com> Date: Tue, 9 Jul 2024 01:16:10 -0600 Subject: [PATCH] Apply fix and bump version and related info --- LICENSE | 4 +++- pycromanager/_version.py | 2 +- pycromanager/zmq_bridge/_bridge.py | 2 +- setup.py | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index 8d738b5..5155622 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,8 @@ BSD 3-Clause License -Copyright (c) 2020, Henry Pinkard +Copyright (c) 2020, Henry Pinkard and +Copyright (c) 2020, Munsky Group + All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/pycromanager/_version.py b/pycromanager/_version.py index 5cd4877..24d191e 100644 --- a/pycromanager/_version.py +++ b/pycromanager/_version.py @@ -1,2 +1,2 @@ -version_info = (0, 23, 0) +version_info = (0, 23, 1) __version__ = ".".join(map(str, version_info)) diff --git a/pycromanager/zmq_bridge/_bridge.py b/pycromanager/zmq_bridge/_bridge.py index 5e2990d..c839d69 100644 --- a/pycromanager/zmq_bridge/_bridge.py +++ b/pycromanager/zmq_bridge/_bridge.py @@ -865,7 +865,7 @@ def _camel_case_2_snake_case(name): } #Used for deserializing java arrarys into numpy arrays _JAVA_ARRAY_TYPE_NUMPY_DTYPE = { - "boolean[]": np.bool, + "boolean[]": bool, "byte[]": np.uint8, "short[]": np.int16, "char[]": np.uint16, diff --git a/setup.py b/setup.py index 56de593..06f7579 100644 --- a/setup.py +++ b/setup.py @@ -14,12 +14,12 @@ setuptools.setup( name="pycromanager", version=version, - author="Henry Pinkard", - author_email="henry.pinkard@gmail.com", + author="Munsky Group", + author_email="Dmitri.Svetlov@ColoState.edu", description="Open source microscope control using python", long_description=long_description, long_description_content_type="text/markdown", - url="https://github.com/micro-manager/pycro-manager", + url="https://github.com/MunskyGroup/pycro-manager-munsky", packages=setuptools.find_packages(), install_requires=[ "numpy",