Show More
@@ -233,6 +233,7 b' def make_exclude():' | |||||
233 | # We do this unconditionally, so that the test suite doesn't import |
|
233 | # We do this unconditionally, so that the test suite doesn't import | |
234 | # gtk, changing the default encoding and masking some unicode bugs. |
|
234 | # gtk, changing the default encoding and masking some unicode bugs. | |
235 | exclusions.append(ipjoin('lib', 'inputhookgtk')) |
|
235 | exclusions.append(ipjoin('lib', 'inputhookgtk')) | |
|
236 | exclusions.append(ipjoin('zmq', 'gui', 'gtkembed')) | |||
236 |
|
237 | |||
237 | # These have to be skipped on win32 because the use echo, rm, cd, etc. |
|
238 | # These have to be skipped on win32 because the use echo, rm, cd, etc. | |
238 | # See ticket https://github.com/ipython/ipython/issues/87 |
|
239 | # See ticket https://github.com/ipython/ipython/issues/87 | |
@@ -263,7 +264,9 b' def make_exclude():' | |||||
263 |
|
264 | |||
264 | if not have['matplotlib']: |
|
265 | if not have['matplotlib']: | |
265 | exclusions.extend([ipjoin('core', 'pylabtools'), |
|
266 | exclusions.extend([ipjoin('core', 'pylabtools'), | |
266 |
ipjoin('core', 'tests', 'test_pylabtools') |
|
267 | ipjoin('core', 'tests', 'test_pylabtools'), | |
|
268 | ipjoin('zmq', 'pylab'), | |||
|
269 | ]) | |||
267 |
|
270 | |||
268 | if not have['tornado']: |
|
271 | if not have['tornado']: | |
269 | exclusions.append(ipjoin('frontend', 'html')) |
|
272 | exclusions.append(ipjoin('frontend', 'html')) | |
@@ -385,6 +388,7 b' def make_runners():' | |||||
385 | 'scripts', 'testing', 'utils', 'nbformat' ] |
|
388 | 'scripts', 'testing', 'utils', 'nbformat' ] | |
386 |
|
389 | |||
387 | if have['zmq']: |
|
390 | if have['zmq']: | |
|
391 | nose_pkg_names.append('zmq') | |||
388 | nose_pkg_names.append('parallel') |
|
392 | nose_pkg_names.append('parallel') | |
389 |
|
393 | |||
390 | # For debugging this code, only load quick stuff |
|
394 | # For debugging this code, only load quick stuff |
General Comments 0
You need to be logged in to leave comments.
Login now