Merge pull request #14 from SylvainCorlay/stripout

Stripout Jupyter notebook frontend code

Author: SylvainCorlay

.bowerrc

@@ -16,37 +16,15 @@ env:
   global:
     - PATH=$TRAVIS_BUILD_DIR/pandoc:$PATH
   matrix:
-    - GROUP=js/notebook
     - GROUP=python
-    - GROUP=js/base
-    - GROUP=js/services
 
 before_install:
     - pip install --upgrade pip
     - pip install --upgrade setuptools wheel nose coverage codecov
-    - nvm install 6.9.2
-    - nvm use 6.9.2
-    - node --version
-    - npm --version
-    - npm upgrade -g npm
-    - npm install
-    - |
-      if [[ $GROUP == js* ]]; then
-        npm install -g [email protected] [email protected]
-      fi
     - |
       if [[ $GROUP == docs ]]; then
         pip install -r docs/doc-requirements.txt
       fi
-    - |
-      if [[ $GROUP == selenium ]]; then
-        pip install selenium
-        # Install Webdriver backend for Firefox:
-        wget https://github.com/mozilla/geckodriver/releases/download/v0.19.1/geckodriver-v0.19.1-linux64.tar.gz
-        mkdir geckodriver
-        tar -xzf geckodriver-v0.19.1-linux64.tar.gz -C geckodriver
-        export PATH=$PATH:$PWD/geckodriver
-      fi
 
 install:
     - pip install --pre .[test]
@@ -56,7 +34,7 @@ install:
 script:
     - jupyter kernelspec list
     - |
-      symlinks=$(find . -type l| grep -v './node_modules/' | grep -v './git-hooks')
+      symlinks=$(find . -type l| grep -v './git-hooks')
       if [[ $(echo $symlinks) ]]; then
           echo "Repository contains symlinks which won't work on windows:"
           echo $symlinks
@@ -65,9 +43,7 @@ script:
       else
           true
       fi
-    - 'if [[ $GROUP == js* ]]; then travis_retry python -m notebook.jstest ${GROUP:3}; fi'
-    - 'if [[ $GROUP == python ]]; then nosetests -v --exclude-dir notebook/tests/selenium --with-coverage --cover-package=notebook notebook; fi'
-    - 'if [[ $GROUP == selenium ]]; then py.test -sv notebook/tests/selenium; fi'
+    - 'if [[ $GROUP == python ]]; then nosetests -v --with-coverage --cover-package=jupyter_server jupyter_server; fi'
     - |
       if [[ $GROUP == docs ]]; then
         EXIT_STATUS=0
@@ -84,14 +60,6 @@ script:
 
 matrix:
     include:
-        - python: 3.6
-          env:
-          - GROUP=selenium
-          - JUPYTER_TEST_BROWSER=firefox
-          - MOZ_HEADLESS=1
-          addons:
-            firefox: 57.0
-
         - python: 3.4
           env: GROUP=python
         - python: 3.5

.travis.yml

@@ -1,11 +1,11 @@
-Contributing to the Jupyter Notebook
-====================================
+Contributing to the Jupyter Server
+==================================
 
 If you're reading this section, you're probably interested in contributing to
 Jupyter.  Welcome and thanks for your interest in contributing!
 
 Please take a look at the Contributor documentation, familiarize yourself with
-using the Jupyter Notebook, and introduce yourself on the mailing list and
+using the Jupyter Server, and introduce yourself on the mailing list and
 share what area of the project you are interested in working on.
 
 General Guidelines
@@ -16,114 +16,43 @@ For general documentation about contributing to Jupyter projects, see the
 
 __ https://jupyter.readthedocs.io/en/latest/contributor/content-contributor.html
 
-
 Setting Up a Development Environment
 ------------------------------------
 
-Installing Node.js and npm
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Building the Notebook from its GitHub source code requires some tools to
-create and minify JavaScript components and the CSS,
-specifically Node.js and Node's package manager, ``npm``.
-It should be node version ≥ 6.0.
-
-If you use ``conda``, you can get them with::
-
-    conda install -c conda-forge nodejs
-
-If you use `Homebrew <https://brew.sh/>`_ on Mac OS X::
-
-    brew install node
-
-Installation on Linux may vary, but be aware that the `nodejs` or `npm` packages
-included in the system package repository may be too old to work properly.
-
-You can also use the installer from the `Node.js website <https://nodejs.org>`_.
-
-
-Installing the Jupyter Notebook
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Installing the Jupyter Server
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Once you have installed the dependencies mentioned above, use the following
 steps::
 
     pip install --upgrade setuptools pip
-    git clone https://github.com/jupyter/notebook
-    cd notebook
+    git clone https://github.com/jupyter/jupyter_server
+    cd jupyter_server
     pip install -e .
 
-If you are using a system-wide Python installation and you only want to install the notebook for you,
+If you are using a system-wide Python installation and you only want to install the server for you,
 you can add ``--user`` to the install commands.
 
-Once you have done this, you can launch the master branch of Jupyter notebook
+Once you have done this, you can launch the master branch of Jupyter server
 from any directory in your system with::
 
