Skip to content

Commit

Permalink
Merge pull request #5307 from oliver-sanders/bump-dependencies
Browse files Browse the repository at this point in the history
deps: loosen pyzmq dependency
  • Loading branch information
MetRonnie authored Feb 14, 2023
2 parents 6a5befb + 3151d6e commit c817dd9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion conda-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- protobuf >=4.21.2,<4.22.0
- psutil >=5.6.0
- python
- pyzmq >=22,<23
- pyzmq >=22
- setuptools >=49, <67
- urwid >=2,<3
# Add # [py<3.11] for tomli once Python 3.11 Released
Expand Down
8 changes: 5 additions & 3 deletions cylc/flow/network/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,9 @@ async def async_request(
if msg['command'] in PB_METHOD_MAP:
response = {'data': res}
else:
response = decode_(res.decode())
response = decode_(
res.decode() if isinstance(res, bytes) else res
)
LOG.debug('zmq:recv %s', response)

try:
Expand All @@ -316,8 +318,8 @@ async def async_request(
{'message': f'Received invalid response: {response}'},
)
raise ClientError(
error.get('message'),
error.get('traceback'),
error.get('message'), # type: ignore
error.get('traceback'), # type: ignore
)

def get_header(self) -> dict:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ install_requires =
# Constrain protobuf version for compatible Scheduler-UIS comms across hosts
protobuf>=4.21.2,<4.22.0
psutil>=5.6.0
pyzmq==22.*
pyzmq>=22
# https://github.com/pypa/setuptools/issues/3802
setuptools>=49, <67
urwid==2.*
Expand Down

0 comments on commit c817dd9

Please sign in to comment.