move static files to share/jupyter/hub

avoids conflict with other jupyter projects
This commit is contained in:
Min RK
2014-12-22 15:08:18 -08:00
parent 6d95bf1893
commit d125abbffe
27 changed files with 9 additions and 9 deletions

View File

@@ -1,3 +1,3 @@
{
"directory": "share/jupyter/static/components"
"directory": "share/jupyter/hub/static/components"
}

6
.gitignore vendored
View File

@@ -9,8 +9,8 @@ dist
/jupyterhub_config.py
jupyterhub_cookie_secret
jupyterhub.sqlite
share/jupyter/static/components
share/jupyter/static/css/style.min.css
share/jupyter/static/css/style.min.css.map
share/jupyter/hub/static/components
share/jupyter/hub/static/css/style.min.css
share/jupyter/hub/static/css/style.min.css.map
*.egg-info
MANIFEST

View File

@@ -7,7 +7,7 @@ include *requirements.txt
graft jupyterhub
graft scripts
graft share
prune share/jupyter/static/components
prune share/jupyter/hub/static/components
# Documentation
graft docs

View File

@@ -1,7 +1,7 @@
"""Get the data files for this package."""
def get_data_files():
"""Walk up until we find share/jupyter"""
"""Walk up until we find share/jupyter/hub"""
import sys
from os.path import join, abspath, dirname, exists, split
path = abspath(dirname(__file__))
@@ -11,7 +11,7 @@ def get_data_files():
for path in starting_points:
# walk up, looking for prefix/share/jupyter
while path != '/':
share_jupyter = join(path, 'share', 'jupyter')
share_jupyter = join(path, 'share', 'jupyter', 'hub')
if exists(join(share_jupyter, 'static', 'components')):
return share_jupyter
path, _ = split(path)

View File

@@ -133,7 +133,7 @@ class JupyterHub(Application):
)
data_files_path = Unicode(DATA_FILES_PATH, config=True,
help="The location of jupyter data files (e.g. /usr/local/share/jupyter)"
help="The location of jupyterhub data files (e.g. /usr/local/share/jupyter/hub)"
)
ssl_key = Unicode('', config=True,

View File

@@ -36,7 +36,7 @@ from subprocess import check_call
pjoin = os.path.join
here = os.path.abspath(os.path.dirname(__file__))
share_jupyter = pjoin(here, 'share', 'jupyter')
share_jupyter = pjoin(here, 'share', 'jupyter', 'hub')
static = pjoin(share_jupyter, 'static')
#---------------------------------------------------------------------------

View File

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB