Merge branch '0.29.x'

PhillySchoolofAI · Feb 19, 2019 · c64c55a · c64c55a
2 parents 6ffb998 + 313eae0
commit c64c55a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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