Show More
@@ -228,7 +228,9 b' class UploadWindowsInstallers(upload):' | |||||
228 | self.upload_file('bdist_wininst', 'any', dist_file) |
|
228 | self.upload_file('bdist_wininst', 'any', dist_file) | |
229 |
|
229 | |||
230 | setup_args['cmdclass'] = { |
|
230 | setup_args['cmdclass'] = { | |
231 | 'build_py': check_package_data_first(git_prebuild('IPython')), |
|
231 | 'build_py': css_js_prerelease( | |
|
232 | check_package_data_first(git_prebuild('IPython')), | |||
|
233 | strict=False), | |||
232 | 'sdist' : css_js_prerelease(git_prebuild('IPython', sdist)), |
|
234 | 'sdist' : css_js_prerelease(git_prebuild('IPython', sdist)), | |
233 | 'upload_wininst' : UploadWindowsInstallers, |
|
235 | 'upload_wininst' : UploadWindowsInstallers, | |
234 | 'submodule' : UpdateSubmodules, |
|
236 | 'submodule' : UpdateSubmodules, |
@@ -18,6 +18,7 b' import errno' | |||||
18 | import os |
|
18 | import os | |
19 | import sys |
|
19 | import sys | |
20 |
|
20 | |||
|
21 | from distutils import log | |||
21 | from distutils.command.build_py import build_py |
|
22 | from distutils.command.build_py import build_py | |
22 | from distutils.command.build_scripts import build_scripts |
|
23 | from distutils.command.build_scripts import build_scripts | |
23 | from distutils.command.install import install |
|
24 | from distutils.command.install import install | |
@@ -705,13 +706,19 b' class JavascriptVersion(Command):' | |||||
705 | f.write(line) |
|
706 | f.write(line) | |
706 |
|
707 | |||
707 |
|
708 | |||
708 | def css_js_prerelease(command): |
|
709 | def css_js_prerelease(command, strict=True): | |
709 | """decorator for building js/minified css prior to a release""" |
|
710 | """decorator for building js/minified css prior to a release""" | |
710 | class DecoratedCommand(command): |
|
711 | class DecoratedCommand(command): | |
711 | def run(self): |
|
712 | def run(self): | |
712 | self.distribution.run_command('jsversion') |
|
713 | self.distribution.run_command('jsversion') | |
713 | css = self.distribution.get_command_obj('css') |
|
714 | css = self.distribution.get_command_obj('css') | |
714 | css.minify = True |
|
715 | css.minify = True | |
715 | self.distribution.run_command('css') |
|
716 | try: | |
|
717 | self.distribution.run_command('css') | |||
|
718 | except Exception as e: | |||
|
719 | if strict: | |||
|
720 | raise | |||
|
721 | else: | |||
|
722 | log.warn("Failed to build css sourcemaps: %s" % e) | |||
716 | command.run(self) |
|
723 | command.run(self) | |
717 | return DecoratedCommand |
|
724 | return DecoratedCommand |
General Comments 0
You need to be logged in to leave comments.
Login now