##// END OF EJS Templates
remove strict requirement for less,invoke in wheel/sdist...
Min RK -
Show More
@@ -216,7 +216,7 b" setup_args['cmdclass'] = {"
216 'build_py': css_js_prerelease(
216 'build_py': css_js_prerelease(
217 check_package_data_first(git_prebuild('IPython')),
217 check_package_data_first(git_prebuild('IPython')),
218 strict=False),
218 strict=False),
219 'sdist' : css_js_prerelease(git_prebuild('IPython', sdist)),
219 'sdist' : css_js_prerelease(git_prebuild('IPython', sdist), strict=False),
220 'upload_wininst' : UploadWindowsInstallers,
220 'upload_wininst' : UploadWindowsInstallers,
221 'submodule' : UpdateSubmodules,
221 'submodule' : UpdateSubmodules,
222 'css' : CompileCSS,
222 'css' : CompileCSS,
@@ -284,7 +284,7 b" if 'setuptools' in sys.modules:"
284 # setup.py develop should check for submodules
284 # setup.py develop should check for submodules
285 from setuptools.command.develop import develop
285 from setuptools.command.develop import develop
286 setup_args['cmdclass']['develop'] = require_submodules(develop)
286 setup_args['cmdclass']['develop'] = require_submodules(develop)
287 setup_args['cmdclass']['bdist_wheel'] = css_js_prerelease(get_bdist_wheel())
287 setup_args['cmdclass']['bdist_wheel'] = css_js_prerelease(get_bdist_wheel(), strict=False)
288
288
289 setuptools_extra_args['zip_safe'] = False
289 setuptools_extra_args['zip_safe'] = False
290 setuptools_extra_args['entry_points'] = {'console_scripts':find_entry_points()}
290 setuptools_extra_args['entry_points'] = {'console_scripts':find_entry_points()}
@@ -22,9 +22,11 b' if not os.path.exists(ipbackupdir):'
22 cd(ipdir)
22 cd(ipdir)
23
23
24 # Load release info
24 # Load release info
25 execfile(pjoin('IPython','core','release.py'))
25 execfile(pjoin('IPython','core','release.py'), globals())
26 # ensure js version is in sync
26 # ensure js version is in sync
27 sh('./setup.py jsversion')
27 sh('./setup.py jsversion')
28 # build minified css and sourcemaps
29 sh('./setup.py css -x -f')
28
30
29 # Build site addresses for file uploads
31 # Build site addresses for file uploads
30 release_site = '%s/release/%s' % (archive, version)
32 release_site = '%s/release/%s' % (archive, version)
@@ -59,3 +59,10 b' def compile_tree():'
59 msg = '*** ERROR: Some Python files in tree do NOT compile! ***\n'
59 msg = '*** ERROR: Some Python files in tree do NOT compile! ***\n'
60 msg += 'See messages above for the actual file that produced it.\n'
60 msg += 'See messages above for the actual file that produced it.\n'
61 raise SystemExit(msg)
61 raise SystemExit(msg)
62
63 try:
64 execfile
65 except NameError:
66 def execfile(fname, globs, locs=None):
67 locs = locs or globs
68 exec(compile(open(fname).read(), fname, "exec"), globs, locs)
General Comments 0
You need to be logged in to leave comments. Login now