-    jupyter notebook
-
-Verification
-^^^^^^^^^^^^
-
-While running the notebook, select one of your notebook files (the file will have the extension ``.ipynb``).
-In the top tab you will click on "Help" and then click on "About". In the pop window you will see information about the version of Jupyter that you are running. You will see "The version of the notebook server is:".
-If you are working in development mode, you will see that your version of Jupyter notebook will include the word "dev".
-
-.. image:: ./docs/source/_static/images/jupyter-verification.png
-   :width: 40pt
-
-If it does not include the word "dev", you are currently not working in development mode and should follow the steps below to uninstall and reinstall Jupyter.
+    jupyter server
 
 Troubleshooting the Installation
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-If you do not see that your Jupyter Notebook is not running on dev mode, it's possible that you are
-running other instances of Jupyter Notebook. You can try the following steps:
+If you do not see that your Jupyter Server is not running on dev mode, it's possible that you are
+running other instances of Jupyter Server. You can try the following steps:
 
-1. Uninstall all instances of the notebook package. These include any installations you made using
+1. Uninstall all instances of the jupyter_server package. These include any installations you made using
    pip or conda
-2. Run ``python3 -m pip install -e .`` in the notebook repository to install the notebook from there
+2. Run ``python3 -m pip install -e .`` in the jupyter_server repository to install the jupyter_server from there
 3. Run ``npm run build`` to make sure the Javascript and CSS are updated and compiled
-4. Launch with ``python3 -m notebook --port 8989``, and check that the browser is pointing to ``localhost:8989``
+4. Launch with ``python3 -m jupyter_server --port 8989``, and check that the browser is pointing to ``localhost:8989``
    (rather than the default 8888). You don't necessarily have to launch with port 8989, as long as you use
    a port that is neither the default nor in use, then it should be fine.
 5. Verify the installation with the steps in the previous section.
 
-
-Rebuilding JavaScript and CSS
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-There is a build step for the JavaScript and CSS in the notebook.
-To make sure that you are working with up-to-date code, you will need to run
-this command whenever there are changes to JavaScript or LESS sources::
-
-    npm run build
-
-**IMPORTANT:** Don't forget to run ``npm run build`` after switching branches. 
-When switching between branches of different versions (e.g. ``4.x`` and 
-``master``), run ``pip install -e .``. If you have tried the above and still 
-find that the notebook is not reflecting the current source code, try cleaning
-the repo with ``git clean -xfd`` and reinstalling with ``pip install -e .``.
-
-Development Tip
-"""""""""""""""
-
-When doing development, you can use this command to automatically rebuild 
-JavaScript and LESS sources as they are modified::
-
-    npm run build:watch
-
-Git Hooks
-"""""""""
-
-If you want to automatically update dependencies and recompile JavaScript and
-CSS after checking out a new commit, you can install post-checkout and 
-post-merge hooks which will do it for you::
-
-    git-hooks/install-hooks.sh
-
-See ``git-hooks/README.md`` for more details.
-
-
 Running Tests
 -------------
 
@@ -140,42 +69,19 @@ To run the Python tests, use::
 
 If you want coverage statistics as well, you can run::
 
-    nosetests --with-coverage --cover-package=notebook notebook
-
-JavaScript Tests
-^^^^^^^^^^^^^^^^
-
-To run the JavaScript tests, you will need to have PhantomJS and CasperJS
-installed::
-
-    npm install -g casperjs phantomjs-prebuilt
-
-Then, to run the JavaScript tests::
-
-    python -m notebook.jstest [group]
-
-where ``[group]`` is an optional argument that is a path relative to
-``notebook/tests/``.
-For example, to run all tests in ``notebook/tests/notebook``::
-
-    python -m notebook.jstest notebook
-
-or to run just ``notebook/tests/notebook/deletecell.js``::
-
-    python -m notebook.jstest notebook/deletecell.js
-
+    nosetests --with-coverage --cover-package=jupyter_server jupyter_server
 
 Building the Documentation
 --------------------------
 
 To build the documentation you'll need `Sphinx <http://www.sphinx-doc.org/>`_,
 `pandoc <http://pandoc.org/>`_ and a few other packages.
 
-To install (and activate) a `conda environment`_ named ``notebook_docs``
+To install (and activate) a `conda environment`_ named ``server_docs``
 containing all the necessary packages (except pandoc), use::
 
     conda env create -f docs/environment.yml
-    source activate notebook_docs  # Linux and OS X
+    source activate server_docs  # Linux and OS X
     activate notebook_docs         # Windows
 
 .. _conda environment:

CONTRIBUTING.rst

@@ -1,9 +1,6 @@
 include COPYING.md
 include CONTRIBUTING.rst
 include README.md
-include package.json
-include bower.json
-include .bowerrc
 include setupbase.py
 include Dockerfile
 graft tools

MANIFEST.in

