Show More
@@ -214,9 +214,8 b' class UploadWindowsInstallers(upload):' | |||||
214 |
|
214 | |||
215 | setup_args['cmdclass'] = { |
|
215 | 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 | 'sdist' : css_js_prerelease(git_prebuild('IPython', sdist)), | |
219 | 'sdist' : css_js_prerelease(git_prebuild('IPython', sdist), strict=False), |
|
|||
220 | 'upload_wininst' : UploadWindowsInstallers, |
|
219 | 'upload_wininst' : UploadWindowsInstallers, | |
221 | 'submodule' : UpdateSubmodules, |
|
220 | 'submodule' : UpdateSubmodules, | |
222 | 'css' : CompileCSS, |
|
221 | 'css' : CompileCSS, | |
@@ -284,7 +283,7 b" if 'setuptools' in sys.modules:" | |||||
284 | # setup.py develop should check for submodules |
|
283 | # setup.py develop should check for submodules | |
285 | from setuptools.command.develop import develop |
|
284 | from setuptools.command.develop import develop | |
286 | setup_args['cmdclass']['develop'] = require_submodules(develop) |
|
285 | setup_args['cmdclass']['develop'] = require_submodules(develop) | |
287 |
setup_args['cmdclass']['bdist_wheel'] = css_js_prerelease(get_bdist_wheel() |
|
286 | setup_args['cmdclass']['bdist_wheel'] = css_js_prerelease(get_bdist_wheel()) | |
288 |
|
287 | |||
289 | setuptools_extra_args['zip_safe'] = False |
|
288 | setuptools_extra_args['zip_safe'] = False | |
290 | setuptools_extra_args['entry_points'] = {'console_scripts':find_entry_points()} |
|
289 | setuptools_extra_args['entry_points'] = {'console_scripts':find_entry_points()} |
@@ -746,7 +746,7 b' class JavascriptVersion(Command):' | |||||
746 | f.write(line) |
|
746 | f.write(line) | |
747 |
|
747 | |||
748 |
|
748 | |||
749 |
def css_js_prerelease(command |
|
749 | def css_js_prerelease(command): | |
750 | """decorator for building js/minified css prior to a release""" |
|
750 | """decorator for building js/minified css prior to a release""" | |
751 | class DecoratedCommand(command): |
|
751 | class DecoratedCommand(command): | |
752 | def run(self): |
|
752 | def run(self): | |
@@ -756,10 +756,7 b' def css_js_prerelease(command, strict=True):' | |||||
756 | try: |
|
756 | try: | |
757 | self.distribution.run_command('css') |
|
757 | self.distribution.run_command('css') | |
758 | except Exception as e: |
|
758 | except Exception as e: | |
759 | if strict: |
|
759 | log.warn("rebuilding css and sourcemaps failed (not a problem)") | |
760 |
|
|
760 | log.warn(str(e)) | |
761 | else: |
|
|||
762 | log.warn("rebuilding css and sourcemaps failed (not a problem)") |
|
|||
763 | log.warn(str(e)) |
|
|||
764 | command.run(self) |
|
761 | command.run(self) | |
765 | return DecoratedCommand |
|
762 | return DecoratedCommand |
General Comments 0
You need to be logged in to leave comments.
Login now