Browse Source

assume data_files will not work in editable mode yet

Steven Silvester 4 years ago
parent
commit
f69f4ce90c

+ 0 - 0
jupyter-notebook-config/jupyterlab.json → jupyter-config/jupyter_notebook_config.d/jupyterlab.json


+ 0 - 0
jupyter-server-config/jupyterlab.json → jupyter-config/jupyter_server_config.d/jupyterlab.json


+ 2 - 0
scripts/ci_install.sh

@@ -23,12 +23,14 @@ pip install jupyter_packaging
 pip install -e ".[test]" || pip install -v -e ".[test]"
 jlpm versions
 jlpm config current
+jupyter server extension enable jupyterlab 
 jupyter server extension list 1>serverextensions 2>&1
 cat serverextensions
 cat serverextensions | grep -i "jupyterlab.*enabled"
 cat serverextensions | grep -i "jupyterlab.*OK"
 
 # TODO: remove when we no longer support classic notebook
+jupyter serverextension enable jupyterlab
 jupyter serverextension list 1>serverextensions 2>&1
 cat serverextensions
 cat serverextensions | grep -i "jupyterlab.*enabled"

+ 12 - 2
scripts/ci_script.sh

@@ -13,8 +13,6 @@ fi
 
 if [[ $GROUP == python ]]; then
     # Run the python tests
-#    py.test -v --junitxml=junit.xml
-#    Move the flags to setup.cfg
     py.test
 fi
 
@@ -279,6 +277,18 @@ if [[ $GROUP == usage ]]; then
     # Make sure we can non-dev install.
     virtualenv -p $(which python3) test_install
     ./test_install/bin/pip install -q ".[test]"  # this populates <sys_prefix>/share/jupyter/lab
+
+    ./test_install/bin/jupyter server extension list 1>serverextensions 2>&1
+    cat serverextensions
+    cat serverextensions | grep -i "jupyterlab.*enabled"
+    cat serverextensions | grep -i "jupyterlab.*OK"
+
+    # TODO: remove when we no longer support classic notebook
+    ./test_install/bin/jupyter serverextension list 1>serverextensions 2>&1
+    cat serverextensions
+    cat serverextensions | grep -i "jupyterlab.*enabled"
+    cat serverextensions | grep -i "jupyterlab.*OK"
+
     ./test_install/bin/python -m jupyterlab.browser_check
     # Make sure we can run the build
     ./test_install/bin/jupyter lab build

+ 2 - 2
setup.py

@@ -34,9 +34,9 @@ data_files_spec = [
     ('share/jupyter/lab/schemas', '%s/schemas' % NAME, '**'),
     ('share/jupyter/lab/themes', '%s/themes' % NAME, '**'),
     ('etc/jupyter/jupyter_server_config.d',
-     'jupyter-server-config', 'jupyterlab.json'),
+     'jupyter-config/jupyter_server_config.d', 'jupyterlab.json'),
     ('etc/jupyter/jupyter_notebook_config.d',
-     'jupyter-notebook-config', 'jupyterlab.json'),
+     'jupyter-config/jupyter_notebook_config.d', 'jupyterlab.json'),
 ]
 
 package_data_spec = dict()