From 4195f07dc3aad3738cc51d3fb911297c4d3de7f2 Mon Sep 17 00:00:00 2001 From: Scott Draves Date: Thu, 17 Aug 2017 16:25:35 -0400 Subject: [PATCH] bump version to 0.2.2, fix #5861 --- beakerx/beakerx/_version.py | 2 +- beakerx/beakerx/install.py | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/beakerx/beakerx/_version.py b/beakerx/beakerx/_version.py index 37cc9a00f3..7bbd8e95ce 100644 --- a/beakerx/beakerx/_version.py +++ b/beakerx/beakerx/_version.py @@ -1,2 +1,2 @@ -version_info = (0, 2, 0, 'dev') +version_info = (0, 2, 2, 'dev') __version__ = '.'.join(map(str, version_info)) diff --git a/beakerx/beakerx/install.py b/beakerx/beakerx/install.py index a403043b5c..24ba1a1f6d 100644 --- a/beakerx/beakerx/install.py +++ b/beakerx/beakerx/install.py @@ -43,18 +43,19 @@ def _install_nbextension(): subprocess.check_call(["jupyter", "nbextension", "enable", "beakerx", "--py", "--sys-prefix"]) -def _copy_tree(src, dest): - if os.path.exists(dest): - shutil.rmtree(dest) - shutil.copytree(src, dest) +def _copy_tree(src, dst): + if os.path.exists(dst): + shutil.rmtree(dst) + shutil.copytree(src, dst) -def _install_css(prefix): +def _install_css(): log.info("installing custom CSS...") - src_base = pkg_resources.resource_filename('beakerx', os.path.join('static', 'custom')) - dest_base = os.path.join(prefix, 'lib', 'python3.5', 'site-packages', 'notebook', 'static', 'custom') - _copy_tree(os.path.join(src_base, 'fonts'), os.path.join(dest_base, 'fonts')) - shutil.copyfile(os.path.join(src_base, 'custom.css'), os.path.join(dest_base, 'custom.css')) + resource = os.path.join('static', 'custom') + src_base = pkg_resources.resource_filename('beakerx', resource) + dst_base = pkg_resources.resource_filename('notebook', resource) + _copy_tree(os.path.join(src_base, 'fonts'), os.path.join(dst_base, 'fonts')) + shutil.copyfile(os.path.join(src_base, 'custom.css'), os.path.join(dst_base, 'custom.css')) def _install_kernels(): @@ -128,7 +129,7 @@ def install(): args = parser.parse_args() _install_nbextension() _install_kernels() - _install_css(args.prefix) + _install_css() _install_kernelspec_manager(args.prefix) except KeyboardInterrupt: return 130