##// END OF EJS Templates
Ensure that no tests are attempted if numpy or rpy2 are not present....
Fernando Perez -
Show More
@@ -143,16 +143,17 b' have = {}'
143
143
144 have['curses'] = test_for('_curses')
144 have['curses'] = test_for('_curses')
145 have['matplotlib'] = test_for('matplotlib')
145 have['matplotlib'] = test_for('matplotlib')
146 have['numpy'] = test_for('numpy')
146 have['pexpect'] = test_for('IPython.external.pexpect')
147 have['pexpect'] = test_for('IPython.external.pexpect')
147 have['pymongo'] = test_for('pymongo')
148 have['pymongo'] = test_for('pymongo')
148 have['pygments'] = test_for('pygments')
149 have['pygments'] = test_for('pygments')
149 have['wx'] = test_for('wx')
150 have['wx.aui'] = test_for('wx.aui')
151 have['qt'] = test_for('IPython.external.qt')
150 have['qt'] = test_for('IPython.external.qt')
151 have['rpy2'] = test_for('rpy2')
152 have['sqlite3'] = test_for('sqlite3')
152 have['sqlite3'] = test_for('sqlite3')
153 have['cython'] = test_for('Cython')
153 have['cython'] = test_for('Cython')
154
155 have['tornado'] = test_for('tornado.version_info', (2,1,0), callback=None)
154 have['tornado'] = test_for('tornado.version_info', (2,1,0), callback=None)
155 have['wx'] = test_for('wx')
156 have['wx.aui'] = test_for('wx.aui')
156
157
157 if os.name == 'nt':
158 if os.name == 'nt':
158 min_zmq = (2,1,7)
159 min_zmq = (2,1,7)
@@ -275,6 +276,10 b' def make_exclude():'
275 if not have['tornado']:
276 if not have['tornado']:
276 exclusions.append(ipjoin('frontend', 'html'))
277 exclusions.append(ipjoin('frontend', 'html'))
277
278
279 if not have['rpy2'] or not have['numpy']:
280 exclusions.append(ipjoin('extensions', 'rmagic'))
281 exclusions.append(ipjoin('extensions', 'tests', 'test_rmagic'))
282
278 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
283 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
279 if sys.platform == 'win32':
284 if sys.platform == 'win32':
280 exclusions = [s.replace('\\','\\\\') for s in exclusions]
285 exclusions = [s.replace('\\','\\\\') for s in exclusions]
General Comments 0
You need to be logged in to leave comments. Login now