@@ -1,51 +1,35 @@
-# Jupyter Notebook
+# Jupyter Server
 
 [![Google Group](https://img.shields.io/badge/-Google%20Group-lightgrey.svg)](https://groups.google.com/forum/#!forum/jupyter)
-[![Build Status](https://travis-ci.org/jupyter/notebook.svg?branch=master)](https://travis-ci.org/jupyter/notebook)
-[![Documentation Status](https://readthedocs.org/projects/jupyter-notebook/badge/?version=latest)](http://jupyter-notebook.readthedocs.io/en/latest/?badge=latest)
-                
+[![Build Status](https://travis-ci.org/jupyter/jupyter-server.svg?branch=master)](https://travis-ci.org/jupyter/jupyter-server)
+[![Documentation Status](https://readthedocs.org/projects/jupyter-server/badge/?version=latest)](http://jupyter-server.readthedocs.io/en/latest/?badge=latest)
 
-
-The Jupyter notebook is a web-based notebook environment for interactive
-computing.
-
-![Jupyter notebook example](docs/resources/running_code_med.png "Jupyter notebook example")
-
-### Jupyter notebook, the language-agnostic evolution of IPython notebook
-Jupyter notebook is a language-agnostic HTML notebook application for
-Project Jupyter. In 2015, Jupyter notebook was released as a part of
-The Big Split™ of the IPython codebase. IPython 3 was the last major monolithic
-release containing both language-agnostic code, such as the *IPython notebook*,
-and language specific code, such as the *IPython kernel for Python*. As
-computing spans across many languages, Project Jupyter will continue to develop the
-language-agnostic **Jupyter notebook** in this repo and with the help of the
-community develop language specific kernels which are found in their own
-discrete repos.
-[[The Big Split™ announcement](https://blog.jupyter.org/the-big-split-9d7b88a031a7)]
-[[Jupyter Ascending blog post](https://blog.jupyter.org/jupyter-ascending-1bf5b362d97e)]
+The Jupyter Server provides the backend for Jupyter web applications such as
+the Jupyter notebook and JupyterLab.
 
 ## Installation
+
 You can find the installation documentation for the
 [Jupyter platform, on ReadTheDocs](https://jupyter.readthedocs.io/en/latest/install.html).
 The documentation for advanced usage of Jupyter notebook can be found
-[here](https://jupyter-notebook.readthedocs.io/en/latest/).
+[here](https://jupyter-server.readthedocs.io/en/latest/).
 
 For a local installation, make sure you have
 [pip installed](https://pip.readthedocs.io/en/stable/installing/) and run:
 
-    $ pip install notebook
+    $ pip install jupyter_server
 
-## Usage - Running Jupyter notebook
+## Usage - Running Jupyter Server
 
 ### Running in a local installation
 
 Launch with:
 
-    $ jupyter notebook
+    $ jupyter server
 
 ### Running in a remote installation
 
-You need some configuration before starting Jupyter notebook remotely. See [Running a notebook server](http://jupyter-notebook.readthedocs.io/en/stable/public_server.html).
+You need some configuration before starting Jupyter server remotely. See [Running a Jupyter server](http://jupyter-server.readthedocs.io/en/stable/public_server.html).
 
 ## Development Installation
 
@@ -58,8 +42,8 @@ If you are interested in contributing to the project, see [`CONTRIBUTING.rst`](C
 ## Resources
 - [Project Jupyter website](https://jupyter.org)
 - [Online Demo at try.jupyter.org](https://try.jupyter.org)
-- [Documentation for Jupyter notebook](https://jupyter-notebook.readthedocs.io/en/latest/) [[PDF](https://media.readthedocs.org/pdf/jupyter-notebook/latest/jupyter-notebook.pdf)]
+- [Documentation for Jupyter Server](https://jupyter-server.readthedocs.io/en/latest/) [[PDF](https://media.readthedocs.org/pdf/jupyter-server/latest/jupyter-server.pdf)]
 - [Korean Version of Installation](https://github.com/ChungJooHo/Jupyter_Kor_doc/)
 - [Documentation for Project Jupyter](https://jupyter.readthedocs.io/en/latest/index.html) [[PDF](https://media.readthedocs.org/pdf/jupyter/latest/jupyter.pdf)]
-- [Issues](https://github.com/jupyter/notebook/issues)
+- [Issues](https://github.com/jupyter/jupyter-server/issues)
 - [Technical support - Jupyter Google Group](https://groups.google.com/forum/#!forum/jupyter)

README.md

@@ -19,8 +19,8 @@ install:
   - cmd: conda config --set show_channel_urls true
   - cmd: conda config --add channels conda-forge
   #- cmd: conda update --yes --quiet conda
-  - cmd: conda install -y pyzmq tornado jupyter_client nbformat nbconvert ipykernel pip nodejs nose
+  - cmd: conda install -y pyzmq tornado jupyter_client nbformat nbconvert ipykernel pip nose
   - cmd: pip install .[test]
 
 test_script:
-  - nosetests  -v notebook --exclude-dir notebook\tests\selenium
+  - nosetests  -v jupyter_server --exclude-dir notebook\tests\selenium