From 313eae09d523a0cbeafa72cb8699179a1de4e3f4 Mon Sep 17 00:00:00 2001
From: Stefan Behnel <stefan_ml@behnel.de>
Date: Tue, 19 Feb 2019 22:01:58 +0100
Subject: [PATCH] Revert "Try using the embedded libzmq in pyzmq instead of a
 system wide installation."

This reverts commit d49062fdf2eea3997816a70628e54353f5d57931.
---
 .travis.yml                   | 2 +-
 test-requirements-cpython.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aec8a17401d..a79db7d9574 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ addons:
       - gdb
       - python-dbg
       - python3-dbg
-      #- libzmq-dev  # previously needed by IPython/Tornado, now embedded in pyzmq
+      - libzmq-dev  # needed by IPython/Tornado
       #- gcc-8
       #- g++-8
 
diff --git a/test-requirements-cpython.txt b/test-requirements-cpython.txt
index 39e00d52702..51061ff7d41 100644
--- a/test-requirements-cpython.txt
+++ b/test-requirements-cpython.txt
@@ -1,4 +1,4 @@
 jupyter
 line_profiler
-# transitive dependency of jupyter (18.0.0 comes with a new libzmq)
-pyzmq>=18
+# transitive dependency of jupyter (18.0.0 is broken)
+pyzmq<18