mirror of
https://github.com/jupyterhub/jupyterhub.git
synced 2025-10-11 03:52:59 +00:00
move static files to share/jupyter/hub
avoids conflict with other jupyter projects
This commit is contained in:
2
.bowerrc
2
.bowerrc
@@ -1,3 +1,3 @@
|
||||
{
|
||||
"directory": "share/jupyter/static/components"
|
||||
"directory": "share/jupyter/hub/static/components"
|
||||
}
|
6
.gitignore
vendored
6
.gitignore
vendored
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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)
|
||||
|
@@ -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,
|
||||
|
2
setup.py
2
setup.py
@@ -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')
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Reference in New Issue
Block a user