summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Behnel <stefan_ml@behnel.de>2019-02-19 21:23:33 +0100
committerStefan Behnel <stefan_ml@behnel.de>2019-02-19 21:23:33 +0100
commit4927e0e949e6b041f521958c3a875343aca30ac6 (patch)
tree3b00761fe044eee3c459f7f88405f0ab8132c6e4
parentf87e4bc2dee32d73574e814587c21992d734208d (diff)
downloadcython-4927e0e949e6b041f521958c3a875343aca30ac6.tar.gz
Try using the embedded libzmq in pyzmq instead of a system wide installation.
-rw-r--r--.travis.yml2
-rw-r--r--test-requirements-cpython.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 6a1f90bd0..21e82b2f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ addons:
- gdb
- python-dbg
- python3-dbg
- - libzmq-dev # needed by IPython/Tornado
+ #- libzmq-dev # previously needed by IPython/Tornado, now embedded in pyzmq
#- gcc-8
#- g++-8
diff --git a/test-requirements-cpython.txt b/test-requirements-cpython.txt
index 51061ff7d..39e00d527 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 is broken)
-pyzmq<18
+# transitive dependency of jupyter (18.0.0 comes with a new libzmq)
+pyzmq>=18