##// END OF EJS Templates
Finish cleanup of setup.py and tests after dead code removal....
Fernando Perez -
Show More
@@ -104,7 +104,6 b" have['wx.aui'] = test_for('wx.aui')"
104 104 have['zope.interface'] = test_for('zope.interface')
105 105 have['twisted'] = test_for('twisted')
106 106 have['foolscap'] = test_for('foolscap')
107 have['objc'] = test_for('objc')
108 107 have['pexpect'] = test_for('pexpect')
109 108 have['gtk'] = test_for('gtk')
110 109 have['gobject'] = test_for('gobject')
@@ -154,7 +153,6 b' def make_exclude():'
154 153 ipjoin = lambda *paths: pjoin('IPython', *paths)
155 154
156 155 exclusions = [ipjoin('external'),
157 ipjoin('frontend', 'process', 'winprocess.py'),
158 156 # Deprecated old Shell and iplib modules, skip to avoid
159 157 # warnings
160 158 ipjoin('Shell'),
@@ -175,19 +173,11 b' def make_exclude():'
175 173 ]
176 174
177 175 if not have['wx']:
178 exclusions.append(ipjoin('gui'))
179 exclusions.append(ipjoin('frontend', 'wx'))
180 176 exclusions.append(ipjoin('lib', 'inputhookwx'))
181 177
182 178 if not have['gtk'] or not have['gobject']:
183 179 exclusions.append(ipjoin('lib', 'inputhookgtk'))
184 180
185 if not have['wx.aui']:
186 exclusions.append(ipjoin('gui', 'wx', 'wxIPython'))
187
188 if not have['objc']:
189 exclusions.append(ipjoin('frontend', 'cocoa'))
190
191 181 # These have to be skipped on win32 because the use echo, rm, cd, etc.
192 182 # See ticket https://bugs.launchpad.net/bugs/366982
193 183 if sys.platform == 'win32':
@@ -203,15 +193,7 b' def make_exclude():'
203 193 # how we are isolating dependencies in testing.
204 194 if not (have['twisted'] and have['zope.interface'] and have['foolscap']):
205 195 exclusions.extend(
206 [ipjoin('frontend', 'asyncfrontendbase'),
207 ipjoin('frontend', 'prefilterfrontend'),
208 ipjoin('frontend', 'frontendbase'),
209 ipjoin('frontend', 'linefrontendbase'),
210 ipjoin('frontend', 'tests', 'test_linefrontend'),
211 ipjoin('frontend', 'tests', 'test_frontendbase'),
212 ipjoin('frontend', 'tests', 'test_prefilterfrontend'),
213 ipjoin('frontend', 'tests', 'test_asyncfrontendbase'),
214 ipjoin('testing', 'parametric'),
196 [ipjoin('testing', 'parametric'),
215 197 ipjoin('testing', 'util'),
216 198 ipjoin('testing', 'tests', 'test_decorators_trial'),
217 199 ] )
@@ -317,9 +299,6 b' def make_runners():'
317 299 # The machinery in kernel needs twisted for real testing
318 300 trial_pkg_names = []
319 301
320 if have['wx']:
321 nose_pkg_names.append('gui')
322
323 302 # And add twisted ones if conditions are met
324 303 if have['zope.interface'] and have['twisted'] and have['foolscap']:
325 304 # We only list IPython.kernel for testing using twisted.trial as
@@ -108,17 +108,7 b' def find_packages():'
108 108 add_package(packages, 'deathrow', tests=True)
109 109 add_package(packages , 'extensions')
110 110 add_package(packages, 'external')
111 add_package(packages, 'frontend', tests=True)
112 # Don't include the cocoa frontend for now as it is not stable
113 if sys.platform == 'darwin' and False:
114 add_package(packages, 'frontend.cocoa', tests=True, others=['plugin'])
115 add_package(packages, 'frontend.cocoa.examples')
116 add_package(packages, 'frontend.cocoa.examples.IPython1Sandbox')
117 add_package(packages, 'frontend.cocoa.examples.IPython1Sandbox.English.lproj')
118 add_package(packages, 'frontend.process')
119 add_package(packages, 'frontend.wx')
120 add_package(packages, 'gui')
121 add_package(packages, 'gui.wx')
111 add_package(packages, 'frontend')
122 112 add_package(packages, 'kernel', config=False, tests=True, scripts=True)
123 113 add_package(packages, 'kernel.core', config=False, tests=True)
124 114 add_package(packages, 'lib', tests=True)
General Comments 0
You need to be logged in to leave comments. Login now