Skip to content

Commit

Permalink
zeroconf 0.20 is not compatible with python2
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@20193 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Aug 25, 2018
1 parent 0fc4d9a commit ea18d77
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/win32/MINGW_SETUP.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@ $PACMAN --noconfirm -S ${XPKG}cython
#build pynacl against the system library:
export SODIUM_INSTALL=system
easy_install-2.7 -U -Z enum34 enum-compat
for x in rencode xxhash zeroconf lz4 websocket-client netifaces comtypes PyOpenGL PyOpenGL_accelerate websockify nvidia-ml-py setproctitle pyu2f python-ldap ldap3 bcrypt pynacl paramiko; do
for x in rencode xxhash lz4 websocket-client netifaces comtypes PyOpenGL PyOpenGL_accelerate websockify nvidia-ml-py setproctitle pyu2f python-ldap ldap3 bcrypt pynacl paramiko; do
easy_install-2.7 -U -Z $x
easy_install-3.7 -U -Z $x
done
easy_install-2.7 -U -Z zeroconf==0.19.1

#cx_Freeze gets very confused about sqlite DLL location
#don't fight it and just symlink it where it will be found:
Expand Down
4 changes: 3 additions & 1 deletion src/win32/UPDATE_PYTHON_LIBS.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
#using easy-install for python libraries which are not packaged by mingw:
# currently disabled, build from patched source only: websockify
export SODIUM_INSTALL=system
for x in rencode xxhash zeroconf lz4 websocket-client netifaces comtypes PyOpenGL PyOpenGL_accelerate websockify nvidia-ml-py setproctitle pyu2f python-ldap ldap3 bcrypt pynacl paramiko; do
for x in rencode xxhash lz4 websocket-client netifaces comtypes PyOpenGL PyOpenGL_accelerate websockify nvidia-ml-py setproctitle pyu2f python-ldap ldap3 bcrypt pynacl paramiko; do
easy_install-2.7 -U -Z $x
easy_install-3.7 -U -Z $x
done
#locked at 0.19.1 for python2:
easy_install-3.7 -U -Z zeroconf

0 comments on commit ea18d77

Please sign in to comment.