diff --git a/CMakeLists.txt b/CMakeLists.txt index 95283e159..42bee0428 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,7 +82,6 @@ endif() if (PYZMQ_LIBZMQ_VERSION AND NOT PYZMQ_LIBZMQ_URL) set(PYZMQ_LIBZMQ_URL "https://github.com/zeromq/libzmq/releases/download/v${PYZMQ_LIBZMQ_VERSION}/zeromq-${PYZMQ_LIBZMQ_VERSION}.tar.gz") endif() -set(PYZMQ_LIBZMQ_URL "https://github.com/minrk/libzmq/archive/ipc-can-fail.tar.gz") #------- bundle libzmq ------ diff --git a/pyproject.toml b/pyproject.toml index 5bbc5cc91..58a073624 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -188,8 +188,10 @@ repair-wheel-command = """\ "cmake.define.CMAKE_SHARED_LINKER_FLAGS" = "ucrt.lib;vcruntime.lib;/nodefaultlib:libucrt.lib;/nodefaultlib:libvcruntime.lib" # disable IPC/epoll on Windows # due to https://github.com/zeromq/pyzmq/issues/1981 -"cmake.define.ZMQ_HAVE_IPC" = "OFF" -"cmake.define.POLLER" = "select" +# "cmake.define.ZMQ_HAVE_IPC" = "OFF" +# "cmake.define.POLLER" = "select" +"cmake.define.PYZMQ_LIBZMQ_URL" = "https://github.com/minrk/libzmq/archive/ipc-can-fail.tar.gz" + # mac-arm target is 10.15 [[tool.cibuildwheel.overrides]] diff --git a/tools/test_wheel.py b/tools/test_wheel.py index ba41657cb..9baa267d5 100644 --- a/tools/test_wheel.py +++ b/tools/test_wheel.py @@ -20,12 +20,12 @@ def test_has(feature): import zmq - if feature == 'ipc' and sys.platform.startswith('win32'): - # IPC support is broken in enough cases on Windows - # that we can't ship wheels with it (for now) - assert not zmq.has(feature) - else: - assert zmq.has(feature) + # if feature == 'ipc' and sys.platform.startswith('win32'): + # # IPC support is broken in enough cases on Windows + # # that we can't ship wheels with it (for now) + # assert not zmq.has(feature) + # else: + assert zmq.has(feature) def test_simple_socket():