Skip to content
Snippets Groups Projects
Commit e1dad5e3 authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'fix-release' into 'master'

Fix release issues

See merge request !1067
parents 4ba7d6ae 2ad35acc
No related branches found
No related tags found
1 merge request!1067Fix release issues
...@@ -51,3 +51,7 @@ infra/dev/nomad/tmp/* ...@@ -51,3 +51,7 @@ infra/dev/nomad/tmp/*
/docker/snmp-exporter/tmp/ /docker/snmp-exporter/tmp/
/docker/snmp-exporter/snmp.yml /docker/snmp-exporter/snmp.yml
/.vs /.vs
Lib/*
Scripts/*
pyvenv.cfg
...@@ -5,7 +5,9 @@ notebook-as-pdf ...@@ -5,7 +5,9 @@ notebook-as-pdf
PyPDF2==2.12.1 # until https://github.com/betatim/notebook-as-pdf/issues/40 hits a notebook-as-pdf release PyPDF2==2.12.1 # until https://github.com/betatim/notebook-as-pdf/issues/40 hits a notebook-as-pdf release
jupyterlab-git >= 0.50.0 # BSD-3 jupyterlab-git >= 0.50.0 # BSD-3
jupyter-collaboration >= 3.0.0 # 3-Clause BSD jupyter-collaboration >= 3.0.0 # 3-Clause BSD
jupyter_server_nbmodel[lab,rtc] # BSD-3
# disabled as it breaks on JupyterLab 4.3.5 (cells do not run)
#jupyter_server_nbmodel[lab,rtc] # BSD-3
# high-level access to station components. # high-level access to station components.
# NB: tangostationcontrol will also install lofar-station-client. The latter # NB: tangostationcontrol will also install lofar-station-client. The latter
......
...@@ -17,7 +17,7 @@ job "rpc-server" { ...@@ -17,7 +17,7 @@ job "rpc-server" {
} }
port "metrics" { port "metrics" {
static = "8000" to = "8000"
host_network = "station" host_network = "station"
} }
} }
......
...@@ -189,7 +189,7 @@ class Statistics(OPCUADevice): ...@@ -189,7 +189,7 @@ class Statistics(OPCUADevice):
# decode payload # decode payload
try: try:
message = json.loads(payload.decode()) message = json.loads(payload)
except (json.decoder.JSONDecodeError, UnicodeDecodeError): except (json.decoder.JSONDecodeError, UnicodeDecodeError):
logger.exception( logger.exception(
f"Could not decode message payload as JSON {topic=} {message=}" f"Could not decode message payload as JSON {topic=} {message=}"
......
...@@ -138,7 +138,7 @@ class MultiEndpointZMQMessageHandler: ...@@ -138,7 +138,7 @@ class MultiEndpointZMQMessageHandler:
# decode payload # decode payload
try: try:
message = json.loads(payload.decode()) message = json.loads(payload)
except (json.decoder.JSONDecodeError, UnicodeDecodeError): except (json.decoder.JSONDecodeError, UnicodeDecodeError):
logger.exception( logger.exception(
f"Could not decode message payload as JSON {uri=} {topic=} {payload=}" f"Could not decode message payload as JSON {uri=} {topic=} {payload=}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment