Skip to content

Commit 0ab75c1

Browse files
hotfix pyzmq installation on bullseye (pin version <26) (#2345)
* fix: pin pyzmq version to <26 * fix: add checks for installed ZMQ version and DRAFT_API * Bump version to hotfix v3.5.3
1 parent 5138bb5 commit 0ab75c1

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

installation/routines/setup_jukebox_core.sh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ _jukebox_core_build_and_install_pyzmq() {
8686
fi
8787

8888
ZMQ_PREFIX="${JUKEBOX_ZMQ_PREFIX}" ZMQ_DRAFT_API=1 \
89-
pip install -v --no-binary pyzmq pyzmq
89+
pip install -v --no-binary pyzmq 'pyzmq<26'
9090
else
9191
print_lc " Skipping. pyzmq already installed"
9292
fi
@@ -120,6 +120,20 @@ _jukebox_core_check() {
120120
local pip_modules=$(get_args_from_file "${INSTALLATION_PATH}/requirements.txt")
121121
verify_pip_modules pyzmq $pip_modules
122122

123+
log " Verify ZMQ version '${JUKEBOX_ZMQ_VERSION}'"
124+
local zmq_version=$(python -c 'import zmq; print(f"{zmq.zmq_version()}")')
125+
if [[ "${zmq_version}" != "${JUKEBOX_ZMQ_VERSION}" ]]; then
126+
exit_on_error "ERROR: ZMQ version '${zmq_version}' differs from expected '${JUKEBOX_ZMQ_VERSION}'!"
127+
fi
128+
log " CHECK"
129+
130+
log " Verify ZMQ has 'DRAFT-API' activated"
131+
local zmq_hasDraftApi=$(python -c 'import zmq; print(f"{zmq.DRAFT_API}")')
132+
if [[ "${zmq_hasDraftApi}" != "True" ]]; then
133+
exit_on_error "ERROR: ZMQ has 'DRAFT-API' '${zmq_hasDraftApi}' differs from expected 'True'!"
134+
fi
135+
log " CHECK"
136+
123137
verify_files_chmod_chown 644 "${CURRENT_USER}" "${CURRENT_USER_GROUP}" "${JUKEBOX_PULSE_CONFIG}"
124138

125139
verify_files_chmod_chown 644 "${CURRENT_USER}" "${CURRENT_USER_GROUP}" "${SETTINGS_PATH}/jukebox.yaml"

src/jukebox/jukebox/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
VERSION_MAJOR = 3
33
VERSION_MINOR = 5
4-
VERSION_PATCH = 2
4+
VERSION_PATCH = 3
55
VERSION_EXTRA = ""
66

77
# build a version string in compliance with the SemVer specification

0 commit comments

Comments
 (0)