Merge branch '0.29.x'

c64c55aa · Stefan Behnel · 6ffb9989 · 313eae09 · c64c55aa · c64c55aa
Commit c64c55aa authored Feb 19, 2019 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

.travis.yml .travis.yml +1 -1

test-requirements-cpython.txt test-requirements-cpython.txt +2 -2

No files found.
--- 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


--- a/test-requirements-cpython.txt
+++ b/test-requirements-cpython.txt
 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