Skip to content

Commit

Permalink
bump version to 0.2.2, fix #5861
Browse files Browse the repository at this point in the history
  • Loading branch information
scottdraves committed Aug 17, 2017
1 parent e721e91 commit 4195f07
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion beakerx/beakerx/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version_info = (0, 2, 0, 'dev')
version_info = (0, 2, 2, 'dev')
__version__ = '.'.join(map(str, version_info))
21 changes: 11 additions & 10 deletions beakerx/beakerx/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4195f07

Please sign in to comment.