##// END OF EJS Templates
Merge pull request #748 from ellisonbg/tornado-iptest...
Brian E. Granger -
r4722:3651423d merge
parent child Browse files
Show More
@@ -111,6 +111,7 b" if os.name == 'nt':"
111 else:
111 else:
112 have['zmq'] = test_for('zmq', '2.1.4')
112 have['zmq'] = test_for('zmq', '2.1.4')
113 have['qt'] = test_for('IPython.external.qt')
113 have['qt'] = test_for('IPython.external.qt')
114 have['tornado'] = test_for('tornado')
114
115
115 #-----------------------------------------------------------------------------
116 #-----------------------------------------------------------------------------
116 # Functions and classes
117 # Functions and classes
@@ -205,6 +206,9 b' def make_exclude():'
205 exclusions.extend([ipjoin('lib', 'pylabtools'),
206 exclusions.extend([ipjoin('lib', 'pylabtools'),
206 ipjoin('lib', 'tests', 'test_pylabtools')])
207 ipjoin('lib', 'tests', 'test_pylabtools')])
207
208
209 if not have['tornado']:
210 exclusions.append(ipjoin('frontend', 'html'))
211
208 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
212 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
209 if sys.platform == 'win32':
213 if sys.platform == 'win32':
210 exclusions = [s.replace('\\','\\\\') for s in exclusions]
214 exclusions = [s.replace('\\','\\\\') for s in exclusions]
General Comments 0
You need to be logged in to leave comments. Login now