Merge branch 'master' into example

Author: echarles

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Jupyter Server Tests
 on:
   push:
     branches: 
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [ '3.6', '3.7', '3.8' ]
+        python-version: [ '3.5', '3.6', '3.7', '3.8' ]
     steps:
     - name: Checkout
       uses: actions/checkout@v1
@@ -24,6 +24,10 @@ jobs:
     - name: Install the Python dependencies
       run: |
         pip install -e .[test]
+    - name: ipykernel fix on windows 3.8
+      if: matrix.os == 'windows-latest' && matrix.python-version == '3.8'
+      run: |
+        pip install --upgrade git+https://github.com/ipython/ipykernel.git
     - name: Run the tests
       run: |
-        nosetests -v jupyter_server
+        pytest

.travis.yml

@@ -37,7 +37,7 @@ script:
       else
           true
       fi
-    - 'if [[ $GROUP == python ]]; then nosetests -v jupyter_server; fi'
+    - 'if [[ $GROUP == python ]]; then pytest; fi'
     - |
       if [[ $GROUP == docs ]]; then
         EXIT_STATUS=0
@@ -52,12 +52,16 @@ script:
 
 matrix:
     include:
+        - python: 3.5
+          env: GROUP=python
         - python: 3.6
           env: GROUP=python
         - python: 3.7
           env: GROUP=python
         - python: 3.8
           env: GROUP=python
+        - python: 3.5
+          env: GROUP=docs
         - python: 3.6
           env: GROUP=docs
         - python: 3.7

README.md

@@ -1,7 +1,7 @@
 # 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/jupyter_server.svg?branch=master)](https://travis-ci.org/jupyter/jupyter_server)
+[![Build Status](https://github.com/jupyter/jupyter_server/workflows/CI/badge.svg)](https://github.com/jupyter/jupyter_server/actions)
 [![Documentation Status](https://readthedocs.org/projects/jupyter-server/badge/?version=latest)](http://jupyter-server.readthedocs.io/en/latest/?badge=latest)
 
 The Jupyter Server provides the backend for Jupyter web applications such as

appveyor.yml

@@ -4,12 +4,19 @@ matrix:
 
 environment:
   matrix:
+    - CONDA_PY: 35
+      CONDA_PY_SPEC: 3.5
+      CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
     - CONDA_PY: 36
+      CONDA_PY_SPEC: 3.6
       CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
     - CONDA_PY: 37
-      CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
+      CONDA_PY_SPEC: 3.7
+      CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
     - CONDA_PY: 38
-      CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
+      CONDA_PY_SPEC: 3.8
+      # appveyor doesn't come with this directory, so use 37's since we're creating an env anyway
+      CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
 
 platform:
   - x64
@@ -18,11 +25,17 @@ build: off
 
 install:
   - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
+  - cmd: set CONDA_PY=%CONDA_PY%
+  - cmd: set CONDA_PY_SPEC=%CONDA_PY_SPEC%
   - 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 nose
+  - cmd: conda update --yes --quiet conda
+  - cmd: conda info -a
+  - cmd: conda create -y -q -n test-env-%CONDA_PY% python=%CONDA_PY_SPEC% pyzmq tornado jupyter_client nbformat nbconvert ipykernel pip nose
+  - cmd: conda activate test-env-%CONDA_PY%
   - cmd: pip install .[test]
+# FIXME: Use patch for python 3.8, windows issues (https://github.com/ipython/ipykernel/pull/456) - remove once released
+  - IF %CONDA_PY% == 38 pip install --upgrade git+https://github.com/ipython/ipykernel.git
 
 test_script:
-  - nosetests  -v jupyter_server --exclude-dir jupyter_server\tests\selenium
+  - pytest

docs/source/changelog.rst

@@ -21,9 +21,19 @@ We strongly recommend that you upgrade to version 9+ of pip before upgrading ``j
     Use ``pip install pip --upgrade`` to upgrade pip. Check pip version with
     ``pip --version``.
 
+.. _release-0.0.2:
+
+0.0.2
+-----
+
+- Introduce new extension module
+- Pytest for unit tests
+- Server documentation
+- NbClassic for migration from notebook
+
 .. _release-0.0.1:
 
 0.0.1
 -----
 
-First release of the Jupyter Server.
+- First release of the Jupyter Server.

docs/source/frontends.rst

@@ -131,3 +131,9 @@ To make your frontend executable from anywhere on your system, added this method
             ]
         }
     )
+
+Examples
+--------
+
+You can check some simple example on the `GitHub jupyter_server repository
+<https://github.com/jupyter/jupyter_server/tree/master/jupyter_server/example/simple>`_.

docs/source/index.rst

@@ -32,7 +32,8 @@ To install the latest release of ``jupyter_server``, use *pip*:
    :caption: Configuration
 
    config_overview
-   config.rst
+   config
+   migrate_from_notebook
    public_server
    security
    extending/index.rst

docs/source/migrate_from_notebook.rst

@@ -0,0 +1,26 @@
+.. _migrate_from_notebook:
+
+Migrate from Notebook
+=====================
+
+To migrate from notebook server to plain jupyter server, follow these steps:
+
+- Rename your ``jupyter_notebook_config.py`` file to ``jupyter_server_config.py``.
+- Rename all ``c.NotebookApp`` traits to ``c.ServerApp``.
+
+For example if you have the following ``jupyter_notebook_config.py``.
+
+.. code-block:: python
+
+    c.NotebookApp.allow_credentials = False
+    c.NotebookApp.port = 8889
+    c.NotebookApp.password_required = True
+
+
+You will have to create the following ``jupyter_server_config.py`` file.
+
+.. code-block:: python
+
+    c.ServerApp.allow_credentials = False
+    c.ServerApp.port = 8889
+    c.ServerApp.password_required = True