diff options
| author | Stefan Behnel <stefan_ml@behnel.de> | 2019-02-19 22:02:27 +0100 |
|---|---|---|
| committer | Stefan Behnel <stefan_ml@behnel.de> | 2019-02-19 22:02:27 +0100 |
| commit | c64c55aad6372748ffac74d09743e3937f2c36c6 (patch) | |
| tree | ebad6cc5ff3336183fb3668778d881a42fc39201 | |
| parent | 6ffb99898649fd516f0ef5f4a60a9f7dcb9bd9d8 (diff) | |
| parent | 313eae09d523a0cbeafa72cb8699179a1de4e3f4 (diff) | |
| download | cython-c64c55aad6372748ffac74d09743e3937f2c36c6.tar.gz | |
Merge branch '0.29.x'
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | test-requirements-cpython.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 21e82b2f9..6a1f90bd0 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 39e00d527..51061ff7d 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 |