release 1.2.2

Backport PR #3284 on branch 1.2.x (Changelog for 1.2.2)

.circleci/config.yml

@@ -0,0 +1,33 @@
+# Python CircleCI 2.0 configuration file
+# Updating CircleCI configuration from v1 to v2
+# Check https://circleci.com/docs/2.0/language-python/ for more details
+#
+version: 2
+jobs:
+  build:
+    machine: true
+    steps:
+      - checkout
+      - run:
+          name: build images
+          command: |
+            docker build -t jupyterhub/jupyterhub .
+            docker build -t jupyterhub/jupyterhub-onbuild onbuild
+            docker build -t jupyterhub/jupyterhub:alpine -f dockerfiles/Dockerfile.alpine .
+            docker build -t jupyterhub/singleuser singleuser
+      - run:
+          name: smoke test jupyterhub
+          command: |
+            docker run --rm -it jupyterhub/jupyterhub jupyterhub --help
+      - run:
+          name: verify static files
+          command: |
+            docker run --rm -it -v $PWD/dockerfiles:/io jupyterhub/jupyterhub python3 /io/test.py
+
+
+# Tell CircleCI to use this workflow when it builds the site
+workflows:
+  version: 2
+  default:
+    jobs:
+      - build

.github/workflows/release.yml

@@ -1,185 +0,0 @@
-# Build releases and (on tags) publish to PyPI
-name: Release
-
-# always build releases (to make sure wheel-building works)
-# but only publish to PyPI on tags
-on:
-  push:
-  pull_request:
-
-jobs:
-  build-release:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-
-      - uses: actions/setup-node@v1
-        with:
-          node-version: "14"
-
-      - name: install build package
-        run: |
-          pip install --upgrade pip
-          pip install build
-          pip freeze
-
-      - name: build release
-        run: |
-          python -m build --sdist --wheel .
-          ls -l dist
-
-      - name: verify wheel
-        run: |
-          cd dist
-          pip install ./*.whl
-          # verify data-files are installed where they are found
-          cat <<EOF | python
-          import os
-          from jupyterhub._data import DATA_FILES_PATH
-          print(f"DATA_FILES_PATH={DATA_FILES_PATH}")
-          assert os.path.exists(DATA_FILES_PATH), DATA_FILES_PATH
-          for subpath in (
-              "templates/page.html",
-              "static/css/style.min.css",
-              "static/components/jquery/dist/jquery.js",
-          ):
-              path = os.path.join(DATA_FILES_PATH, subpath)
-              assert os.path.exists(path), path
-          print("OK")
-          EOF
-
-      # ref: https://github.com/actions/upload-artifact#readme
-      - uses: actions/upload-artifact@v2
-        with:
-          name: jupyterhub-${{ github.sha }}
-          path: "dist/*"
-          if-no-files-found: error
-
-      - name: Publish to PyPI
-        if: startsWith(github.ref, 'refs/tags/')
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: |
-          pip install twine
-          twine upload --skip-existing dist/*
-
-  publish-docker:
-    runs-on: ubuntu-20.04
-
-    services:
-      # So that we can test this in PRs/branches
-      local-registry:
-        image: registry:2
-        ports:
-          - 5000:5000
-
-    steps:
-      - name: Should we push this image to a public registry?
-        run: |
-          if [ "${{ startsWith(github.ref, 'refs/tags/') || (github.ref == 'refs/heads/main') }}" = "true" ]; then
-              # Empty => Docker Hub
-              echo "REGISTRY=" >> $GITHUB_ENV
-          else
-              echo "REGISTRY=localhost:5000/" >> $GITHUB_ENV
-          fi
-
-      - uses: actions/checkout@v2
-
-      # Setup docker to build for multiple platforms, see:
-      # https://github.com/docker/build-push-action/tree/v2.4.0#usage
-      # https://github.com/docker/build-push-action/blob/v2.4.0/docs/advanced/multi-platform.md
-
-      - name: Set up QEMU (for docker buildx)
-        uses: docker/setup-qemu-action@25f0500ff22e406f7191a2a8ba8cda16901ca018 # associated tag: v1.0.2
-
-      - name: Set up Docker Buildx (for multi-arch builds)
-        uses: docker/setup-buildx-action@2a4b53665e15ce7d7049afb11ff1f70ff1610609 # associated tag: v1.1.2
-        with:
-          # Allows pushing to registry on localhost:5000
-          driver-opts: network=host
-
-      - name: Setup push rights to Docker Hub
-        # This was setup by...
-        # 1. Creating a Docker Hub service account "jupyterhubbot"
-        # 2. Creating a access token for the service account specific to this
-        #    repository: https://hub.docker.com/settings/security
-        # 3. Making the account part of the "bots" team, and granting that team
-        #    permissions to push to the relevant images:
-        #    https://hub.docker.com/orgs/jupyterhub/teams/bots/permissions
-        # 4. Registering the username and token as a secret for this repo:
-        #    https://github.com/jupyterhub/jupyterhub/settings/secrets/actions
-        if: env.REGISTRY != 'localhost:5000/'
-        run: |
-          docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" -p "${{ secrets.DOCKERHUB_TOKEN }}"
-
-      # https://github.com/jupyterhub/action-major-minor-tag-calculator
-      # If this is a tagged build this will return additional parent tags.
-      # E.g. 1.2.3 is expanded to Docker tags
-      # [{prefix}:1.2.3, {prefix}:1.2, {prefix}:1, {prefix}:latest] unless
-      # this is a backported tag in which case the newer tags aren't updated.
-      # For branches this will return the branch name.
-      # If GITHUB_TOKEN isn't available (e.g. in PRs) returns no tags [].
-      - name: Get list of jupyterhub tags
-        id: jupyterhubtags
-        uses: jupyterhub/action-major-minor-tag-calculator@v1
-        with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
-          prefix: "${{ env.REGISTRY }}jupyterhub/jupyterhub:"
-          defaultTag: "${{ env.REGISTRY }}jupyterhub/jupyterhub:noref"
-
-      - name: Build and push jupyterhub
-        uses: docker/build-push-action@e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f # associated tag: v2.4.0
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          # tags parameter must be a string input so convert `gettags` JSON
-          # array into a comma separated list of tags
-          tags: ${{ join(fromJson(steps.jupyterhubtags.outputs.tags)) }}
-
-      # jupyterhub-onbuild
-
-      - name: Get list of jupyterhub-onbuild tags
-        id: onbuildtags
-        uses: jupyterhub/action-major-minor-tag-calculator@v1
-        with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
-          prefix: "${{ env.REGISTRY }}jupyterhub/jupyterhub-onbuild:"
-          defaultTag: "${{ env.REGISTRY }}jupyterhub/jupyterhub-onbuild:noref"
-
-      - name: Build and push jupyterhub-onbuild
-        uses: docker/build-push-action@e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f # associated tag: v2.4.0
-        with:
-          build-args: |
-            BASE_IMAGE=${{ fromJson(steps.jupyterhubtags.outputs.tags)[0] }}
-          context: onbuild
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ join(fromJson(steps.onbuildtags.outputs.tags)) }}
-
-      # jupyterhub-demo
-
-      - name: Get list of jupyterhub-demo tags
-        id: demotags
-        uses: jupyterhub/action-major-minor-tag-calculator@v1
-        with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
-          prefix: "${{ env.REGISTRY }}jupyterhub/jupyterhub-demo:"
-          defaultTag: "${{ env.REGISTRY }}jupyterhub/jupyterhub-demo:noref"
-
-      - name: Build and push jupyterhub-demo
-        uses: docker/build-push-action@e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f # associated tag: v2.4.0
-        with:
-          build-args: |
-            BASE_IMAGE=${{ fromJson(steps.onbuildtags.outputs.tags)[0] }}
-          context: demo-image
-          # linux/arm64 currently fails:
-          # ERROR: Could not build wheels for argon2-cffi which use PEP 517 and cannot be installed directly
-          # ERROR: executor failed running [/bin/sh -c python3 -m pip install notebook]: exit code: 1
-          platforms: linux/amd64
-          push: true
-          tags: ${{ join(fromJson(steps.demotags.outputs.tags)) }}

.github/workflows/test.yml

@@ -1,7 +1,7 @@
 # This is a GitHub workflow defining a set of jobs with a set of steps.
 # ref: https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions
 #
-name: Test
+name: Run tests
 
 # Trigger the workflow's on all PRs but only on pushed tags or commits to
 # main/master branch to avoid PRs developed in a GitHub fork's dedicated branch
@@ -9,7 +9,6 @@ name: Test
 on:
   pull_request:
   push:
-  workflow_dispatch:
 
 defaults:
   run:
@@ -51,6 +50,7 @@ jobs:
           echo "or after-the-fact on already committed files with"
           echo "    pre-commit run --all-files"
 
+
   # Run "pytest jupyterhub/tests" in various configurations
   pytest:
     runs-on: ubuntu-20.04
@@ -77,10 +77,6 @@ jobs:
         #   Tests everything when the user instances are started with
         #   jupyter_server instead of notebook.
         #
-        # ssl:
-        #   Tests everything using internal SSL connections instead of
-        #   unencrypted HTTP
-        #
         # main_dependencies:
         #   Tests everything when the we use the latest available dependencies
         #   from: ipytraitlets.
@@ -89,14 +85,10 @@ jobs:
         #       GitHub UI when the workflow run, we avoid using true/false as
         #       values by instead duplicating the name to signal true.
         include:
-          - python: "3.6"
-            oldest_dependencies: oldest_dependencies
           - python: "3.6"
             subdomain: subdomain
           - python: "3.7"
             db: mysql
-          - python: "3.7"
-            ssl: ssl
           - python: "3.8"
             db: postgres
           - python: "3.8"
@@ -117,9 +109,6 @@ jobs:
               echo "MYSQL_HOST=127.0.0.1" >> $GITHUB_ENV
               echo "JUPYTERHUB_TEST_DB_URL=mysql+mysqlconnector://root@127.0.0.1:3306/jupyterhub" >> $GITHUB_ENV
           fi
-          if [ "${{ matrix.ssl }}" == "ssl" ]; then
-              echo "SSL_ENABLED=1" >> $GITHUB_ENV
-          fi
           if [ "${{ matrix.db }}" == "postgres" ]; then
               echo "PGHOST=127.0.0.1" >> $GITHUB_ENV
               echo "PGUSER=test_user" >> $GITHUB_ENV
@@ -130,6 +119,7 @@ jobs:
               echo "JUPYTERHUB_SINGLEUSER_APP=jupyterhub.tests.mockserverapp.MockServerApp" >> $GITHUB_ENV
           fi
       - uses: actions/checkout@v2
+
       # NOTE: actions/setup-node@v1 make use of a cache within the GitHub base
       #       environment and setup in a fraction of a second.
       - name: Install Node v14
@@ -153,14 +143,6 @@ jobs:
           pip install --upgrade pip
           pip install --upgrade . -r dev-requirements.txt
 
-          if [ "${{ matrix.oldest_dependencies }}" != "" ]; then
-            # take any dependencies in requirements.txt such as tornado>=5.0
-            # and transform them to tornado==5.0 so we can run tests with
-            # the earliest-supported versions
-            cat requirements.txt | grep '>=' | sed -e 's@>=@==@g' > oldest-requirements.txt
-            pip install -r oldest-requirements.txt
-          fi
-
           if [ "${{ matrix.main_dependencies }}" != "" ]; then
               pip install git+https://github.com/ipython/traitlets#egg=traitlets --force
           fi
@@ -222,25 +204,3 @@ jobs:
       - name: Submit codecov report
         run: |
           codecov
-
-  docker-build:
-    runs-on: ubuntu-20.04
-    timeout-minutes: 10
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: build images
-        run: |
-          docker build -t jupyterhub/jupyterhub .
-          docker build -t jupyterhub/jupyterhub-onbuild onbuild
-          docker build -t jupyterhub/jupyterhub:alpine -f dockerfiles/Dockerfile.alpine .
-          docker build -t jupyterhub/singleuser singleuser
-
-      - name: smoke test jupyterhub
-        run: |
-          docker run --rm -t jupyterhub/jupyterhub jupyterhub --help
-
-      - name: verify static files
-        run: |
-          docker run --rm -t -v $PWD/dockerfiles:/io jupyterhub/jupyterhub python3 /io/test.py

.gitignore

@@ -28,4 +28,3 @@ htmlcov
 .pytest_cache
 pip-wheel-metadata
 docs/source/reference/metrics.rst
-oldest-requirements.txt

.pre-commit-config.yaml

@@ -1,24 +1,19 @@
 repos:
-  - repo: https://github.com/asottile/reorder_python_imports
+- repo: https://github.com/asottile/reorder_python_imports
-    rev: v1.9.0
+  rev: v1.9.0
-    hooks:
+  hooks:
-      - id: reorder-python-imports
+  - id: reorder-python-imports
-  - repo: https://github.com/psf/black
+- repo: https://github.com/psf/black
-    rev: 22.3.0
+  rev: 19.10b0
-    hooks:
+  hooks:
-      - id: black
+  - id: black
-  - repo: https://github.com/pre-commit/mirrors-prettier
+- repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.1
+  rev: v2.4.0
-    hooks:
+  hooks:
-      - id: prettier
+  - id: end-of-file-fixer
-  - repo: https://github.com/pycqa/flake8
+  - id: check-json
-    rev: "3.8.4"
+  - id: check-yaml
-    hooks:
+  - id: check-case-conflict
-      - id: flake8
+  - id: check-executables-have-shebangs
-  - repo: https://github.com/pre-commit/pre-commit-hooks
+  - id: requirements-txt-fixer
-    rev: v3.4.0
+  - id: flake8
-    hooks:
-      - id: end-of-file-fixer
-      - id: check-case-conflict
-      - id: check-executables-have-shebangs
-      - id: requirements-txt-fixer

.prettierignore

@@ -1 +0,0 @@
-share/jupyterhub/templates/

CHECKLIST-Release.md

@@ -2,24 +2,24 @@
 
 - [ ] Upgrade Docs prior to Release
 
-  - [ ] Change log
+    - [ ] Change log
-  - [ ] New features documented
+    - [ ] New features documented
-  - [ ] Update the contributor list - thank you page
+    - [ ] Update the contributor list - thank you page
 
 - [ ] Upgrade and test Reference Deployments
 
 - [ ] Release software
 
-  - [ ] Make sure 0 issues in milestone
+    - [ ] Make sure 0 issues in milestone
-  - [ ] Follow release process steps
+    - [ ] Follow release process steps
-  - [ ] Send builds to PyPI (Warehouse) and Conda Forge
+    - [ ] Send builds to PyPI (Warehouse) and Conda Forge
 
 - [ ] Blog post and/or release note
 
 - [ ] Notify users of release
 
-  - [ ] Email Jupyter and Jupyter In Education mailing lists
+    - [ ] Email Jupyter and Jupyter In Education mailing lists
-  - [ ] Tweet (optional)
+    - [ ] Tweet (optional)
 
 - [ ] Increment the version number for the next release
 

CODE_OF_CONDUCT.md

@@ -1 +1 @@
-Please refer to [Project Jupyter's Code of Conduct](https://github.com/jupyter/governance/blob/HEAD/conduct/code_of_conduct.md).
+Please refer to [Project Jupyter's Code of Conduct](https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md).

CONTRIBUTING.md

@@ -1,9 +1,9 @@
 # Contributing to JupyterHub
 
 Welcome! As a [Jupyter](https://jupyter.org) project,
-you can follow the [Jupyter contributor guide](https://jupyter.readthedocs.io/en/latest/contributing/content-contributor.html).
+you can follow the [Jupyter contributor guide](https://jupyter.readthedocs.io/en/latest/contributor/content-contributor.html).
 
-Make sure to also follow [Project Jupyter's Code of Conduct](https://github.com/jupyter/governance/blob/HEAD/conduct/code_of_conduct.md)
+Make sure to also follow [Project Jupyter's Code of Conduct](https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md)
 for a friendly and welcoming collaborative environment.
 
 ## Setting up a development environment
@@ -18,41 +18,39 @@ JupyterHub requires Python >= 3.5 and nodejs.
 
 As a Python project, a development install of JupyterHub follows standard practices for the basics (steps 1-2).
 
+
 1. clone the repo
-   ```bash
+    ```bash
-   git clone https://github.com/jupyterhub/jupyterhub
+    git clone https://github.com/jupyterhub/jupyterhub
-   ```
+    ```
 2. do a development install with pip
 
-   ```bash
+    ```bash
-   cd jupyterhub
+    cd jupyterhub
-   python3 -m pip install --editable .
+    python3 -m pip install --editable .
-   ```
+    ```
-
 3. install the development requirements,
    which include things like testing tools
 
-   ```bash
+    ```bash
-   python3 -m pip install -r dev-requirements.txt
+    python3 -m pip install -r dev-requirements.txt
-   ```
+    ```
-
 4. install configurable-http-proxy with npm:
 
-   ```bash
+    ```bash
-   npm install -g configurable-http-proxy
+    npm install -g configurable-http-proxy
-   ```
+    ```
-
 5. set up pre-commit hooks for automatic code formatting, etc.
 
-   ```bash
+    ```bash
-   pre-commit install
+    pre-commit install
-   ```
+    ```
 
-   You can also invoke the pre-commit hook manually at any time with
+    You can also invoke the pre-commit hook manually at any time with
 
-   ```bash
+    ```bash
-   pre-commit run
+    pre-commit run
-   ```
+    ```
 
 ## Contributing
 
@@ -73,7 +71,7 @@ into your text editor to format code automatically.
 
 If you have already committed files before setting up the pre-commit
 hook with `pre-commit install`, you can fix everything up using
-`pre-commit run --all-files`. You need to make the fixing commit
+`pre-commit run --all-files`.  You need to make the fixing commit
 yourself after that.
 
 ## Testing

COPYING.md

@@ -24,7 +24,7 @@ software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
@@ -46,8 +46,8 @@ Jupyter uses a shared copyright model. Each contributor maintains copyright
 over their contributions to Jupyter. But, it is important to note that these
 contributions are typically only changes to the repositories. Thus, the Jupyter
 source code, in its entirety is not the copyright of any single person or
-institution. Instead, it is the collective copyright of the entire Jupyter
+institution.  Instead, it is the collective copyright of the entire Jupyter
-Development Team. If individual contributors want to maintain a record of what
+Development Team.  If individual contributors want to maintain a record of what
 changes/contributions they have specific copyright on, they should indicate
 their copyright in the commit message of the change, when they commit the
 change to one of the Jupyter repositories.

Dockerfile

@@ -21,7 +21,7 @@
 # your jupyterhub_config.py will be added automatically
 # from your docker directory.
 
-ARG BASE_IMAGE=ubuntu:focal-20200729
+ARG BASE_IMAGE=ubuntu:focal-20200729@sha256:6f2fb2f9fb5582f8b587837afd6ea8f37d8d1d9e41168c90f410a6ef15fa8ce5
 FROM $BASE_IMAGE AS builder
 
 USER root

README.md

@@ -6,15 +6,17 @@
 **[License](#license)** |
 **[Help and Resources](#help-and-resources)**
 
+
 # [JupyterHub](https://github.com/jupyterhub/jupyterhub)
 
+
 [![Latest PyPI version](https://img.shields.io/pypi/v/jupyterhub?logo=pypi)](https://pypi.python.org/pypi/jupyterhub)
 [![Latest conda-forge version](https://img.shields.io/conda/vn/conda-forge/jupyterhub?logo=conda-forge)](https://www.npmjs.com/package/jupyterhub)
 [![Documentation build status](https://img.shields.io/readthedocs/jupyterhub?logo=read-the-docs)](https://jupyterhub.readthedocs.org/en/latest/)
-[![GitHub Workflow Status - Test](https://img.shields.io/github/workflow/status/jupyterhub/jupyterhub/Test?logo=github&label=tests)](https://github.com/jupyterhub/jupyterhub/actions)
+[![TravisCI build status](https://img.shields.io/travis/com/jupyterhub/jupyterhub?logo=travis)](https://travis-ci.com/jupyterhub/jupyterhub)
 [![DockerHub build status](https://img.shields.io/docker/build/jupyterhub/jupyterhub?logo=docker&label=build)](https://hub.docker.com/r/jupyterhub/jupyterhub/tags)
 [![CircleCI build status](https://img.shields.io/circleci/build/github/jupyterhub/jupyterhub?logo=circleci)](https://circleci.com/gh/jupyterhub/jupyterhub)<!-- CircleCI Token: b5b65862eb2617b9a8d39e79340b0a6b816da8cc -->
-[![Test coverage of code](https://codecov.io/gh/jupyterhub/jupyterhub/branch/main/graph/badge.svg)](https://codecov.io/gh/jupyterhub/jupyterhub)
+[![Test coverage of code](https://codecov.io/gh/jupyterhub/jupyterhub/branch/master/graph/badge.svg)](https://codecov.io/gh/jupyterhub/jupyterhub)
 [![GitHub](https://img.shields.io/badge/issue_tracking-github-blue?logo=github)](https://github.com/jupyterhub/jupyterhub/issues)
 [![Discourse](https://img.shields.io/badge/help_forum-discourse-blue?logo=discourse)](https://discourse.jupyter.org/c/jupyterhub)
 [![Gitter](https://img.shields.io/badge/social_chat-gitter-blue?logo=gitter)](https://gitter.im/jupyterhub/jupyterhub)
@@ -46,21 +48,22 @@ Basic principles for operation are:
   servers.
 
 JupyterHub also provides a
-[REST API](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/jupyter/jupyterhub/HEAD/docs/rest-api.yml#/default)
+[REST API](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyter/jupyterhub/master/docs/rest-api.yml#/default)
 for administration of the Hub and its users.
 
 ## Installation
 
+
 ### Check prerequisites
 
 - A Linux/Unix based system
 - [Python](https://www.python.org/downloads/) 3.5 or greater
 - [nodejs/npm](https://www.npmjs.com/)
 
-  - If you are using **`conda`**, the nodejs and npm dependencies will be installed for
+  * If you are using **`conda`**, the nodejs and npm dependencies will be installed for
     you by conda.
 
-  - If you are using **`pip`**, install a recent version of
+  * If you are using **`pip`**, install a recent version of
     [nodejs/npm](https://docs.npmjs.com/getting-started/installing-node).
     For example, install it on Linux (Debian/Ubuntu) using:
 
@@ -117,10 +120,10 @@ To start the Hub server, run the command:
 Visit `https://localhost:8000` in your browser, and sign in with your unix
 PAM credentials.
 
-_Note_: To allow multiple users to sign into the server, you will need to
+*Note*: To allow multiple users to sign into the server, you will need to
-run the `jupyterhub` command as a _privileged user_, such as root.
+run the `jupyterhub` command as a *privileged user*, such as root.
 The [wiki](https://github.com/jupyterhub/jupyterhub/wiki/Using-sudo-to-run-JupyterHub-without-root-privileges)
-describes how to run the server as a _less privileged user_, which requires
+describes how to run the server as a *less privileged user*, which requires
 more configuration of the system.
 
 ## Configuration
@@ -139,7 +142,7 @@ To generate a default config file with settings and descriptions:
 
 ### Start the Hub
 
-To start the Hub on a specific url and port `10.0.1.2:443` with **https**:
+To start the Hub on a specific url and port ``10.0.1.2:443`` with **https**:
 
     jupyterhub --ip 10.0.1.2 --port 443 --ssl-key my_ssl.key --ssl-cert my_ssl.cert
 
@@ -201,7 +204,7 @@ These accounts will be used for authentication in JupyterHub's default configura
 ## Contributing
 
 If you would like to contribute to the project, please read our
-[contributor documentation](https://jupyter.readthedocs.io/en/latest/contributing/content-contributor.html)
+[contributor documentation](http://jupyter.readthedocs.io/en/latest/contributor/content-contributor.html)
 and the [`CONTRIBUTING.md`](CONTRIBUTING.md). The `CONTRIBUTING.md` file
 explains how to set up a development installation, how to run the test suite,
 and how to contribute to documentation.
@@ -239,7 +242,7 @@ our JupyterHub [Gitter](https://gitter.im/jupyterhub/jupyterhub) channel.
 - [Reporting Issues](https://github.com/jupyterhub/jupyterhub/issues)
 - [JupyterHub tutorial](https://github.com/jupyterhub/jupyterhub-tutorial)
 - [Documentation for JupyterHub](https://jupyterhub.readthedocs.io/en/latest/) | [PDF (latest)](https://media.readthedocs.org/pdf/jupyterhub/latest/jupyterhub.pdf) | [PDF (stable)](https://media.readthedocs.org/pdf/jupyterhub/stable/jupyterhub.pdf)
-- [Documentation for JupyterHub's REST API](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/jupyter/jupyterhub/HEAD/docs/rest-api.yml#/default)
+- [Documentation for JupyterHub's REST API](http://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyter/jupyterhub/master/docs/rest-api.yml#/default)
 - [Documentation for Project Jupyter](http://jupyter.readthedocs.io/en/latest/index.html) | [PDF](https://media.readthedocs.org/pdf/jupyter/latest/jupyter.pdf)
 - [Project Jupyter website](https://jupyter.org)
 - [Project Jupyter community](https://jupyter.org/community)

demo-image/README.md

@@ -15,7 +15,6 @@ This should only be used for demo or testing purposes!
 It shouldn't be used as a base image to build on.
 
 ### Try it
-
 1. `cd` to the root of your jupyterhub repo.
 
 2. Build the demo image with `docker build -t jupyterhub-demo demo-image`. 

dev-requirements.txt

@@ -10,9 +10,9 @@ html5lib  # needed for beautifulsoup
 mock
 notebook
 pre-commit
-pytest>=3.3
 pytest-asyncio
 pytest-cov
+pytest>=3.3
 requests-mock
 # blacklist urllib3 releases affected by https://github.com/urllib3/urllib3/issues/1683
 # I *think* this should only affect testing, not production

dockerfiles/Dockerfile.alpine

@@ -1,14 +1,9 @@
-FROM alpine:3.13
+FROM python:3.6.3-alpine3.6
-ENV LANG=en_US.UTF-8
+
-RUN apk add --no-cache \
+ARG JUPYTERHUB_VERSION=0.8.1
-        python3 \
-        py3-pip \
-        py3-ruamel.yaml \
-        py3-cryptography \
-        py3-sqlalchemy
 
-ARG JUPYTERHUB_VERSION=1.3.0
 RUN pip3 install --no-cache jupyterhub==${JUPYTERHUB_VERSION}
+ENV LANG=en_US.UTF-8
 
 USER nobody
 CMD ["jupyterhub"]

dockerfiles/README.md

@@ -1,6 +1,5 @@
 ## What is Dockerfile.alpine
-
+Dockerfile.alpine  contains base image for jupyterhub. It does not work independently, but only as part of a full jupyterhub cluster
-Dockerfile.alpine contains base image for jupyterhub. It does not work independently, but only as part of a full jupyterhub cluster
 
 ## How to use it?
 
@@ -8,13 +7,14 @@ Dockerfile.alpine contains base image for jupyterhub. It does not work independe
 2. A jupyterhub_config file.
 3. Authentication and other libraries required by the specific jupyterhub_config file.
 
+
 ## Steps to test it outside a cluster
 
-- start configurable-http-proxy in another container
+* start configurable-http-proxy in another container
-- specify CONFIGPROXY_AUTH_TOKEN env in both containers
+* specify CONFIGPROXY_AUTH_TOKEN env in both containers
-- put both containers on the same network (e.g. docker network create jupyterhub; docker run ... --net jupyterhub)
+* put both containers on the same network (e.g. docker network create jupyterhub; docker run ... --net jupyterhub)
-- tell jupyterhub where CHP is (e.g. c.ConfigurableHTTPProxy.api_url = 'http://chp:8001')
+* tell jupyterhub where CHP is (e.g. c.ConfigurableHTTPProxy.api_url = 'http://chp:8001')
-- tell jupyterhub not to start the proxy itself (c.ConfigurableHTTPProxy.should_start = False)
+* tell jupyterhub not to start the proxy itself (c.ConfigurableHTTPProxy.should_start = False)
-- Use dummy authenticator for ease of testing. Update following in jupyterhub_config file
+* Use dummy authenticator for ease of testing. Update following in jupyterhub_config file
-  - c.JupyterHub.authenticator_class = 'dummyauthenticator.DummyAuthenticator'
+    - c.JupyterHub.authenticator_class = 'dummyauthenticator.DummyAuthenticator'
-  - c.DummyAuthenticator.password = "your strong password"
+    - c.DummyAuthenticator.password = "your strong password"

docs/requirements.txt

@@ -1,11 +1,12 @@
 -r ../requirements.txt
 
 alabaster_jupyterhub
-autodoc-traits
+# Temporary fix of #3021. Revert back to released autodoc-traits when
-docutils<0.18
+# 0.1.0 released.
+https://github.com/jupyterhub/autodoc-traits/archive/75885ee24636efbfebfceed1043459715049cd84.zip
 pydata-sphinx-theme
 pytablewriter>=0.56
 recommonmark>=0.6
-sphinx>=1.7
 sphinx-copybutton
 sphinx-jsonschema
+sphinx>=1.7

docs/rest-api.yml

@@ -1,12 +1,13 @@
-# see me at: https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/jupyterhub/jupyterhub/HEAD/docs/rest-api.yml#/default
+# see me at: http://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyterhub/jupyterhub/master/docs/rest-api.yml#/default
-swagger: "2.0"
+swagger: '2.0'
 info:
   title: JupyterHub
   description: The REST API for JupyterHub
-  version: 1.5.1
+  version: 1.2.0dev
   license:
     name: BSD-3-Clause
-schemes: [http, https]
+schemes:
+  [http, https]
 securityDefinitions:
   token:
     type: apiKey
@@ -27,7 +28,7 @@ paths:
         This endpoint is not authenticated for the purpose of clients and user
         to identify the JupyterHub version before setting up authentication.
       responses:
-        "200":
+        '200':
           description: The JupyterHub version
           schema:
             type: object
@@ -43,7 +44,7 @@ paths:
         JupyterHub's version and executable path,
         and which Authenticator and Spawner are active.
       responses:
-        "200":
+        '200':
           description: Detailed JupyterHub info
           schema:
             type: object
@@ -78,28 +79,13 @@ paths:
   /users:
     get:
       summary: List users
-      parameters:
-        - name: state
-          in: query
-          required: false
-          type: string
-          enum: ["inactive", "active", "ready"]
-          description: |
-            Return only users who have servers in the given state.
-            If unspecified, return all users.
-
-            active: all users with any active servers (ready OR pending)
-            ready: all users who have any ready servers (running, not pending)
-            inactive: all users who have *no* active servers (complement of active)
-
-            Added in JupyterHub 1.3
       responses:
-        "200":
+        '200':
           description: The Hub's user list
           schema:
             type: array
             items:
-              $ref: "#/definitions/User"
+              $ref: '#/definitions/User'
     post:
       summary: Create multiple users
       parameters:
@@ -118,13 +104,13 @@ paths:
                 description: whether the created users should be admins
                 type: boolean
       responses:
-        "201":
+        '201':
           description: The users have been created
           schema:
             type: array
             description: The created users
             items:
-              $ref: "#/definitions/User"
+              $ref: '#/definitions/User'
   /users/{name}:
     get:
       summary: Get a user by name
@@ -135,10 +121,10 @@ paths:
           required: true
           type: string
       responses:
-        "200":
+        '200':
           description: The User model
           schema:
-            $ref: "#/definitions/User"
+            $ref: '#/definitions/User'
     post:
       summary: Create a single user
       parameters:
@@ -148,10 +134,10 @@ paths:
           required: true
           type: string
       responses:
-        "201":
+        '201':
           description: The user has been created
           schema:
-            $ref: "#/definitions/User"
+            $ref: '#/definitions/User'
     patch:
       summary: Modify a user
       description: Change a user's name or admin status
@@ -175,10 +161,10 @@ paths:
                 type: boolean
                 description: update admin (optional, if another key is updated i.e. name)
       responses:
-        "200":
+        '200':
           description: The updated user info
           schema:
-            $ref: "#/definitions/User"
+            $ref: '#/definitions/User'
     delete:
       summary: Delete a user
       parameters:
@@ -188,12 +174,14 @@ paths:
           required: true
           type: string
       responses:
-        "204":
+        '204':
           description: The user has been deleted
   /users/{name}/activity:
     post:
-      summary: Notify Hub of activity for a given user.
+      summary:
-      description: Notify the Hub of activity by the user,
+        Notify Hub of activity for a given user.
+      description:
+        Notify the Hub of activity by the user,
         e.g. accessing a service or (more likely)
         actively using a server.
       parameters:
@@ -221,7 +209,7 @@ paths:
                   The default server has an empty name ('').
                 type: object
                 properties:
-                  "<server name>":
+                  '<server name>':
                     description: |
                       Activity for a single server.
                     type: object
@@ -234,16 +222,16 @@ paths:
                         description: |
                           Timestamp of last-seen activity on this server.
             example:
-              last_activity: "2019-02-06T12:54:14Z"
+              last_activity: '2019-02-06T12:54:14Z'
               servers:
-                "":
+                '':
-                  last_activity: "2019-02-06T12:54:14Z"
+                  last_activity: '2019-02-06T12:54:14Z'
                 gpu:
-                  last_activity: "2019-02-06T12:54:14Z"
+                  last_activity: '2019-02-06T12:54:14Z'
       responses:
-        "401":
+        '401':
-          $ref: "#/responses/Unauthorized"
+          $ref: '#/responses/Unauthorized'
-        "404":
+        '404':
           description: No such user
   /users/{name}/server:
     post:
@@ -268,9 +256,9 @@ paths:
             type: object
 
       responses:
-        "201":
+        '201':
           description: The user's notebook server has started
-        "202":
+        '202':
           description: The user's notebook server has not yet started, but has been requested
     delete:
       summary: Stop a user's server
@@ -281,9 +269,9 @@ paths:
           required: true
           type: string
       responses:
-        "204":
+        '204':
           description: The user's notebook server has stopped
-        "202":
+        '202':
           description: The user's notebook server has not yet stopped as it is taking a while to stop
   /users/{name}/servers/{server_name}:
     post:
@@ -313,9 +301,9 @@ paths:
           schema:
             type: object
       responses:
-        "201":
+        '201':
           description: The user's notebook named-server has started
-        "202":
+        '202':
           description: The user's notebook named-server has not yet started, but has been requested
     delete:
       summary: Stop a user's named-server
@@ -343,9 +331,9 @@ paths:
                   Removing a server deletes things like the state of the stopped server.
                   Default: false.
       responses:
-        "204":
+        '204':
           description: The user's notebook named-server has stopped
-        "202":
+        '202':
           description: The user's notebook named-server has not yet stopped as it is taking a while to stop
   /users/{name}/tokens:
     parameters:
@@ -357,15 +345,15 @@ paths:
     get:
       summary: List tokens for the user
       responses:
-        "200":
+        '200':
           description: The list of tokens
           schema:
             type: array
             items:
-              $ref: "#/definitions/Token"
+              $ref: '#/definitions/Token'
-        "401":
+        '401':
-          $ref: "#/responses/Unauthorized"
+          $ref: '#/responses/Unauthorized'
-        "404":
+        '404':
           description: No such user
     post:
       summary: Create a new token for the user
@@ -383,11 +371,11 @@ paths:
                 type: string
                 description: A note attached to the token for future bookkeeping
       responses:
-        "201":
+        '201':
           description: The newly created token
           schema:
-            $ref: "#/definitions/Token"
+            $ref: '#/definitions/Token'
-        "400":
+        '400':
           description: Body must be a JSON dict or empty
   /users/{name}/tokens/{token_id}:
     parameters:
@@ -403,33 +391,33 @@ paths:
     get:
       summary: Get the model for a token by id
       responses:
-        "200":
+        '200':
           description: The info for the new token
           schema:
-            $ref: "#/definitions/Token"
+            $ref: '#/definitions/Token'
     delete:
       summary: Delete (revoke) a token by id
       responses:
-        "204":
+        '204':
           description: The token has been deleted
   /user:
     get:
       summary: Return authenticated user's model
       responses:
-        "200":
+        '200':
           description: The authenticated user's model is returned.
           schema:
-            $ref: "#/definitions/User"
+            $ref: '#/definitions/User'
   /groups:
     get:
       summary: List groups
       responses:
-        "200":
+        '200':
           description: The list of groups
           schema:
             type: array
             items:
-              $ref: "#/definitions/Group"
+              $ref: '#/definitions/Group'
   /groups/{name}:
     get:
       summary: Get a group by name
@@ -440,10 +428,10 @@ paths:
           required: true
           type: string
       responses:
-        "200":
+        '200':
           description: The group model
           schema:
-            $ref: "#/definitions/Group"
+            $ref: '#/definitions/Group'
     post:
       summary: Create a group
       parameters:
@@ -453,10 +441,10 @@ paths:
           required: true
           type: string
       responses:
-        "201":
+        '201':
           description: The group has been created
           schema:
-            $ref: "#/definitions/Group"
+            $ref: '#/definitions/Group'
     delete:
       summary: Delete a group
       parameters:
@@ -466,7 +454,7 @@ paths:
           required: true
           type: string
       responses:
-        "204":
+        '204':
           description: The group has been deleted
   /groups/{name}/users:
     post:
@@ -490,10 +478,10 @@ paths:
                 items:
                   type: string
       responses:
-        "200":
+        '200':
           description: The users have been added to the group
           schema:
-            $ref: "#/definitions/Group"
+            $ref: '#/definitions/Group'
     delete:
       summary: Remove users from a group
       parameters:
@@ -515,18 +503,18 @@ paths:
                 items:
                   type: string
       responses:
-        "200":
+        '200':
           description: The users have been removed from the group
   /services:
     get:
       summary: List services
       responses:
-        "200":
+        '200':
           description: The service list
           schema:
             type: array
             items:
-              $ref: "#/definitions/Service"
+              $ref: '#/definitions/Service'
   /services/{name}:
     get:
       summary: Get a service by name
@@ -537,16 +525,16 @@ paths:
           required: true
           type: string
       responses:
-        "200":
+        '200':
           description: The Service model
           schema:
-            $ref: "#/definitions/Service"
+            $ref: '#/definitions/Service'
   /proxy:
     get:
       summary: Get the proxy's routing table
       description: A convenience alias for getting the routing table directly from the proxy
       responses:
-        "200":
+        '200':
           description: Routing table
           schema:
             type: object
@@ -554,7 +542,7 @@ paths:
     post:
       summary: Force the Hub to sync with the proxy
       responses:
-        "200":
+        '200':
           description: Success
     patch:
       summary: Notify the Hub about a new proxy
@@ -580,7 +568,7 @@ paths:
                 type: string
                 description: CONFIGPROXY_AUTH_TOKEN for the new proxy
       responses:
-        "200":
+        '200':
           description: Success
   /authorizations/token:
     post:
@@ -602,7 +590,7 @@ paths:
               password:
                 type: string
       responses:
-        "200":
+        '200':
           description: The new API token
           schema:
             type: object
@@ -610,7 +598,7 @@ paths:
               token:
                 type: string
                 description: The new API token.
-        "403":
+        '403':
           description: The user can not be authenticated.
   /authorizations/token/{token}:
     get:
@@ -621,9 +609,9 @@ paths:
           required: true
           type: string
       responses:
-        "200":
+        '200':
           description: The user or service identified by the API token
-        "404":
+        '404':
           description: A user or service is not found.
   /authorizations/cookie/{cookie_name}/{cookie_value}:
     get:
@@ -639,15 +627,15 @@ paths:
           required: true
           type: string
       responses:
-        "200":
+        '200':
           description: The user identified by the cookie
           schema:
-            $ref: "#/definitions/User"
+            $ref: '#/definitions/User'
-        "404":
+        '404':
           description: A user is not found.
   /oauth2/authorize:
     get:
-      summary: "OAuth 2.0 authorize endpoint"
+      summary: 'OAuth 2.0 authorize endpoint'
       description: |
         Redirect users to this URL to begin the OAuth process.
         It is not an API endpoint.
@@ -673,9 +661,9 @@ paths:
           required: true
           type: string
       responses:
-        "200":
+        '200':
           description: Success
-        "400":
+        '400':
           description: OAuth2Error
   /oauth2/token:
     post:
@@ -712,7 +700,7 @@ paths:
           required: true
           type: string
       responses:
-        "200":
+        '200':
           description: JSON response including the token
           schema:
             type: object
@@ -739,9 +727,9 @@ paths:
                 type: boolean
                 description: Whether users' notebook servers should be shutdown as well (default from Hub config)
       responses:
-        "202":
+        '202':
           description: Shutdown successful
-        "400":
+        '400':
           description: Unexpeced value for proxy or servers
 # Descriptions of common responses
 responses:
@@ -779,7 +767,7 @@ definitions:
         type: array
         description: The active servers for this user.
         items:
-          $ref: "#/definitions/Server"
+          $ref: '#/definitions/Server'
   Server:
     type: object
     properties:
@@ -873,7 +861,7 @@ definitions:
         description: The user that owns a token (undefined if owned by a service)
       service:
         type: string
-        description: The service that owns the token (undefined if owned by a user)
+        description: The service that owns the token (undefined of owned by a user)
       note:
         type: string
         description: A note about the token, typically describing what it was created for.

docs/source/api/index.rst

@@ -18,7 +18,7 @@ information on:
 - learning more about JupyterHub's API
 
 The same JupyterHub API spec, as found here, is available in an interactive form
-`here (on swagger's petstore) <https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/jupyterhub/jupyterhub/HEAD/docs/rest-api.yml#!/default>`__.
+`here (on swagger's petstore) <http://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyterhub/jupyterhub/master/docs/rest-api.yml#!/default>`__.
 The `OpenAPI Initiative`_ (fka Swagger™) is a project used to describe
 and document RESTful APIs.
 

docs/source/contributing/docs.rst

@@ -13,7 +13,7 @@ Building documentation locally
 We use `sphinx <http://sphinx-doc.org>`_ to build our documentation. It takes
 our documentation source files (written in `markdown
 <https://daringfireball.net/projects/markdown/>`_ or `reStructuredText
-<https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html>`_ &
+<http://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html>`_ &
 stored under the ``docs/source`` directory) and converts it into various
 formats for people to read. To make sure the documentation you write or
 change renders correctly, it is good practice to test it locally.

docs/source/contributing/index.rst

@@ -6,8 +6,8 @@ We want you to contribute to JupyterHub in ways that are most exciting
 & useful to you. We value documentation, testing, bug reporting & code equally,
 and are glad to have your contributions in whatever form you wish :)
 
-Our `Code of Conduct <https://github.com/jupyter/governance/blob/HEAD/conduct/code_of_conduct.md>`_
+Our `Code of Conduct <https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md>`_
-(`reporting guidelines <https://github.com/jupyter/governance/blob/HEAD/conduct/reporting_online.md>`_)
+(`reporting guidelines <https://github.com/jupyter/governance/blob/master/conduct/reporting_online.md>`_)
 helps keep our community welcoming to as many people as possible.
 
 .. toctree::

docs/source/contributing/roadmap.md

@@ -6,8 +6,8 @@ the community of users, contributors, and maintainers.
 The goal is to communicate priorities and upcoming release plans.
 It is not a aimed at limiting contributions to what is listed here.
 
-## Using the roadmap
 
+## Using the roadmap
 ### Sharing Feedback on the Roadmap
 
 All of the community is encouraged to provide feedback as well as share new
@@ -22,17 +22,17 @@ maintainers will help identify what a good next step is for the issue.
 When submitting an issue, think about what "next step" category best describes
 your issue:
 
-- **now**, concrete/actionable step that is ready for someone to start work on.
+* **now**, concrete/actionable step that is ready for someone to start work on.
-  These might be items that have a link to an issue or more abstract like
+These might be items that have a link to an issue or more abstract like
-  "decrease typos and dead links in the documentation"
+"decrease typos and dead links in the documentation"
-- **soon**, less concrete/actionable step that is going to happen soon,
+* **soon**, less concrete/actionable step that is going to happen soon,
-  discussions around the topic are coming close to an end at which point it can
+discussions around the topic are coming close to an end at which point it can
-  move into the "now" category
+move into the "now" category
-- **later**, abstract ideas or tasks, need a lot of discussion or
+* **later**, abstract ideas or tasks, need a lot of discussion or
-  experimentation to shape the idea so that it can be executed. Can also
+experimentation to shape the idea so that it can be executed. Can also
-  contain concrete/actionable steps that have been postponed on purpose
+contain concrete/actionable steps that have been postponed on purpose
-  (these are steps that could be in "now" but the decision was taken to work on
+(these are steps that could be in "now" but the decision was taken to work on
-  them later)
+them later)
 
 ### Reviewing and Updating the Roadmap
 
@@ -47,8 +47,8 @@ For those please create a
 The roadmap should give the reader an idea of what is happening next, what needs
 input and discussion before it can happen and what has been postponed.
 
-## The roadmap proper
 
+## The roadmap proper
 ### Project vision
 
 JupyterHub is a dependable tool used by humans that reduces the complexity of
@@ -58,19 +58,20 @@ creating the environment in which a piece of software can be executed.
 
 These "Now" items are considered active areas of focus for the project:
 
-- HubShare - a sharing service for use with JupyterHub.
+* HubShare - a sharing service for use with JupyterHub.
-  - Users should be able to:
+    * Users should be able to:
-    - Push a project to other users.
+        - Push a project to other users.
-    - Get a checkout of a project from other users.
+        - Get a checkout of a project from other users.
-    - Push updates to a published project.
+        - Push updates to a published project.
-    - Pull updates from a published project.
+        - Pull updates from a published project.
-    - Manage conflicts/merges by simply picking a version (our/theirs)
+        - Manage conflicts/merges by simply picking a version (our/theirs)
-    - Get a checkout of a project from the internet. These steps are completely different from saving notebooks/files.
+        - Get a checkout of a project from the internet. These steps are completely different from saving notebooks/files.
-    - Have directories that are managed by git completely separately from our stuff.
+        - Have directories that are managed by git completely separately from our stuff.
-    - Look at pushed content that they have access to without an explicit pull.
+        - Look at pushed content that they have access to without an explicit pull.
-    - Define and manage teams of users.
+        - Define and manage teams of users.
-      - Adding/removing a user to/from a team gives/removes them access to all projects that team has access to.
+            - Adding/removing a user to/from a team gives/removes them access to all projects that team has access to.
-    - Build other services, such as static HTML publishing and dashboarding on top of these things.
+        - Build other services, such as static HTML publishing and dashboarding on top of these things.
+
 
 ### Soon
 
@@ -78,10 +79,11 @@ These "Soon" items are under discussion. Once an item reaches the point of an
 actionable plan, the item will be moved to the "Now" section. Typically,
 these will be moved at a future review of the roadmap.
 
-- resource monitoring and management:
+* resource monitoring and management:
-  - (prometheus?) API for resource monitoring
+    - (prometheus?) API for resource monitoring
-  - tracking activity on single-user servers instead of the proxy
+    - tracking activity on single-user servers instead of the proxy
-  - notes and activity tracking per API token
+    - notes and activity tracking per API token
+
 
 ### Later
 
@@ -90,6 +92,6 @@ time there is no active plan for an item. The project would like to find the
 resources and time to discuss these ideas.
 
 - real-time collaboration
-  - Enter into real-time collaboration mode for a project that starts a shared execution context.
+    - Enter into real-time collaboration mode for a project that starts a shared execution context.
-  - Once the single-user notebook package supports realtime collaboration,
+    - Once the single-user notebook package supports realtime collaboration,
-    implement sharing mechanism integrated into the Hub.
+      implement sharing mechanism integrated into the Hub.

docs/source/events/index.rst

@@ -1,7 +1,10 @@
 Eventlogging and Telemetry
 ==========================
 
-JupyterHub can be configured to record structured events from a running server using Jupyter's `Telemetry System`_. The types of events that JupyterHub emits are defined by `JSON schemas`_ listed at the bottom of this page_.
+JupyterHub can be configured to record structured events from a running server using Jupyter's `Telemetry System`_. The types of events that JupyterHub emits are defined by `JSON schemas`_ listed below_
+
+ emitted as JSON data, defined and validated by the JSON schemas listed below.
+
 
 .. _logging: https://docs.python.org/3/library/logging.html
 .. _`Telemetry System`: https://github.com/jupyter/telemetry
@@ -35,12 +38,13 @@ Here's a basic example:
 The output is a file, ``"event.log"``, with events recorded as JSON data.
 
 
-.. _page:
+
+.. _below:
 
 Event schemas
 -------------
 
 .. toctree::
-    :maxdepth: 2
+   :maxdepth: 2
 
-    server-actions.rst
+   server-actions.rst

docs/source/gallery-jhub-deployments.md

@@ -8,29 +8,27 @@ high performance computing.
 
 Please submit pull requests to update information or to add new institutions or uses.
 
+
 ## Academic Institutions, Research Labs, and Supercomputer Centers
 
 ### University of California Berkeley
 
 - [BIDS - Berkeley Institute for Data Science](https://bids.berkeley.edu/)
-
+    - [Teaching with Jupyter notebooks and JupyterHub](https://bids.berkeley.edu/resources/videos/teaching-ipythonjupyter-notebooks-and-jupyterhub)
-  - [Teaching with Jupyter notebooks and JupyterHub](https://bids.berkeley.edu/resources/videos/teaching-ipythonjupyter-notebooks-and-jupyterhub)
 
 - [Data 8](http://data8.org/)
-
+    - [GitHub organization](https://github.com/data-8)
-  - [GitHub organization](https://github.com/data-8)
 
 - [NERSC](http://www.nersc.gov/)
-
+    - [Press release on Jupyter and Cori](http://www.nersc.gov/news-publications/nersc-news/nersc-center-news/2016/jupyter-notebooks-will-open-up-new-possibilities-on-nerscs-cori-supercomputer/)
-  - [Press release on Jupyter and Cori](http://www.nersc.gov/news-publications/nersc-news/nersc-center-news/2016/jupyter-notebooks-will-open-up-new-possibilities-on-nerscs-cori-supercomputer/)
+    - [Moving and sharing data](https://www.nersc.gov/assets/Uploads/03-MovingAndSharingData-Cholia.pdf)
-  - [Moving and sharing data](https://www.nersc.gov/assets/Uploads/03-MovingAndSharingData-Cholia.pdf)
 
 - [Research IT](http://research-it.berkeley.edu)
-  - [JupyterHub server supports campus research computation](http://research-it.berkeley.edu/blog/17/01/24/free-fully-loaded-jupyterhub-server-supports-campus-research-computation)
+    - [JupyterHub server supports campus research computation](http://research-it.berkeley.edu/blog/17/01/24/free-fully-loaded-jupyterhub-server-supports-campus-research-computation)
 
 ### University of California Davis
 
-- [Spinning up multiple Jupyter Notebooks on AWS for a tutorial](https://github.com/mblmicdiv/course2017/blob/HEAD/exercises/sourmash-setup.md)
+- [Spinning up multiple Jupyter Notebooks on AWS for a tutorial](https://github.com/mblmicdiv/course2017/blob/master/exercises/sourmash-setup.md)
 
 Although not technically a JupyterHub deployment, this tutorial setup
 may be helpful to others in the Jupyter community.
@@ -64,21 +62,20 @@ easy to do with RStudio too.
 ### Clemson University
 
 - Advanced Computing
-  - [Palmetto cluster and JupyterHub](http://citi.sites.clemson.edu/2016/08/18/JupyterHub-for-Palmetto-Cluster.html)
+    - [Palmetto cluster and JupyterHub](http://citi.sites.clemson.edu/2016/08/18/JupyterHub-for-Palmetto-Cluster.html)
 
 ### University of Colorado Boulder
 
 - (CU Research Computing) CURC
-
+    - [JupyterHub User Guide](https://www.rc.colorado.edu/support/user-guide/jupyterhub.html)
-  - [JupyterHub User Guide](https://www.rc.colorado.edu/support/user-guide/jupyterhub.html)
+        - Slurm job dispatched on Crestone compute cluster
-    - Slurm job dispatched on Crestone compute cluster
+        - log troubleshooting
-    - log troubleshooting
+        - Profiles in IPython Clusters tab
-    - Profiles in IPython Clusters tab
+    - [Parallel Processing with JupyterHub tutorial](https://www.rc.colorado.edu/support/examples-and-tutorials/parallel-processing-with-jupyterhub.html)
-  - [Parallel Processing with JupyterHub tutorial](https://www.rc.colorado.edu/support/examples-and-tutorials/parallel-processing-with-jupyterhub.html)
+    - [Parallel Programming with JupyterHub document](https://www.rc.colorado.edu/book/export/html/833)
-  - [Parallel Programming with JupyterHub document](https://www.rc.colorado.edu/book/export/html/833)
 
 - Earth Lab at CU
-  - [Tutorial on Parallel R on JupyterHub](https://earthdatascience.org/tutorials/parallel-r-on-jupyterhub/)
+    - [Tutorial on Parallel R on JupyterHub](https://earthdatascience.org/tutorials/parallel-r-on-jupyterhub/)
 
 ### George Washington University
 
@@ -115,7 +112,7 @@ easy to do with RStudio too.
 ### Paderborn University
 
 - [Data Science (DICE) group](https://dice.cs.uni-paderborn.de/)
-  - [nbgraderutils](https://github.com/dice-group/nbgraderutils): Use JupyterHub + nbgrader + iJava kernel for online Java exercises. Used in lecture Statistical Natural Language Processing.
+    - [nbgraderutils](https://github.com/dice-group/nbgraderutils): Use JupyterHub + nbgrader + iJava kernel for online Java exercises. Used in lecture Statistical Natural Language Processing.
 
 ### Penn State University
 
@@ -128,28 +125,27 @@ easy to do with RStudio too.
 ### University of California San Diego
 
 - San Diego Supercomputer Center - Andrea Zonca
-
+    - [Deploy JupyterHub on a Supercomputer with SSH](https://zonca.github.io/2017/05/jupyterhub-hpc-batchspawner-ssh.html)
-  - [Deploy JupyterHub on a Supercomputer with SSH](https://zonca.github.io/2017/05/jupyterhub-hpc-batchspawner-ssh.html)
+    - [Run Jupyterhub on a Supercomputer](https://zonca.github.io/2015/04/jupyterhub-hpc.html)
-  - [Run Jupyterhub on a Supercomputer](https://zonca.github.io/2015/04/jupyterhub-hpc.html)
+    - [Deploy JupyterHub on a VM for a Workshop](https://zonca.github.io/2016/04/jupyterhub-sdsc-cloud.html)
-  - [Deploy JupyterHub on a VM for a Workshop](https://zonca.github.io/2016/04/jupyterhub-sdsc-cloud.html)
+    - [Customize your Python environment in Jupyterhub](https://zonca.github.io/2017/02/customize-python-environment-jupyterhub.html)
-  - [Customize your Python environment in Jupyterhub](https://zonca.github.io/2017/02/customize-python-environment-jupyterhub.html)
+    - [Jupyterhub deployment on multiple nodes with Docker Swarm](https://zonca.github.io/2016/05/jupyterhub-docker-swarm.html)
-  - [Jupyterhub deployment on multiple nodes with Docker Swarm](https://zonca.github.io/2016/05/jupyterhub-docker-swarm.html)
+    - [Sample deployment of Jupyterhub in HPC on SDSC Comet](https://zonca.github.io/2017/02/sample-deployment-jupyterhub-hpc.html)
-  - [Sample deployment of Jupyterhub in HPC on SDSC Comet](https://zonca.github.io/2017/02/sample-deployment-jupyterhub-hpc.html)
 
 - Educational Technology Services - Paul Jamason
-  - [jupyterhub.ucsd.edu](https://jupyterhub.ucsd.edu)
+    - [jupyterhub.ucsd.edu](https://jupyterhub.ucsd.edu)
 
 ### TACC University of Texas
 
 ### Texas A&M
 
 - Kristen Thyng - Oceanography
-  - [Teaching with JupyterHub and nbgrader](http://kristenthyng.com/blog/2016/09/07/jupyterhub+nbgrader/)
+    - [Teaching with JupyterHub and nbgrader](http://kristenthyng.com/blog/2016/09/07/jupyterhub+nbgrader/)
 
 ### Elucidata
-
+  - What's new in Jupyter Notebooks @[Elucidata](https://elucidata.io/):
-- What's new in Jupyter Notebooks @[Elucidata](https://elucidata.io/):
+      - Using Jupyter Notebooks with Jupyterhub on GCP, managed by GKE
-  - Using Jupyter Notebooks with Jupyterhub on GCP, managed by GKE - https://medium.com/elucidata/why-you-should-be-using-a-jupyter-notebook-8385a4ccd93d
+            - https://medium.com/elucidata/why-you-should-be-using-a-jupyter-notebook-8385a4ccd93d
 
 ## Service Providers
 
@@ -179,6 +175,7 @@ easy to do with RStudio too.
 
 - [Deploying JupyterHub on Hadoop](https://jupyterhub-on-hadoop.readthedocs.io)
 
+
 ## Miscellaneous
 
 - https://medium.com/@ybarraud/setting-up-jupyterhub-with-sudospawner-and-anaconda-844628c0dbee#.rm3yt87e1

docs/source/getting-started/authenticators-users-basics.md

@@ -9,6 +9,7 @@ with an account and password on the system will be allowed to login.
 You can restrict which users are allowed to login with a set,
 `Authenticator.allowed_users`:
 
+
 ```python
 c.Authenticator.allowed_users = {'mal', 'zoe', 'inara', 'kaylee'}
 ```
@@ -22,19 +23,18 @@ Admin users of JupyterHub, `admin_users`, can add and remove users from
 the user `allowed_users` set. `admin_users` can take actions on other users'
 behalf, such as stopping and restarting their servers.
 
-A set of initial admin users, `admin_users` can be configured as follows:
+A set of initial admin users, `admin_users` can configured be as follows:
 
 ```python
 c.Authenticator.admin_users = {'mal', 'zoe'}
 ```
-
 Users in the admin set are automatically added to the user `allowed_users` set,
 if they are not already present.
 
 Each authenticator may have different ways of determining whether a user is an
-administrator. By default JupyterHub uses the PAMAuthenticator which provides the
+administrator. By default JupyterHub use the PAMAuthenticator which provide the
-`admin_groups` option and can set administrator status based on a user
+`admin_groups` option and can determine administrator status base on a user
-group. For example we can let any user in the `wheel` group be admin:
+groups. For example we can let any users in the `wheel` group be admin:
 
 ```python
 c.PAMAuthenticator.admin_groups = {'wheel'}
@@ -42,10 +42,10 @@ c.PAMAuthenticator.admin_groups = {'wheel'}
 
 ## Give admin access to other users' notebook servers (`admin_access`)
 
-Since the default `JupyterHub.admin_access` setting is `False`, the admins
+Since the default `JupyterHub.admin_access` setting is False, the admins
 do not have permission to log in to the single user notebook servers
-owned by _other users_. If `JupyterHub.admin_access` is set to `True`,
+owned by *other users*. If `JupyterHub.admin_access` is set to True,
-then admins have permission to log in _as other users_ on their
+then admins have permission to log in *as other users* on their
 respective machines, for debugging. **As a courtesy, you should make
 sure your users know if admin_access is enabled.**
 
@@ -53,8 +53,8 @@ sure your users know if admin_access is enabled.**
 
 Users can be added to and removed from the Hub via either the admin
 panel or the REST API. When a user is **added**, the user will be
-automatically added to the `allowed_users` set and database. Restarting the Hub
+automatically added to the allowed users set and database. Restarting the Hub
-will not require manually updating the `allowed_users` set in your config file,
+will not require manually updating the allowed users set in your config file,
 as the users will be loaded from the database.
 
 After starting the Hub once, it is not sufficient to **remove** a user
@@ -91,7 +91,6 @@ JupyterHub's [OAuthenticator][] currently supports the following
 popular services:
 
 - Auth0
-- Azure AD
 - Bitbucket
 - CILogon
 - GitHub
@@ -107,8 +106,8 @@ with any provider, is also available.
 
 ## Use DummyAuthenticator for testing
 
-The `DummyAuthenticator` is a simple authenticator that
+The :class:`~jupyterhub.auth.DummyAuthenticator` is a simple authenticator that
-allows for any username/password unless a global password has been set. If
+allows for any username/password unless if a global password has been set. If
 set, it will allow for any username as long as the correct password is provided.
 To set a global password, add this to the config file:
 
@@ -116,5 +115,5 @@ To set a global password, add this to the config file:
 c.DummyAuthenticator.password = "some_password"
 ```
 
-[pam]: https://en.wikipedia.org/wiki/Pluggable_authentication_module
+[PAM]: https://en.wikipedia.org/wiki/Pluggable_authentication_module
-[oauthenticator]: https://github.com/jupyterhub/oauthenticator
+[OAuthenticator]: https://github.com/jupyterhub/oauthenticator

docs/source/getting-started/config-basics.md

@@ -44,7 +44,7 @@ jupyterhub -f /etc/jupyterhub/jupyterhub_config.py
 ```
 
 The IPython documentation provides additional information on the
-[config system](http://ipython.readthedocs.io/en/stable/development/config.html)
+[config system](http://ipython.readthedocs.io/en/stable/development/config)
 that Jupyter uses.
 
 ## Configure using command line options
@@ -56,18 +56,18 @@ To display all command line options that are available for configuration:
 ```
 
 Configuration using the command line options is done when launching JupyterHub.
-For example, to start JupyterHub on `10.0.1.2:443` with https, you
+For example, to start JupyterHub on ``10.0.1.2:443`` with https, you
 would enter:
 
 ```bash
     jupyterhub --ip 10.0.1.2 --port 443 --ssl-key my_ssl.key --ssl-cert my_ssl.cert
 ```
 
-All configurable options may technically be set on the command line,
+All configurable options may technically be set on the command-line,
 though some are inconvenient to type. To set a particular configuration
 parameter, `c.Class.trait`, you would use the command line option,
 `--Class.trait`, when starting JupyterHub. For example, to configure the
-`c.Spawner.notebook_dir` trait from the command line, use the
+`c.Spawner.notebook_dir` trait from the command-line, use the
 `--Spawner.notebook_dir` option:
 
 ```bash
@@ -88,13 +88,13 @@ meant as illustration, are:
 
 ## Run the proxy separately
 
-This is _not_ strictly necessary, but useful in many cases. If you
+This is *not* strictly necessary, but useful in many cases.  If you
-use a custom proxy (e.g. Traefik), this is also not needed.
+use a custom proxy (e.g. Traefik), this also not needed.
 
-Connections to user servers go through the proxy, and _not_ the hub
+Connections to user servers go through the proxy, and *not* the hub
-itself. If the proxy stays running when the hub restarts (for
+itself.  If the proxy stays running when the hub restarts (for
-maintenance, re-configuration, etc.), then user connections are not
+maintenance, re-configuration, etc.), then use connections are not
-interrupted. For simplicity, by default the hub starts the proxy
+interrupted.  For simplicity, by default the hub starts the proxy
 automatically, so if the hub restarts, the proxy restarts, and user
-connections are interrupted. It is easy to run the proxy separately,
+connections are interrupted.  It is easy to run the proxy separately,
 for information see [the separate proxy page](../reference/separate-proxy).

docs/source/getting-started/faq.md

@@ -1,5 +1,6 @@
 # Frequently asked questions
 
+
 ### How do I share links to notebooks?
 
 In short, where you see `/user/name/notebooks/foo.ipynb` use `/hub/user-redirect/notebooks/foo.ipynb` (replace `/user/name` with `/hub/user-redirect`).
@@ -10,9 +11,9 @@ Your first instinct might be to copy the URL you see in the browser,
 e.g. `hub.jupyter.org/user/yourname/notebooks/coolthing.ipynb`.
 However, let's break down what this URL means:
 
-`hub.jupyter.org/user/yourname/` is the URL prefix handled by _your server_,
+`hub.jupyter.org/user/yourname/` is the URL prefix handled by *your server*,
 which means that sharing this URL is asking the person you share the link with
-to come to _your server_ and look at the exact same file.
+to come to *your server* and look at the exact same file.
 In most circumstances, this is forbidden by permissions because the person you share with does not have access to your server.
 What actually happens when someone visits this URL will depend on whether your server is running and other factors.
 
@@ -21,12 +22,12 @@ A typical situation is that you have some shared or common filesystem,
 such that the same path corresponds to the same document
 (either the exact same document or another copy of it).
 Typically, what folks want when they do sharing like this
-is for each visitor to open the same file _on their own server_,
+is for each visitor to open the same file *on their own server*,
 so Breq would open `/user/breq/notebooks/foo.ipynb` and
 Seivarden would open `/user/seivarden/notebooks/foo.ipynb`, etc.
 
 JupyterHub has a special URL that does exactly this!
-It's called `/hub/user-redirect/...`.
+It's called `/hub/user-redirect/...` and after the visitor logs in,
 So if you replace `/user/yourname` in your URL bar
 with `/hub/user-redirect` any visitor should get the same
 URL on their own server, rather than visiting yours.

docs/source/getting-started/institutional-faq.md

@@ -11,30 +11,30 @@ Yes! JupyterHub has been used at-scale for large pools of users, as well
 as complex and high-performance computing. For example, UC Berkeley uses
 JupyterHub for its Data Science Education Program courses (serving over
 3,000 students). The Pangeo project uses JupyterHub to provide access
-to scalable cloud computing with Dask. JupyterHub is stable and customizable
+to scalable cloud computing with Dask. JupyterHub is stable customizable
 to the use-cases of large organizations.
 
 ### I keep hearing about Jupyter Notebook, JupyterLab, and now JupyterHub. What’s the difference?
 
 Here is a quick breakdown of these three tools:
 
-- **The Jupyter Notebook** is a document specification (the `.ipynb`) file that interweaves
+* **The Jupyter Notebook** is a document specification (the `.ipynb`) file that interweaves
   narrative text with code cells and their outputs. It is also a graphical interface
   that allows users to edit these documents. There are also several other graphical interfaces
   that allow users to edit the `.ipynb` format (nteract, Jupyter Lab, Google Colab, Kaggle, etc).
-- **JupyterLab** is a flexible and extendible user interface for interactive computing. It
+* **JupyterLab** is a flexible and extendible user interface for interactive computing. It
   has several extensions that are tailored for using Jupyter Notebooks, as well as extensions
   for other parts of the data science stack.
-- **JupyterHub** is an application that manages interactive computing sessions for **multiple users**.
+* **JupyterHub** is an application that manages interactive computing sessions for **multiple users**.
   It also connects them with infrastructure those users wish to access. It can provide
-  remote access to Jupyter Notebooks and JupyterLab for many people.
+  remote access to Jupyter Notebooks and Jupyter Lab for many people.
 
 ## For management
 
 ### Briefly, what problem does JupyterHub solve for us?
 
 JupyterHub provides a shared platform for data science and collaboration.
-It allows users to utilize familiar data science workflows (such as the scientific Python stack,
+It allows users to utilize familiar data science workflows (such as the scientific python stack,
 the R tidyverse, and Jupyter Notebooks) on institutional infrastructure. It also allows administrators
 some control over access to resources, security, environments, and authentication.
 
@@ -50,20 +50,20 @@ scalable infrastructure, large datasets, and high-performance computing.
 JupyterHub is used at a variety of institutions in academia,
 industry, and government research labs. It is most-commonly used by two kinds of groups:
 
-- Small teams (e.g., data science teams, research labs, or collaborative projects) to provide a
+* Small teams (e.g., data science teams, research labs, or collaborative projects) to provide a
   shared resource for interactive computing, collaboration, and analytics.
-- Large teams (e.g., a department, a large class, or a large group of remote users) to provide
+* Large teams (e.g., a department, a large class, or a large group of remote users) to provide
   access to organizational hardware, data, and analytics environments at scale.
 
-Here is a sample of organizations that use JupyterHub:
+Here are a sample of organizations that use JupyterHub:
 
-- **Universities and colleges**: UC Berkeley, UC San Diego, Cal Poly SLO, Harvard University, University of Chicago,
+* **Universities and colleges**: UC Berkeley, UC San Diego, Cal Poly SLO, Harvard University, University of Chicago,
   University of Oslo, University of Sheffield, Université Paris Sud, University of Versailles
-- **Research laboratories**: NASA, NCAR, NOAA, the Large Synoptic Survey Telescope, Brookhaven National Lab,
+* **Research laboratories**: NASA, NCAR, NOAA, the Large Synoptic Survey Telescope, Brookhaven National Lab,
   Minnesota Supercomputing Institute, ALCF, CERN, Lawrence Livermore National Laboratory
-- **Online communities**: Pangeo, Quantopian, mybinder.org, MathHub, Open Humans
+* **Online communities**: Pangeo, Quantopian, mybinder.org, MathHub, Open Humans
-- **Computing infrastructure providers**: NERSC, San Diego Supercomputing Center, Compute Canada
+* **Computing infrastructure providers**: NERSC, San Diego Supercomputing Center, Compute Canada
-- **Companies**: Capital One, SANDVIK code, Globus
+* **Companies**: Capital One, SANDVIK code, Globus
 
 See the [Gallery of JupyterHub deployments](../gallery-jhub-deployments.md) for
 a more complete list of JupyterHub deployments at institutions.
@@ -95,13 +95,14 @@ The most common way to set up a JupyterHub is to use a JupyterHub distribution,
 and opinionated ways to set up a JupyterHub on particular kinds of infrastructure. The two distributions
 that we currently suggest are:
 
-- [Zero to JupyterHub for Kubernetes](https://z2jh.jupyter.org) is a scalable JupyterHub deployment and
+* [Zero to JupyterHub for Kubernetes](https://z2jh.jupyter.org) is a scalable JupyterHub deployment and
   guide that runs on Kubernetes. Better for larger or dynamic user groups (50-10,000) or more complex
   compute/data needs.
-- [The Littlest JupyterHub](https://tljh.jupyter.org) is a lightweight JupyterHub that runs on a single
+* [The Littlest JupyterHub](https://tljh.jupyter.org) is a lightweight JupyterHub that runs on a single
-  single machine (in the cloud or under your desk). Better for smaller user groups (4-80) or more
+  single machine (in the cloud or under your desk). Better for smaller usergroups (4-80) or more
   lightweight computational resources.
 
+
 ### Does JupyterHub run well in the cloud?
 
 Yes - most deployments of JupyterHub are run via cloud infrastructure and on a variety of cloud providers.
@@ -122,9 +123,9 @@ The short answer: yes. JupyterHub as a standalone application has been battle-te
 level for several years, and makes a number of "default" security decisions that are reasonable for most
 users.
 
-- For security considerations in the base JupyterHub application,
+* For security considerations in the base JupyterHub application,
-  [see the JupyterHub security page](https://jupyterhub.readthedocs.io/en/stable/reference/websecurity.html).
+  [see the JupyterHub security page](https://jupyterhub.readthedocs.io/en/stable/reference/websecurity.html)
-- For security considerations when deploying JupyterHub on Kubernetes, see the
+* For security considerations when deploying JupyterHub on Kubernetes, see the
   [JupyterHub on Kubernetes security page](https://zero-to-jupyterhub.readthedocs.io/en/latest/security.html).
 
 The longer answer: it depends on your deployment. Because JupyterHub is very flexible, it can be used
@@ -136,13 +137,15 @@ If you are worried about security, don't hesitate to reach out to the JupyterHub
 [Jupyter Community Forum](https://discourse.jupyter.org/c/jupyterhub). This community of practice has many
 individuals with experience running secure JupyterHub deployments.
 
+
 ### Does JupyterHub provide computing or data infrastructure?
 
-No - JupyterHub manages user sessions and can _control_ computing infrastructure, but it does not provide these
+No - JupyterHub manages user sessions and can *control* computing infrastructure, but it does not provide these
 things itself. You are expected to run JupyterHub on your own infrastructure (local or in the cloud). Moreover,
 JupyterHub has no internal concept of "data", but is designed to be able to communicate with data repositories
 (again, either locally or remotely) for use within interactive computing sessions.
 
+
 ### How do I manage users?
 
 JupyterHub offers a few options for managing your users. Upon setting up a JupyterHub, you can choose what
@@ -151,7 +154,7 @@ email address, or choose a username / password when they first log-in, or offloa
 another service such as an organization's OAuth.
 
 The users of a JupyterHub are stored locally, and can be modified manually by an administrator of the JupyterHub.
-Moreover, the _active_ users on a JupyterHub can be found on the administrator's page. This page
+Moreover, the *active* users on a JupyterHub can be found on the administrator's page. This page
 gives you the abiltiy to stop or restart kernels, inspect user filesystems, and even take over user
 sessions to assist them with debugging.
 
@@ -179,11 +182,12 @@ connect with other infrastructure tools (like Dask or Spark). This allows users
 scalable or high-performance resources from within their JupyterHub sessions. The logic of
 how those resources are controlled is taken care of by the non-JupyterHub application.
 
+
 ### Can JupyterHub be used with my high-performance computing resources?
 
 Yes - JupyterHub can provide access to many kinds of computing infrastructure.
 Especially when combined with other open-source schedulers such as Dask, you can manage fairly
-complex computing infrastructures from the interactive sessions of a JupyterHub. For example
+complex computing infrastructure from the interactive sessions of a JupyterHub. For example
 [see the Dask HPC page](https://docs.dask.org/en/latest/setup/hpc.html).
 
 ### How much resources do user sessions take?
@@ -192,7 +196,7 @@ This is highly configurable by the administrator. If you wish for your users to
 data analytics environments for prototyping and light data exploring, you can restrict their
 memory and CPU based on the resources that you have available. If you'd like your JupyterHub
 to serve as a gateway to high-performance compute or data resources, you may increase the
-resources available on user machines, or connect them with computing infrastructures elsewhere.
+resources available on user machines, or connect them with computing infrastructure elsewhere.
 
 ### Can I customize the look and feel of a JupyterHub?
 
@@ -214,14 +218,16 @@ the technologies your JupyterHub will use (e.g., dev-ops knowledge with cloud co
 In general, the base JupyterHub deployment is not the bottleneck for setup, it is connecting
 your JupyterHub with the various services and tools that you wish to provide to your users.
 
+
 ### How well does JupyterHub scale? What are JupyterHub's limitations?
 
 JupyterHub works well at both a small scale (e.g., a single VM or machine) as well as a
-high scale (e.g., a scalable Kubernetes cluster). It can be used for teams as small as 2, and
+high scale (e.g., a scalable Kubernetes cluster). It can be used for teams as small a 2, and
 for user bases as large as 10,000. The scalability of JupyterHub largely depends on the
 infrastructure on which it is deployed. JupyterHub has been designed to be lightweight and
 flexible, so you can tailor your JupyterHub deployment to your needs.
 
+
 ### Is JupyterHub resilient? What happens when a machine goes down?
 
 For JupyterHubs that are deployed in a containerized environment (e.g., Kubernetes), it is
@@ -249,7 +255,7 @@ share their results with one another.
 
 JupyterHub also provides a computational framework to share computational narratives between
 different levels of an organization. For example, data scientists can share Jupyter Notebooks
-rendered as [Voilà dashboards](https://voila.readthedocs.io/en/stable/) with those who are not
+rendered as [voila dashboards](https://voila.readthedocs.io/en/stable/) with those who are not
 familiar with programming, or create publicly-available interactive analyses to allow others to
 interact with your work.
 

docs/source/getting-started/networking-basics.md

@@ -11,7 +11,7 @@ This section will help you with basic proxy and network configuration to:
 
 The Proxy's main IP address setting determines where JupyterHub is available to users.
 By default, JupyterHub is configured to be available on all network interfaces
-(`''`) on port 8000. _Note_: Use of `'*'` is discouraged for IP configuration;
+(`''`) on port 8000. *Note*: Use of `'*'` is discouraged for IP configuration;
 instead, use of `'0.0.0.0'` is preferred.
 
 Changing the Proxy's main IP address and port can be done with the following
@@ -43,7 +43,7 @@ port.
 
 By default, this REST API listens on port 8001 of `localhost` only.
 The Hub service talks to the proxy via a REST API on a secondary port. The
-API URL can be configured separately to override the default settings.
+API URL can be configured separately and override the default settings.
 
 ### Set api_url
 
@@ -74,7 +74,7 @@ The Hub service listens only on `localhost` (port 8081) by default.
 The Hub needs to be accessible from both the proxy and all Spawners.
 When spawning local servers, an IP address setting of `localhost` is fine.
 
-If _either_ the Proxy _or_ (more likely) the Spawners will be remote or
+If *either* the Proxy *or* (more likely) the Spawners will be remote or
 isolated in containers, the Hub must listen on an IP that is accessible.
 
 ```python
@@ -82,20 +82,20 @@ c.JupyterHub.hub_ip = '10.0.1.4'
 c.JupyterHub.hub_port = 54321
 ```
 
-**Added in 0.8:** The `c.JupyterHub.hub_connect_ip` setting is the IP address or
+**Added in 0.8:** The `c.JupyterHub.hub_connect_ip` setting is the ip address or
 hostname that other services should use to connect to the Hub. A common
 configuration for, e.g. docker, is:
 
 ```python
 c.JupyterHub.hub_ip = '0.0.0.0'  # listen on all interfaces
-c.JupyterHub.hub_connect_ip = '10.0.1.4'  # IP as seen on the docker network. Can also be a hostname.
+c.JupyterHub.hub_connect_ip = '10.0.1.4'  # ip as seen on the docker network. Can also be a hostname.
 ```
 
 ## Adjusting the hub's URL
 
-The hub will most commonly be running on a hostname of its own. If it
+The hub will most commonly be running on a hostname of its own.  If it
 is not – for example, if the hub is being reverse-proxied and being
 exposed at a URL such as `https://proxy.example.org/jupyter/` – then
-you will need to tell JupyterHub the base URL of the service. In such
+you will need to tell JupyterHub the base URL of the service.  In such
 a case, it is both necessary and sufficient to set
 `c.JupyterHub.base_url = '/jupyter/'` in the configuration.

docs/source/getting-started/services-basics.md

@@ -2,7 +2,7 @@
 
 When working with JupyterHub, a **Service** is defined as a process
 that interacts with the Hub's REST API. A Service may perform a specific
-action or task. For example, shutting down individuals' single user
+or action or task. For example, shutting down individuals' single user
 notebook servers that have been idle for some time is a good example of
 a task that could be automated by a Service. Let's look at how the
 [jupyterhub_idle_culler][] script can be used as a Service.
@@ -16,8 +16,8 @@ document will:
 - clarify that API tokens can be used to authenticate to
   single-user servers as of [version 0.8.0](../changelog)
 - show how the [jupyterhub_idle_culler][] script can be:
-  - used in a Hub-managed service
+    - used in a Hub-managed service
-  - run as a standalone script
+    - run as a standalone script
 
 Both examples for `jupyterhub_idle_culler` will communicate tasks to the
 Hub via the REST API.
@@ -114,7 +114,7 @@ interact with it.
 This will run the idle culler service manually. It can be run as a standalone
 script anywhere with access to the Hub, and will periodically check for idle
 servers and shut them down via the Hub's REST API. In order to shutdown the
-servers, the token given to `cull-idle` must have admin privileges.
+servers, the token given to cull-idle must have admin privileges.
 
 Generate an API token and store it in the `JUPYTERHUB_API_TOKEN` environment
 variable. Run `jupyterhub_idle_culler` manually.

docs/source/getting-started/spawners-basics.md

@@ -1,8 +1,8 @@
 # Spawners and single-user notebook servers
 
 Since the single-user server is an instance of `jupyter notebook`, an entire separate
-multi-process application, there are many aspects of that server that can be configured, and a lot
+multi-process application, there are many aspect of that server can configure, and a lot of ways
-of ways to express that configuration.
+to express that configuration.
 
 At the JupyterHub level, you can set some values on the Spawner. The simplest of these is
 `Spawner.notebook_dir`, which lets you set the root directory for a user's server. This root
@@ -14,7 +14,7 @@ expanded to the user's home directory.
 c.Spawner.notebook_dir = '~/notebooks'
 ```
 
-You can also specify extra command line arguments to the notebook server with:
+You can also specify extra command-line arguments to the notebook server with:
 
 ```python
 c.Spawner.args = ['--debug', '--profile=PHYS131']

docs/source/index.rst

@@ -115,8 +115,8 @@ We want you to contribute to JupyterHub in ways that are most exciting
 & useful to you. We value documentation, testing, bug reporting & code equally,
 and are glad to have your contributions in whatever form you wish :)
 
-Our `Code of Conduct <https://github.com/jupyter/governance/blob/HEAD/conduct/code_of_conduct.md>`_
+Our `Code of Conduct <https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md>`_
-(`reporting guidelines <https://github.com/jupyter/governance/blob/HEAD/conduct/reporting_online.md>`_)
+(`reporting guidelines <https://github.com/jupyter/governance/blob/master/conduct/reporting_online.md>`_)
 helps keep our community welcoming to as many people as possible.
 
 .. toctree::
@@ -147,4 +147,4 @@ Questions? Suggestions?
 
 .. _JupyterHub: https://github.com/jupyterhub/jupyterhub
 .. _Jupyter notebook: https://jupyter-notebook.readthedocs.io/en/latest/
-.. _REST API: https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/jupyterhub/jupyterhub/HEAD/docs/rest-api.yml#!/default
+.. _REST API: http://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyterhub/jupyterhub/master/docs/rest-api.yml#!/default

docs/source/installation-guide-hard.md

@@ -0,0 +1,347 @@
+# Install JupyterHub and JupyterLab from the ground up
+
+The combination of [JupyterHub](https://jupyterhub.readthedocs.io) and [JupyterLab](https://jupyterlab.readthedocs.io)
+is a great way to make shared computing resources available to a group.
+
+These instructions are a guide for a manual, 'bare metal' install of [JupyterHub](https://jupyterhub.readthedocs.io)
+and [JupyterLab](https://jupyterlab.readthedocs.io). This is ideal for running on a single server: build a beast
+of a machine and share it within your lab, or use a virtual machine from any VPS or cloud provider.
+
+This guide has similar goals to [The Littlest JupyterHub](https://the-littlest-jupyterhub.readthedocs.io) setup
+script. However, instead of bundling all these step for you into one installer, we will perform every step manually.
+This makes it easy to customize any part (e.g. if you want to run other services on the same system and need to make them
+work together), as well as giving you full control and understanding of your setup.
+
+
+## Prerequisites
+
+Your own server with administrator (root) access. This could be a local machine, a remotely hosted one, or a cloud instance
+or VPS. Each user who will access JupyterHub should have a standard user account on the machine. The install will be done
+through the command line - useful if you log into your machine remotely using SSH.
+
+This tutorial was tested on **Ubuntu 18.04**. No other Linux distributions have been tested, but the instructions
+should be reasonably straightforward to adapt.
+
+
+## Goals
+
+JupyterLab enables access to a multiple 'kernels', each one being a given environment for a given language. The most
+common is a Python environment, for scientific computing usually one managed by the `conda` package manager.
+
+This guide will set up JupyterHub and JupyterLab seperately from the Python environment. In other words, we treat
+JupyterHub+JupyterLab as a 'app' or webservice, which will connect to the kernels available on the system. Specifically:
+
+- We will create an installation of JupyterHub and JupyterLab using a virtualenv under `/opt` using the system Python.
+
+- We will install conda globally.
+
+- We will create a shared conda environment which can be used (but not modified) by all users.
+
+- We will show how users can create their own private conda environments, where they can install whatever they like.
+
+
+The default JupyterHub Authenticator uses PAM to authenticate system users with their username and password. One can
+[choose the authenticator](https://jupyterhub.readthedocs.io/en/stable/reference/authenticators.html#authenticators)
+that best suits their needs. In this guide we will use the default Authenticator because it makes it easy for everyone to manage data
+in their home folder and to mix and match different services and access methods (e.g. SSH) which all work using the
+Linux system user accounts. Therefore, each user of JupyterHub will need a standard system user account.
+
+Another goal of this guide is to use system provided packages wherever possible. This has the advantage that these packages
+get automatic patches and security updates (be sure to turn on automatic updates in Ubuntu). This means less maintenance
+work and a more reliable system.
+
+## Part 1: JupyterHub and JupyterLab
+
+### Setup the JupyterHub and JupyterLab in a virtual environment
+
+First we create a virtual environment under '/opt/jupyterhub'. The '/opt' folder is where apps not belonging to the operating
+system are [commonly installed](https://unix.stackexchange.com/questions/11544/what-is-the-difference-between-opt-and-usr-local).
+Both jupyterlab and jupyterhub will be installed into this virtualenv. Create it with the command:
+
+```sh
+sudo python3 -m venv /opt/jupyterhub/
+```
+
+Now we use pip to install the required Python packages into the new virtual environment. Be sure to install
+`wheel` first. Since we are separating the user interface from the computing kernels, we don't install
+any Python scientific packages here. The only exception is `ipywidgets` because this is needed to allow connection
+between interactive tools running in the kernel and the user interface.
+
+Note that we use `/opt/jupyterhub/bin/python3 -m pip install` each time - this [makes sure](https://snarky.ca/why-you-should-use-python-m-pip/)
+that the packages are installed to the correct virtual environment.
+
+Perform the install using the following commands:
+
+```sh
+sudo /opt/jupyterhub/bin/python3 -m pip install wheel
+sudo /opt/jupyterhub/bin/python3 -m pip install jupyterhub jupyterlab
+sudo /opt/jupyterhub/bin/python3 -m pip install ipywidgets
+```
+
+JupyterHub also currently defaults to requiring `configurable-http-proxy`, which needs `nodejs` and `npm`. The versions
+of these available in Ubuntu therefore need to be installed first (they are a bit old but this is ok for our needs):
+
+```sh
+sudo apt install nodejs npm
+```
+
+Then install `configurable-http-proxy`:
+
+```sh
+sudo npm install -g configurable-http-proxy
+```
+
+### Create the configuration for JupyterHub
+
+Now we start creating configuration files. To keep everything together, we put all the configuration into the folder
+created for the virtualenv, under `/opt/jupyterhub/etc/`. For each thing needing configuration, we will create a further
+subfolder and necessary files.
+
+First create the folder for the JupyterHub configuration and navigate to it:
+
+```sh
+sudo mkdir -p /opt/jupyterhub/etc/jupyterhub/
+cd /opt/jupyterhub/etc/jupyterhub/
+```
+Then generate the default configuration file
+
+```sh
+sudo /opt/jupyterhub/bin/jupyterhub --generate-config
+```
+This will produce the default configuration file `/opt/jupyterhub/etc/jupyterhub/jupyterhub_config.py`
+
+You will need to edit the configuration file to make the JupyterLab interface by the default.
+Set the following configuration option in your `jupyterhub_config.py` file:
+
+```python
+c.Spawner.default_url = '/lab'
+```
+
+Further configuration options may be found in the documentation.
+
+### Setup Systemd service
+
+We will setup JupyterHub to run as a system service using Systemd (which is responsible for managing all services and
+servers that run on startup in Ubuntu). We will create a service file in a suitable location in the virtualenv folder
+and then link it to the system services. First create the folder for the service file:
+
+```sh
+sudo mkdir -p /opt/jupyterhub/etc/systemd
+```
+
+Then create the following text file using your [favourite editor](https://micro-editor.github.io/) at
+```sh
+/opt/jupyterhub/etc/systemd/jupyterhub.service
+```
+
+Paste the following service unit definition into the file:
+
+```
+[Unit]
+Description=JupyterHub
+After=syslog.target network.target
+
+[Service]
+User=root
+Environment="PATH=/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/opt/jupyterhub/bin"
+ExecStart=/opt/jupyterhub/bin/jupyterhub -f /opt/jupyterhub/etc/jupyterhub/jupyterhub_config.py
+
+[Install]
+WantedBy=multi-user.target
+```
+
+This sets up the environment to use the virtual environment we created, tells Systemd how to start jupyterhub using
+the configuration file we created, specifies that jupyterhub will be started as the `root` user (needed so that it can
+start jupyter on behalf of other logged in users), and specifies that jupyterhub should start on boot after the network
+is enabled.
+
+Finally, we need to make systemd aware of our service file. First we symlink our file into systemd's directory:
+
+```sh
+sudo ln -s /opt/jupyterhub/etc/systemd/jupyterhub.service /etc/systemd/system/jupyterhub.service
+```
+
+Then tell systemd to reload its configuration files
+
+```sh
+sudo systemctl daemon-reload
+```
+
+And finally enable the service
+
+```sh
+sudo systemctl enable jupyterhub.service
+```
+
+The service will start on reboot, but we can start it straight away using:
+
+```sh
+sudo systemctl start jupyterhub.service
+```
+
+...and check that it's running using:
+
+```sh
+sudo systemctl status jupyterhub.service
+```
+
+You should now be already be able to access jupyterhub using `<your servers ip>:8000` (assuming you haven't already set
+up a firewall or something). However, when you log in the jupyter notebooks will be trying to use the Python virtualenv
+that was created to install JupyterHub, this is not what we want. So on to part 2
+
+## Part 2: Conda environments
+
+### Install conda for the whole system
+
+We will use `conda` to manage Python environments. We will install the officially maintained `conda` packages for Ubuntu,
+this means they will get automatic updates with the rest of the system. Setup repo for the official Conda debian packages,
+instructions are copied from [here](https://docs.conda.io/projects/conda/en/latest/user-guide/install/rpm-debian.html):
+
+Install Anacononda public gpg key to trusted store
+```sh
+curl https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc | gpg --dearmor > conda.gpg
+sudo install -o root -g root -m 644 conda.gpg /etc/apt/trusted.gpg.d/
+```
+
+Add Debian repo
+
+```sh
+echo "deb [arch=amd64] https://repo.anaconda.com/pkgs/misc/debrepo/conda stable main" | sudo tee /etc/apt/sources.list.d/conda.list
+```
+
+Install conda
+
+```sh
+sudo apt update
+sudo apt install conda
+```
+
+This will install conda into the folder `/opt/conda/`, with the conda command available at `/opt/conda/bin/conda`.
+
+Finally, we can make conda more easily available to users by symlinking the conda shell setup script to the profile
+'drop in' folder so that it gets run on login
+
+```sh
+sudo ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh
+```
+
+### Install a default conda environment for all users
+
+First create a folder for conda envs (might exist already):
+```sh
+sudo mkdir /opt/conda/envs/
+```
+
+Then create a conda environment to your liking within that folder. Here we have called it 'python' because it will
+be the obvious default - call it whatever you like. You can install whatever you like into this environment, but you MUST at least install `ipykernel`.
+
+```sh
+sudo /opt/conda/bin/conda create --prefix /opt/conda/envs/python python=3.7 ipykernel
+```
+
+Once your env is set up as desired, make it visible to Jupyter by installing the kernel spec. There are two options here:
+
+1 ) Install into the JupyterHub virtualenv - this ensures it overrides the default python version. It will only be visible
+to the JupyterHub installation we have just created. This is useful to avoid conda environments appearing where they are not expected.
+
+```sh
+sudo /opt/conda/envs/python/bin/python -m ipykernel install --prefix=/opt/jupyterhub/ --name 'python' --display-name "Python (default)"
+```
+
+2 ) Install it system-wide by putting it into `/usr/local`. It will be visible to any parallel install of JupyterHub or
+JupyterLab, and will persist even if you later delete or modify the JupyterHub installation. This is useful if the kernels
+might be used by other services, or if you want to modify the JupyterHub installation independently from the conda environments.
+
+```sh
+sudo /opt/conda/envs/python/bin/python -m ipykernel install --prefix /usr/local/ --name 'python' --display-name "Python (default)"
+````
+
+### Setting up users' own conda environments
+
+There is relatively little for the administrator to do here, as users will have to set up their own environments using the shell.
+On login they should run `conda init` or  `/opt/conda/bin/conda`. The can then use conda to set up their environment,
+although they must also install `ipykernel`. Once done, they can enable their kernel using:
+
+```sh
+/path/to/kernel/env/bin/python -m ipykernel install --name 'python-my-env' --display-name "Python My Env"
+```
+
+This will place the kernel spec into their home folder, where Jupyter will look for it on startup.
+
+
+## Setting up a reverse proxy
+
+The guide so far results in JupyterHub running on port 8000. It is not generally advisable to run open web services in
+this way - instead, use a reverse proxy running on standard HTTP/HTTPS ports.
+
+> **Important**: Be aware of the security implications especially if you are running a server that is accessible from the open internet
+> i.e. not protected within an institutional intranet or private home/office network. You should set up a firewall and
+> HTTPS encryption, which is outside of the scope of this guide. For HTTPS consider using [LetsEncrypt](https://letsencrypt.org/)
+> or setting up a [self-signed certificate](https://www.digitalocean.com/community/tutorials/how-to-create-a-self-signed-ssl-certificate-for-nginx-in-ubuntu-18-04).
+> Firewalls may be set up using `ufw` or `firewalld` and combined with `fail2ban`.
+
+### Using Nginx
+Nginx is a mature and established web server and reverse proxy and is easy to install using `sudo apt install nginx`.
+Details on using Nginx as a reverse proxy can be found elsewhere. Here, we will only outline the additional steps needed
+to setup JupyterHub with Nginx and host it at a given URL e.g. `<your-server-ip-or-url>/jupyter`.
+This could be useful for example if you are running several services or web pages on the same server.
+
+To achieve this needs a few tweaks to both the JupyterHub configuration and the Nginx config. First, edit the
+configuration file `/opt/jupyterhub/etc/jupyterhub/jupyterhub_config.py` and add the line:
+
+```python
+c.JupyterHub.bind_url = 'http://:8000/jupyter'
+```
+
+where `/jupyter` will be the relative URL of the JupyterHub.
+
+Now Nginx must be configured with a to pass all traffic from `/jupyter` to the the local address `127.0.0.1:8000`.
+Add the following snippet to your nginx configuration file (e.g. `/etc/nginx/sites-available/default`).
+
+```
+  location /jupyter/ {
+    # NOTE important to also set base url of jupyterhub to /jupyter in its config
+    proxy_pass http://127.0.0.1:8000;
+
+    proxy_redirect   off;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+
+    # websocket headers
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection $connection_upgrade;
+
+  }
+```
+
+Also add this snippet before the *server* block:
+
+```
+map $http_upgrade $connection_upgrade {
+        default upgrade;
+        '' close;
+    }
+```
+
+Nginx will not run if there are errors in the configuration, check your configuration using:
+
+```sh
+nginx -t
+```
+
+If there are no errors, you can restart the Nginx service for the new configuration to take effect.
+
+```sh
+sudo systemctl restart nginx.service
+```
+
+
+## Getting started using your new JupyterHub
+
+Once you have setup JupyterHub and Nginx proxy as described, you can browse to your JupyterHub IP or URL
+(e.g. if your server IP address is `123.456.789.1` and you decided to host JupyterHub at the `/jupyter` URL, browse
+to `123.456.789.1/jupyter`). You will find a login page where you enter your Linux username and password. On login
+you will be presented with the JupyterLab interface, with the file browser pane showing the contents of your users'
+home directory on the server.

docs/source/installation-guide-hard.rst

@@ -1,6 +0,0 @@
-:orphan:
-
-JupyterHub the hard way
-=======================
-
-This guide has moved to https://github.com/jupyterhub/jupyterhub-the-hard-way/blob/HEAD/docs/installation-guide-hard.md

docs/source/installation-guide.rst

@@ -11,3 +11,4 @@ running on your own infrastructure.
    quickstart
    quickstart-docker
    installation-basics
+   installation-guide-hard

docs/source/quickstart.md

@@ -12,10 +12,10 @@ Before installing JupyterHub, you will need:
 - [nodejs/npm](https://www.npmjs.com/). [Install nodejs/npm](https://docs.npmjs.com/getting-started/installing-node),
   using your operating system's package manager.
 
-  - If you are using **`conda`**, the nodejs and npm dependencies will be installed for
+  * If you are using **`conda`**, the nodejs and npm dependencies will be installed for
     you by conda.
 
-  - If you are using **`pip`**, install a recent version of
+  * If you are using **`pip`**, install a recent version of
     [nodejs/npm](https://docs.npmjs.com/getting-started/installing-node).
     For example, install it on Linux (Debian/Ubuntu) using:
 
@@ -78,12 +78,12 @@ Visit `https://localhost:8000` in your browser, and sign in with your unix
 credentials.
 
 To **allow multiple users to sign in** to the Hub server, you must start
-`jupyterhub` as a _privileged user_, such as root:
+`jupyterhub` as a *privileged user*, such as root:
 
 ```bash
 sudo jupyterhub
 ```
 
 The [wiki](https://github.com/jupyterhub/jupyterhub/wiki/Using-sudo-to-run-JupyterHub-without-root-privileges)
-describes how to run the server as a _less privileged user_. This requires
+describes how to run the server as a *less privileged user*. This requires
 additional configuration of the system.

docs/source/reference/authenticators.md

@@ -89,6 +89,7 @@ class DictionaryAuthenticator(Authenticator):
             return data['username']
 ```
 
+
 #### Normalize usernames
 
 Since the Authenticator and Spawner both use the same username,
@@ -110,10 +111,11 @@ When using `PAMAuthenticator`, you can set
 normalize usernames using PAM (basically round-tripping them: username
 to uid to username), which is useful in case you use some external
 service that allows multiple usernames mapping to the same user (such
-as ActiveDirectory, yes, this really happens). When
+as ActiveDirectory, yes, this really happens).  When
-`pam_normalize_username` is on, usernames are _not_ normalized to
+`pam_normalize_username` is on, usernames are *not* normalized to
 lowercase.
 
+
 #### Validate usernames
 
 In most cases, there is a very limited set of acceptable usernames.
@@ -130,6 +132,7 @@ To only allow usernames that start with 'w':
 c.Authenticator.username_pattern = r'w.*'
 ```
 
+
 ### How to write a custom authenticator
 
 You can use custom Authenticator subclasses to enable authentication
@@ -142,6 +145,7 @@ and [post_spawn_stop(user, spawner)][], are hooks that can be used to do
 auth-related startup (e.g. opening PAM sessions) and cleanup
 (e.g. closing PAM sessions).
 
+
 See a list of custom Authenticators [on the wiki](https://github.com/jupyterhub/jupyterhub/wiki/Authenticators).
 
 If you are interested in writing a custom authenticator, you can read
@@ -182,6 +186,7 @@ Additionally, configurable attributes for your authenticator will
 appear in jupyterhub help output and auto-generated configuration files
 via `jupyterhub --generate-config`.
 
+
 ### Authentication state
 
 JupyterHub 0.8 adds the ability to persist state related to authentication,
@@ -215,10 +220,12 @@ To store auth_state, two conditions must be met:
    export JUPYTERHUB_CRYPT_KEY=$(openssl rand -hex 32)
    ```
 
+
 JupyterHub uses [Fernet](https://cryptography.io/en/latest/fernet/) to encrypt auth_state.
 To facilitate key-rotation, `JUPYTERHUB_CRYPT_KEY` may be a semicolon-separated list of encryption keys.
 If there are multiple keys present, the **first** key is always used to persist any new auth_state.
 
+
 #### Using auth_state
 
 Typically, if `auth_state` is persisted it is desirable to affect the Spawner environment in some way.
@@ -228,9 +235,10 @@ to Spawner environment:
 
 ```python
 class MyAuthenticator(Authenticator):
-    async def authenticate(self, handler, data=None):
+    @gen.coroutine
-        username = await identify_user(handler, data)
+    def authenticate(self, handler, data=None):
-        upstream_token = await token_for_user(username)
+        username = yield identify_user(handler, data)
+        upstream_token = yield token_for_user(username)
         return {
             'name': username,
             'auth_state': {
@@ -238,9 +246,10 @@ class MyAuthenticator(Authenticator):
             },
         }
 
-    async def pre_spawn_start(self, user, spawner):
+    @gen.coroutine
+    def pre_spawn_start(self, user, spawner):
         """Pass upstream_token to spawner via environment variable"""
-        auth_state = await user.get_auth_state()
+        auth_state = yield user.get_auth_state()
         if not auth_state:
             # auth_state not enabled
             return
@@ -259,10 +268,11 @@ PAM session.
 
 Beginning with version 0.8, JupyterHub is an OAuth provider.
 
-[authenticator]: https://github.com/jupyterhub/jupyterhub/blob/HEAD/jupyterhub/auth.py
+
-[pam]: https://en.wikipedia.org/wiki/Pluggable_authentication_module
+[Authenticator]: https://github.com/jupyterhub/jupyterhub/blob/master/jupyterhub/auth.py
-[oauth]: https://en.wikipedia.org/wiki/OAuth
+[PAM]: https://en.wikipedia.org/wiki/Pluggable_authentication_module
-[github oauth]: https://developer.github.com/v3/oauth/
+[OAuth]: https://en.wikipedia.org/wiki/OAuth
-[oauthenticator]: https://github.com/jupyterhub/oauthenticator
+[GitHub OAuth]: https://developer.github.com/v3/oauth/
+[OAuthenticator]: https://github.com/jupyterhub/oauthenticator
 [pre_spawn_start(user, spawner)]: https://jupyterhub.readthedocs.io/en/latest/api/auth.html#jupyterhub.auth.Authenticator.pre_spawn_start
 [post_spawn_stop(user, spawner)]: https://jupyterhub.readthedocs.io/en/latest/api/auth.html#jupyterhub.auth.Authenticator.post_spawn_stop

docs/source/reference/config-ghoauth.md

@@ -3,17 +3,18 @@
 In this example, we show a configuration file for a fairly standard JupyterHub
 deployment with the following assumptions:
 
-- Running JupyterHub on a single cloud server
+* Running JupyterHub on a single cloud server
-- Using SSL on the standard HTTPS port 443
+* Using SSL on the standard HTTPS port 443
-- Using GitHub OAuth (using oauthenticator) for login
+* Using GitHub OAuth (using oauthenticator) for login
-- Using the default spawner (to configure other spawners, uncomment and edit
+* Using the default spawner (to configure other spawners, uncomment and edit
   `spawner_class` as well as follow the instructions for your desired spawner)
-- Users exist locally on the server
+* Users exist locally on the server
-- Users' notebooks to be served from `~/assignments` to allow users to browse
+* Users' notebooks to be served from `~/assignments` to allow users to browse
   for notebooks within other users' home directories
-- You want the landing page for each user to be a `Welcome.ipynb` notebook in
+* You want the landing page for each user to be a `Welcome.ipynb` notebook in
   their assignments directory.
-- All runtime files are put into `/srv/jupyterhub` and log files in `/var/log`.
+* All runtime files are put into `/srv/jupyterhub` and log files in `/var/log`.
+
 
 The `jupyterhub_config.py` file would have these settings:
 

docs/source/reference/config-proxy.md

@@ -6,12 +6,12 @@ SSL port `443`. This could be useful if the JupyterHub server machine is also
 hosting other domains or content on `443`. The goal in this example is to
 satisfy the following:
 
-- JupyterHub is running on a server, accessed _only_ via `HUB.DOMAIN.TLD:443`
+* JupyterHub is running on a server, accessed *only* via `HUB.DOMAIN.TLD:443`
-- On the same machine, `NO_HUB.DOMAIN.TLD` strictly serves different content,
+* On the same machine, `NO_HUB.DOMAIN.TLD` strictly serves different content,
   also on port `443`
-- `nginx` or `apache` is used as the public access point (which means that
+* `nginx` or `apache` is used as the public access point (which means that
-  only nginx/apache will bind to `443`)
+  only nginx/apache will bind  to `443`)
-- After testing, the server in question should be able to score at least an A on the
+* After testing, the server in question should be able to score at least an A on the
   Qualys SSL Labs [SSL Server Test](https://www.ssllabs.com/ssltest/)
 
 Let's start out with needed JupyterHub configuration in `jupyterhub_config.py`:
@@ -86,7 +86,6 @@ server {
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $connection_upgrade;
-        proxy_set_header X-Scheme $scheme;
 
         proxy_buffering off;
     }
@@ -144,7 +143,6 @@ Now restart `nginx`, restart the JupyterHub, and enjoy accessing
 `https://NO_HUB.DOMAIN.TLD`.
 
 ### SELinux permissions for nginx
-
 On distributions with SELinux enabled (e.g. Fedora), one may encounter permission errors
 when the nginx service is started.
 
@@ -156,9 +154,9 @@ semanage port -a -t http_port_t -p tcp 8000
 setsebool -P httpd_can_network_relay 1
 setsebool -P httpd_can_network_connect 1
 ```
-
 Replace 8000 with the port the jupyterhub server is running from.
 
+
 ## Apache
 
 As with nginx above, you can use [Apache](https://httpd.apache.org) as the reverse proxy.
@@ -212,24 +210,22 @@ Listen 443
 </VirtualHost>
 ```
 
-In case of the need to run the jupyterhub under /jhub/ or other location please use the below configurations:
  
+In case of the need to run the jupyterhub under /jhub/ or other location please use the below configurations:
 - JupyterHub running locally at http://127.0.0.1:8000/jhub/ or other location
 
 httpd.conf amendments:
-
 ```bash
  RewriteRule /jhub/(.*) ws://127.0.0.1:8000/jhub/$1 [NE.P,L]
  RewriteRule /jhub/(.*) http://127.0.0.1:8000/jhub/$1 [NE,P,L]
  
  ProxyPass /jhub/ http://127.0.0.1:8000/jhub/
  ProxyPassReverse /jhub/  http://127.0.0.1:8000/jhub/
-```
+ ```
  
 jupyterhub_config.py amendments:
-
+ ```bash
-```bash
+  --The public facing URL of the whole JupyterHub application.
- --The public facing URL of the whole JupyterHub application.
+  --This is the address on which the proxy will bind. Sets protocol, ip, base_url
- --This is the address on which the proxy will bind. Sets protocol, ip, base_url
+  c.JupyterHub.bind_url = 'http://127.0.0.1:8000/jhub/'
- c.JupyterHub.bind_url = 'http://127.0.0.1:8000/jhub/'
+  ```
-```

docs/source/reference/config-sudo.md

@@ -53,6 +53,7 @@ To do this we add to `/etc/sudoers` (use `visudo` for safe editing of sudoers):
 - give `rhea` permission to run `JUPYTER_CMD` on behalf of `JUPYTER_USERS` 
   without entering a password
 
+
 For example:
 
 ```bash
@@ -90,7 +91,7 @@ $ adduser -G jupyterhub newuser
 Test that the new user doesn't need to enter a password to run the sudospawner
 command.
 
-This should prompt for your password to switch to rhea, but _not_ prompt for
+This should prompt for your password to switch to rhea, but *not* prompt for
 any password for the second switch. It should show some help output about
 logging options:
 
@@ -156,7 +157,6 @@ then you will need to give `node` permission to do so:
 ```bash
 sudo setcap 'cap_net_bind_service=+ep' /usr/bin/node
 ```
-
 However, you may want to further understand the consequences of this.
 
 You may also be interested in limiting the amount of CPU any process can use
@@ -165,6 +165,7 @@ distributions' packaging system. This can be used to keep any user's process
 from using too much CPU cycles. You can configure it accoring to [these
 instructions](http://ubuntuforums.org/showthread.php?t=992706).
 
+
 ### Shadow group (FreeBSD)
 
 **NOTE:** This has not been tested and may not work as expected.
@@ -227,7 +228,7 @@ And try logging in.
 
 If you still get a generic `Permission denied` `PermissionError`, it's possible SELinux is blocking you.  
 Here's how you can make a module to allow this.
-First, put this in a file named `sudo_exec_selinux.te`:
+First, put this in a file  named `sudo_exec_selinux.te`:
 
 ```bash
 module sudo_exec_selinux 1.1;

docs/source/reference/config-user-env.md

@@ -22,18 +22,20 @@ This section will focus on user environments, including:
 - Installing kernelspecs
 - Using containers vs. multi-user hosts
 
+
 ## Installing packages
 
 To make packages available to users, you generally will install packages
 system-wide or in a shared environment.
 
 This installation location should always be in the same environment that
-`jupyterhub-singleuser` itself is installed in, and must be _readable and
+`jupyterhub-singleuser` itself is installed in, and must be *readable and
-executable_ by your users. If you want users to be able to install additional
+executable* by your users. If you want users to be able to install additional
-packages, it must also be _writable_ by your users.
+packages, it must also be *writable* by your users.
 
 If you are using a standard system Python install, you would use:
 
+
 ```bash
 sudo python3 -m pip install numpy
 ```
@@ -45,6 +47,7 @@ You may also use conda to install packages. If you do, you should make sure
 that the conda environment has appropriate permissions for users to be able to
 run Python code in the env.
 
+
 ## Configuring Jupyter and IPython
 
 [Jupyter](https://jupyter-notebook.readthedocs.io/en/stable/config_overview.html)
@@ -61,7 +64,6 @@ users. It's generally more efficient to configure user environments "system-wide
 and it's a good idea to avoid creating files in users' home directories.
 
 The typical locations for these config files are:
-
 - **system-wide** in `/etc/{jupyter|ipython}`
 - **env-wide** (environment wide) in `{sys.prefix}/etc/{jupyter|ipython}`.
 
@@ -89,6 +91,7 @@ c.MappingKernelManager.cull_idle_timeout = 20 * 60
 c.MappingKernelManager.cull_interval = 2 * 60
 ```
 
+
 ## Installing kernelspecs
 
 You may have multiple Jupyter kernels installed and want to make sure that
@@ -116,6 +119,7 @@ sure are available, I can install their specs system-wide (in /usr/local) with:
 /path/to/python2 -m IPython kernel install --prefix=/usr/local
 ```
 
+
 ## Multi-user hosts vs. Containers
 
 There are two broad categories of user environments that depend on what
@@ -137,8 +141,8 @@ When JupyterHub uses **container-based** Spawners (e.g. KubeSpawner or
 DockerSpawner), the 'system-wide' environment is really the container image
 which you are using for users.
 
-In both cases, you want to _avoid putting configuration in user home
+In both cases, you want to *avoid putting configuration in user home
-directories_ because users can change those configuration settings. Also,
+directories* because users can change those configuration settings. Also,
 home directories typically persist once they are created, so they are
 difficult for admins to update later.
 
@@ -175,13 +179,3 @@ The number of named servers per user can be limited by setting
 ```python
 c.JupyterHub.named_server_limit_per_user = 5
 ```
-
-## Switching to Jupyter Server
-
-[Jupyter Server](https://jupyter-server.readthedocs.io/en/latest/) is a new Tornado Server backend for Jupyter web applications (e.g. JupyterLab 3.0 uses this package as its default backend).
-
-By default, the single-user notebook server uses the (old) `NotebookApp` from the [notebook](https://github.com/jupyter/notebook) package. You can switch to using Jupyter Server's `ServerApp` backend (this will likely become the default in future releases) by setting the `JUPYTERHUB_SINGLEUSER_APP` environment variable to:
-
-```bash
-export JUPYTERHUB_SINGLEUSER_APP='jupyter_server.serverapp.ServerApp'
-```

docs/source/reference/database.md

@@ -47,7 +47,7 @@ additional configuration required for MySQL that is not needed for PostgreSQL.
 - You should use the `pymysql` sqlalchemy provider (the other one, MySQLdb,
   isn't available for py3).
 - You also need to set `pool_recycle` to some value (typically 60 - 300) 
-  which depends on your MySQL setup. This is necessary since MySQL kills
+  which depends on your  MySQL setup. This is necessary since MySQL kills
   connections serverside if they've been idle for a while, and the connection
   from the hub will be idle for longer than most connections. This behavior
   will lead to frustrating 'the connection has gone away' errors from

docs/source/reference/proxy.md

@@ -54,7 +54,7 @@ class MyProxy(Proxy):
         """Stop the proxy"""
 ```
 
-These methods **may** be coroutines.
+These methods **may** be  coroutines.
 
 `c.Proxy.should_start` is a configurable flag that determines whether the
 Hub should call these methods when the Hub itself starts and stops.
@@ -103,7 +103,7 @@ route to be proxied, such as `/user/name/`. A routespec will:
 
 When adding a route, JupyterHub may pass a JSON-serializable dict as a `data`
 argument that should be attached to the proxy route. When that route is
-retrieved, the `data` argument should be returned as well. If your proxy
+retrieved, the `data` argument should be returned as well. If your  proxy
 implementation doesn't support storing data attached to routes, then your
 Python wrapper may have to handle storing the `data` piece itself, e.g in a
 simple file or database.
@@ -136,7 +136,7 @@ async def delete_route(self, routespec):
 
 ### Retrieving routes
 
-For retrieval, you only _need_ to implement a single method that retrieves all
+For retrieval, you only *need* to implement a single method that retrieves all
 routes. The return value for this function should be a dictionary, keyed by
 `routespect`, of dicts whose keys are the same three arguments passed to
 `add_route` (`routespec`, `target`, `data`)

docs/source/reference/rest.md

@@ -169,7 +169,7 @@ curl -X POST -H "Authorization: token <token>" "http://127.0.0.1:8081/hub/api/us
 ```
 
 With the named-server functionality, it's now possible to launch more than one
-specifically named servers against a given user. This could be used, for instance,
+specifically named servers against a given user.  This could be used, for instance,
 to launch each server based on a different image.
 
 First you must enable named-servers by including the following setting in the `jupyterhub_config.py` file.
@@ -187,7 +187,6 @@ hub:
 ```
 
 With that setting in place, a new named-server is activated like this:
-
 ```bash
 curl -X POST -H "Authorization: token <token>" "http://127.0.0.1:8081/hub/api/users/<user>/servers/<serverA>"
 curl -X POST -H "Authorization: token <token>" "http://127.0.0.1:8081/hub/api/users/<user>/servers/<serverB>"
@@ -202,6 +201,7 @@ will need to be able to handle the case of multiple servers per user and ensure
 uniqueness of names, particularly if servers are spawned via docker containers
 or kubernetes pods.
 
+
 ## Learn more about the API
 
 You can see the full [JupyterHub REST API][] for details. This REST API Spec can
@@ -209,7 +209,7 @@ be viewed in a more [interactive style on swagger's petstore][].
 Both resources contain the same information and differ only in its display.
 Note: The Swagger specification is being renamed the [OpenAPI Initiative][].
 
-[interactive style on swagger's petstore]: https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/jupyterhub/jupyterhub/HEAD/docs/rest-api.yml#!/default
+[interactive style on swagger's petstore]: http://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyterhub/jupyterhub/master/docs/rest-api.yml#!/default
-[openapi initiative]: https://www.openapis.org/
+[OpenAPI Initiative]: https://www.openapis.org/
-[jupyterhub rest api]: ./rest-api
+[JupyterHub REST API]: ./rest-api
-[jupyter notebook rest api]: https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/jupyter/notebook/HEAD/notebook/services/api/api.yaml
+[Jupyter Notebook REST API]: http://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyter/notebook/master/notebook/services/api/api.yaml

docs/source/reference/separate-proxy.md

@@ -1,26 +1,28 @@
 # Running proxy separately from the hub
 
+
 ## Background
 
 The thing which users directly connect to is the proxy, by default
-`configurable-http-proxy`. The proxy either redirects users to the
+`configurable-http-proxy`.  The proxy either redirects users to the
 hub (for login and managing servers), or to their own single-user
-servers. Thus, as long as the proxy stays running, access to existing
+servers.  Thus, as long as the proxy stays running, access to existing
 servers continues, even if the hub itself restarts or goes down.
 
 When you first configure the hub, you may not even realize this
-because the proxy is automatically managed by the hub. This is great
+because the proxy is automatically managed by the hub.  This is great
 for getting started and even most use, but everytime you restart the
-hub, all user connections also get restarted. But it's also simple to
+hub, all user connections also get restarted.  But it's also simple to
 run the proxy as a service separate from the hub, so that you are free
 to reconfigure the hub while only interrupting users who are currently
 actively starting the hub.
 
 The default JupyterHub proxy is
 [configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy),
-and that page has some docs. If you are using a different proxy, such
+and that page has some docs.  If you are using a different proxy, such
 as Traefik, these instructions are probably not relevant to you.
 
+
 ## Configuration options
 
 `c.JupyterHub.cleanup_servers = False` should be set, which tells the
@@ -35,20 +37,24 @@ it yourself).
 token for authenticating communication with the proxy.
 
 `c.ConfigurableHTTPProxy.api_url = 'http://localhost:8001'` should be
-set to the URL which the hub uses to connect _to the proxy's API_.
+set to the URL which the hub uses to connect *to the proxy's API*.
+
 
 ## Proxy configuration
 
-You need to configure a service to start the proxy. An example
+You need to configure a service to start the proxy.  An example
-command line for this is `configurable-http-proxy --ip=127.0.0.1 --port=8000 --api-ip=127.0.0.1 --api-port=8001 --default-target=http://localhost:8081 --error-target=http://localhost:8081/hub/error`. (Details for how to
+command line for this is `configurable-http-proxy --ip=127.0.0.1
+--port=8000 --api-ip=127.0.0.1 --api-port=8001
+--default-target=http://localhost:8081
+--error-target=http://localhost:8081/hub/error`.  (Details for how to
 do this is out of scope for this tutorial - for example it might be a
-systemd service on within another docker cotainer). The proxy has no
+systemd service on within another docker cotainer).  The proxy has no
 configuration files, all configuration is via the command line and
 environment variables.
 
 `--api-ip` and `--api-port` (which tells the proxy where to listen) should match the hub's `ConfigurableHTTPProxy.api_url`.
 
-`--ip`, `-port`, and other options configure the _user_ connections to the proxy.
+`--ip`, `-port`, and other options configure the *user* connections to the proxy.
 
 `--default-target` and `--error-target` should point to the hub, and used when users navigate to the proxy originally.
 
@@ -57,16 +63,18 @@ match the token given to `c.ConfigurableHTTPProxy.auth_token`.
 
 You should check the [configurable-http-proxy
 options](https://github.com/jupyterhub/configurable-http-proxy) to see
-what other options are needed, for example SSL options. Note that
+what other options are needed, for example SSL options.  Note that
 these are configured in the hub if the hub is starting the proxy - you
 need to move the options to here.
 
+
 ## Docker image
 
 You can use [jupyterhub configurable-http-proxy docker
 image](https://hub.docker.com/r/jupyterhub/configurable-http-proxy/)
 to run the proxy.
 
+
 ## See also
 
-- [jupyterhub configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy)
+* [jupyterhub configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy)

docs/source/reference/services.md

@@ -50,9 +50,12 @@ A Service may have the following properties:
 
 If a service is also to be managed by the Hub, it has a few extra options:
 
-- `command: (str/Popen list)` - Command for JupyterHub to spawn the service. - Only use this if the service should be a subprocess. - If command is not specified, the Service is assumed to be managed
+- `command: (str/Popen list`) - Command for JupyterHub to spawn the service.
-  externally. - If a command is specified for launching the Service, the Service will
+      - Only use this if the service should be a subprocess.
-  be started and managed by the Hub.
+      - If command is not specified, the Service is assumed to be managed
+        externally.
+      - If a command is specified for launching the Service, the Service will
+        be started and managed by the Hub.
 - `environment: dict` - additional environment variables for the Service.
 - `user: str` - the name of a system user to manage the Service. If
   unspecified, run as the same user as the Hub.
@@ -88,9 +91,9 @@ This example would be configured as follows in `jupyterhub_config.py`:
 ```python
 c.JupyterHub.services = [
     {
-        'name': 'idle-culler',
+        'name': 'cull-idle',
         'admin': True,
-        'command': [sys.executable, '-m', 'jupyterhub_idle_culler', '--timeout=3600']
+        'command': [sys.executable, '/path/to/cull-idle.py', '--timeout']
     }
 ]
 ```
@@ -100,9 +103,9 @@ parameters, which describe the environment needed to start the Service process:
 
 - `environment: dict` - additional environment variables for the Service.
 - `user: str` - name of the user to run the server if different from the Hub.
-  Requires Hub to be root.
+   Requires Hub to be root.
 - `cwd: path` directory in which to run the Service, if different from the
-  Hub directory.
+   Hub directory.
 
 The Hub will pass the following environment variables to launch the Service:
 
@@ -120,14 +123,15 @@ For the previous 'cull idle' Service example, these environment variables
 would be passed to the Service when the Hub starts the 'cull idle' Service:
 
 ```bash
-JUPYTERHUB_SERVICE_NAME: 'idle-culler'
+JUPYTERHUB_SERVICE_NAME: 'cull-idle'
 JUPYTERHUB_API_TOKEN: API token assigned to the service
 JUPYTERHUB_API_URL: http://127.0.0.1:8080/hub/api
 JUPYTERHUB_BASE_URL: https://mydomain[:port]
-JUPYTERHUB_SERVICE_PREFIX: /services/idle-culler/
+JUPYTERHUB_SERVICE_PREFIX: /services/cull-idle/
 ```
 
-See the GitHub repo for additional information about the [jupyterhub_idle_culler][].
+See the JupyterHub GitHub repo for additional information about the
+[`cull-idle` example](https://github.com/jupyterhub/jupyterhub/tree/master/examples/cull-idle).
 
 ## Externally-Managed Services
 
@@ -196,16 +200,16 @@ can be used by services. You may go beyond this reference implementation and
 create custom hub-authenticating clients and services. We describe the process
 below.
 
-The reference, or base, implementation is the [`HubAuth`][hubauth] class,
+The reference, or base, implementation is the [`HubAuth`][HubAuth] class,
 which implements the requests to the Hub.
 
 To use HubAuth, you must set the `.api_token`, either programmatically when constructing the class,
 or via the `JUPYTERHUB_API_TOKEN` environment variable.
 
 Most of the logic for authentication implementation is found in the 
-[`HubAuth.user_for_cookie`][hubauth.user_for_cookie]
+[`HubAuth.user_for_cookie`][HubAuth.user_for_cookie] 
 and in the 
-[`HubAuth.user_for_token`][hubauth.user_for_token]
+[`HubAuth.user_for_token`][HubAuth.user_for_token]
 methods, which makes a request of the Hub, and returns:
 
 - None, if no user could be identified, or
@@ -230,7 +234,7 @@ configurable by the `cookie_cache_max_age` setting (default: five minutes).
 For example, you have a Flask service that returns information about a user.
 JupyterHub's HubAuth class can be used to authenticate requests to the Flask
 service. See the `service-whoami-flask` example in the
-[JupyterHub GitHub repo](https://github.com/jupyterhub/jupyterhub/tree/HEAD/examples/service-whoami-flask)
+[JupyterHub GitHub repo](https://github.com/jupyterhub/jupyterhub/tree/master/examples/service-whoami-flask)
 for more details.
 
 ```python
@@ -282,10 +286,11 @@ def whoami(user):
         )
 ```
 
+
 ### Authenticating tornado services with JupyterHub
 
 Since most Jupyter services are written with tornado,
-we include a mixin class, [`HubAuthenticated`][hubauthenticated],
+we include a mixin class, [`HubAuthenticated`][HubAuthenticated],
 for quickly authenticating your own tornado services with JupyterHub.
 
 Tornado's `@web.authenticated` method calls a Handler's `.get_current_user`
@@ -306,6 +311,7 @@ class MyHandler(HubAuthenticated, web.RequestHandler):
         ...
 ```
 
+
 The HubAuth will automatically load the desired configuration from the Service
 environment variables.
 
@@ -315,42 +321,44 @@ username and user group list, respectively. If a user matches neither the user
 list nor the group list, they will not be allowed access. If both are left
 undefined, then any user will be allowed.
 
+
 ### Implementing your own Authentication with JupyterHub
 
 If you don't want to use the reference implementation
 (e.g. you find the implementation a poor fit for your Flask app),
 you can implement authentication via the Hub yourself.
-We recommend looking at the [`HubAuth`][hubauth] class implementation for reference,
+We recommend looking at the [`HubAuth`][HubAuth] class implementation for reference,
 and taking note of the following process:
 
 1. retrieve the cookie `jupyterhub-services` from the request.
 2. Make an API request `GET /hub/api/authorizations/cookie/jupyterhub-services/cookie-value`,
-   where cookie-value is the url-encoded value of the `jupyterhub-services` cookie.
+    where cookie-value is the url-encoded value of the `jupyterhub-services` cookie.
-   This request must be authenticated with a Hub API token in the `Authorization` header,
+    This request must be authenticated with a Hub API token in the `Authorization` header,
-   for example using the `api_token` from your [external service's configuration](#externally-managed-services).
+    for example using the `api_token` from your [external service's configuration](#externally-managed-services).
 
-   For example, with [requests][]:
+    For example, with [requests][]:
 
-   ```python
+    ```python
-   r = requests.get(
+    r = requests.get(
-       '/'.join(["http://127.0.0.1:8081/hub/api",
+        '/'.join((["http://127.0.0.1:8081/hub/api",
-                  "authorizations/cookie/jupyterhub-services",
+                   "authorizations/cookie/jupyterhub-services",
-                  quote(encrypted_cookie, safe=''),
+                   quote(encrypted_cookie, safe=''),
-       ]),
+        ]),
-       headers = {
+        headers = {
-           'Authorization' : 'token %s' % api_token,
+            'Authorization' : 'token %s' % api_token,
-       },
+        },
-   )
+    )
-   r.raise_for_status()
+    r.raise_for_status()
-   user = r.json()
+    user = r.json()
-   ```
+    ```
 
 3. On success, the reply will be a JSON model describing the user:
 
    ```json
    {
      "name": "inara",
-     "groups": ["serenity", "guild"]
+     "groups": ["serenity", "guild"],
+
    }
    ```
 
@@ -360,11 +368,11 @@ and an example of its configuration is found [here](https://github.com/jupyter/n
 nbviewer can also be run as a Hub-Managed Service as described [nbviewer README][nbviewer example]
 section on securing the notebook viewer.
 
+
 [requests]: http://docs.python-requests.org/en/master/
 [services_auth]: ../api/services.auth.html
-[hubauth]: ../api/services.auth.html#jupyterhub.services.auth.HubAuth
+[HubAuth]: ../api/services.auth.html#jupyterhub.services.auth.HubAuth
-[hubauth.user_for_cookie]: ../api/services.auth.html#jupyterhub.services.auth.HubAuth.user_for_cookie
+[HubAuth.user_for_cookie]: ../api/services.auth.html#jupyterhub.services.auth.HubAuth.user_for_cookie
-[hubauth.user_for_token]: ../api/services.auth.html#jupyterhub.services.auth.HubAuth.user_for_token
+[HubAuth.user_for_token]: ../api/services.auth.html#jupyterhub.services.auth.HubAuth.user_for_token
-[hubauthenticated]: ../api/services.auth.html#jupyterhub.services.auth.HubAuthenticated
+[HubAuthenticated]: ../api/services.auth.html#jupyterhub.services.auth.HubAuthenticated
 [nbviewer example]: https://github.com/jupyter/nbviewer#securing-the-notebook-viewer
-[jupyterhub_idle_culler]: https://github.com/jupyterhub/jupyterhub-idle-culler

docs/source/reference/spawners.md

@@ -8,17 +8,18 @@ and a custom Spawner needs to be able to take three actions:
 - poll whether the process is still running
 - stop the process
 
+
 ## Examples
 
 Custom Spawners for JupyterHub can be found on the [JupyterHub wiki](https://github.com/jupyterhub/jupyterhub/wiki/Spawners).
 Some examples include:
 
 - [DockerSpawner](https://github.com/jupyterhub/dockerspawner) for spawning user servers in Docker containers
-  - `dockerspawner.DockerSpawner` for spawning identical Docker containers for
+  * `dockerspawner.DockerSpawner` for spawning identical Docker containers for
     each users
-  - `dockerspawner.SystemUserSpawner` for spawning Docker containers with an
+  * `dockerspawner.SystemUserSpawner` for spawning Docker containers with an
     environment and home directory for each users
-  - both `DockerSpawner` and `SystemUserSpawner` also work with Docker Swarm for
+  * both `DockerSpawner` and `SystemUserSpawner` also work with Docker Swarm for
     launching containers on remote machines
 - [SudoSpawner](https://github.com/jupyterhub/sudospawner) enables JupyterHub to
   run without being root, by spawning an intermediate process via `sudo`
@@ -29,6 +30,7 @@ Some examples include:
 - [SSHSpawner](https://github.com/NERSC/sshspawner) to spawn notebooks
   on a remote server using SSH
 
+
 ## Spawner control methods
 
 ### Spawner.start
@@ -39,7 +41,7 @@ an object encapsulating the user's name, authentication, and server info.
 
 The return value of `Spawner.start` should be the (ip, port) of the running server.
 
-**NOTE:** When writing coroutines, _never_ `yield` in between a database change and a commit.
+**NOTE:** When writing coroutines, *never* `yield` in between a database change and a commit.
 
 Most `Spawner.start` functions will look similar to this example:
 
@@ -78,6 +80,7 @@ to check if the local process is still running. On Windows, it uses `psutil.pid_
 
 `Spawner.stop` should stop the process. It must be a tornado coroutine, which should return when the process has finished exiting.
 
+
 ## Spawner state
 
 JupyterHub should be able to stop and restart without tearing down
@@ -109,6 +112,7 @@ def clear_state(self):
     self.pid = 0
 ```
 
+
 ## Spawner options form
 
 (new in 0.4)
@@ -125,7 +129,7 @@ If the `Spawner.options_form` is defined, when a user tries to start their serve
 
 If `Spawner.options_form` is undefined, the user's server is spawned directly, and no spawn page is rendered.
 
-See [this example](https://github.com/jupyterhub/jupyterhub/blob/HEAD/examples/spawn-form/jupyterhub_config.py) for a form that allows custom CLI args for the local spawner.
+See [this example](https://github.com/jupyterhub/jupyterhub/blob/master/examples/spawn-form/jupyterhub_config.py) for a form that allows custom CLI args for the local spawner.
 
 ### `Spawner.options_from_form`
 
@@ -166,7 +170,8 @@ which would return:
 
 When `Spawner.start` is called, this dictionary is accessible as `self.user_options`.
 
-[spawner]: https://github.com/jupyterhub/jupyterhub/blob/HEAD/jupyterhub/spawner.py
+
+[Spawner]: https://github.com/jupyterhub/jupyterhub/blob/master/jupyterhub/spawner.py
 
 ## Writing a custom spawner
 
@@ -207,6 +212,7 @@ Additionally, configurable attributes for your spawner will
 appear in jupyterhub help output and auto-generated configuration files
 via `jupyterhub --generate-config`.
 
+
 ## Spawners, resource limits, and guarantees (Optional)
 
 Some spawners of the single-user notebook servers allow setting limits or
@@ -218,9 +224,10 @@ support for them**. For example, LocalProcessSpawner, the default
 spawner, does not support limits and guarantees. One of the spawners
 that supports limits and guarantees is the `systemdspawner`.
 
+
 ### Memory Limits & Guarantees
 
-`c.Spawner.mem_limit`: A **limit** specifies the _maximum amount of memory_
+`c.Spawner.mem_limit`: A **limit** specifies the *maximum amount of memory*
 that may be allocated, though there is no promise that the maximum amount will
 be available. In supported spawners, you can set `c.Spawner.mem_limit` to
 limit the total amount of memory that a single-user notebook server can
@@ -228,8 +235,8 @@ allocate. Attempting to use more memory than this limit will cause errors. The
 single-user notebook server can discover its own memory limit by looking at
 the environment variable `MEM_LIMIT`, which is specified in absolute bytes.
 
-`c.Spawner.mem_guarantee`: Sometimes, a **guarantee** of a _minimum amount of
+`c.Spawner.mem_guarantee`: Sometimes, a **guarantee** of a *minimum amount of
-memory_ is desirable. In this case, you can set `c.Spawner.mem_guarantee` to
+memory* is desirable. In this case, you can set `c.Spawner.mem_guarantee` to
 to provide a guarantee that at minimum this much memory will always be
 available for the single-user notebook server to use. The environment variable
 `MEM_GUARANTEE` will also be set in the single-user notebook server.
@@ -264,7 +271,7 @@ utilize these certs, there are two methods of interest on the base `Spawner`
 class: `.create_certs` and `.move_certs`.
 
 The first method, `.create_certs` will sign a key-cert pair using an internally
-trusted authority for notebooks. During this process, `.create_certs` can
+trusted authority for notebooks.  During this process, `.create_certs` can
 apply `ip` and `dns` name information to the cert via an `alt_names` `kwarg`.
 This is used for certificate authentication (verification). Without proper
 verification, the `Notebook` will be unable to communicate with the `Hub` and

docs/source/reference/templates.md

@@ -1,8 +1,8 @@
 # Working with templates and UI
 
 The pages of the JupyterHub application are generated from
-[Jinja](http://jinja.pocoo.org/) templates. These allow the header, for
+[Jinja](http://jinja.pocoo.org/) templates.  These allow the header, for
-example, to be defined once and incorporated into all pages. By providing
+example, to be defined once and incorporated into all pages.  By providing
 your own templates, you can have complete control over JupyterHub's
 appearance.
 
@@ -10,7 +10,7 @@ appearance.
 
 JupyterHub will look for custom templates in all of the paths in the
 `JupyterHub.template_paths` configuration option, falling back on the
-[default templates](https://github.com/jupyterhub/jupyterhub/tree/HEAD/share/jupyterhub/templates)
+[default templates](https://github.com/jupyterhub/jupyterhub/tree/master/share/jupyterhub/templates)
 if no custom template with that name is found. This fallback
 behavior is new in version 0.9; previous versions searched only those paths
 explicitly included in `template_paths`. You may override as many
@@ -20,8 +20,8 @@ or as few templates as you desire.
 
 Jinja provides a mechanism to [extend templates](http://jinja.pocoo.org/docs/2.10/templates/#template-inheritance).
 A base template can define a `block`, and child templates can replace or
-supplement the material in the block. The
+supplement the material in the block.  The 
-[JupyterHub templates](https://github.com/jupyterhub/jupyterhub/tree/HEAD/share/jupyterhub/templates)
+[JupyterHub templates](https://github.com/jupyterhub/jupyterhub/tree/master/share/jupyterhub/templates)
 make extensive use of blocks, which allows you to customize parts of the
 interface easily.
 
@@ -32,8 +32,8 @@ In general, a child template can extend a base template, `page.html`, by beginni
 ```
 
 This works, unless you are trying to extend the default template for the same
-file name. Starting in version 0.9, you may refer to the base file with a
+file name.  Starting in version 0.9, you may refer to the base file with a
-`templates/` prefix. Thus, if you are writing a custom `page.html`, start the
+`templates/` prefix.  Thus, if you are writing a custom `page.html`, start the
 file with this block:
 
 ```html
@@ -41,7 +41,7 @@ file with this block:
 ```
 
 By defining `block`s with same name as in the base template, child templates
-can replace those sections with custom content. The content from the base
+can replace those sections with custom content.  The content from the base
 template can be included with the `{{ super() }}` directive.
 
 ### Example
@@ -52,7 +52,10 @@ text about the server starting up, place this content in a file named
 `JupyterHub.template_paths` configuration option.
 
 ```html
-{% extends "templates/spawn_pending.html" %} {% block message %} {{ super() }}
+{% extends "templates/spawn_pending.html" %}
+
+{% block message %}
+{{ super() }}
 <p>Patience is a virtue.</p>
 {% endblock %}
 ```
@@ -66,8 +69,9 @@ To add announcements to be displayed on a page, you have two options:
 
 ### Announcement Configuration Variables
 
-If you set the configuration variable `JupyterHub.template_vars = {'announcement': 'some_text'}`, the given `some_text` will be placed on
+If you set the configuration variable `JupyterHub.template_vars =
-the top of all pages. The more specific variables
+{'announcement': 'some_text'}`, the given `some_text` will be placed on
+the top of all pages.  The more specific variables
 `announcement_login`, `announcement_spawn`, `announcement_home`, and
 `announcement_logout` are more specific and only show on their
 respective pages (overriding the global `announcement` variable).
@@ -75,12 +79,13 @@ Note that changing these variables require a restart, unlike direct
 template extension.
 
 You can get the same effect by extending templates, which allows you
-to update the messages without restarting. Set
+to update the messages without restarting.  Set
 `c.JupyterHub.template_paths` as mentioned above, and then create a
 template (for example, `login.html`) with:
 
 ```html
-{% extends "templates/login.html" %} {% set announcement = 'some message' %}
+{% extends "templates/login.html" %}
+{% set announcement = 'some message' %}
 ```
 
 Extending `page.html` puts the message on all pages, but note that

docs/source/reference/urls.md

@@ -11,6 +11,8 @@ All authenticated handlers redirect to `/hub/login` to login users
 prior to being redirected back to the originating page.
 The returned request should preserve all query parameters.
 
+
+
 ## `/`
 
 The top-level request is always a simple redirect to `/hub/`,
@@ -59,7 +61,7 @@ for starting and stopping the user's server.
 If named servers are enabled, there will be some additional
 tools for management of named servers.
 
-_Version added: 1.0_ named server UI is new in 1.0.
+*Version added: 1.0* named server UI is new in 1.0.
 
 ## `/hub/login`
 
@@ -109,7 +111,7 @@ not the Hub.
 The username is the first part and, if using named servers,
 the server name is the second part.
 
-If the user's server is _not_ running, this will be redirected to `/hub/user/:username/...`
+If the user's server is *not* running, this will be redirected to `/hub/user/:username/...`
 
 ## `/hub/user/:username[/:servername]`
 
@@ -121,8 +123,8 @@ Handling this URL is the most complicated condition in JupyterHub,
 because there can be many states:
 
 1. server is not active
-   a. user matches
+  a. user matches
-   b. user doesn't match
+  b. user doesn't match
 2. server is ready
 3. server is pending, but not ready
 
@@ -144,7 +146,7 @@ without additional user action (i.e. clicking the link on the page)
 
 ![Visiting a URL for a server that's not running](../images/not-running.png)
 
-_Version changed: 1.0_
+*Version changed: 1.0*
 
 Prior to 1.0, this URL itself was responsible for spawning servers,
 and served the progress page if it was pending,
@@ -163,7 +165,7 @@ indicating how to spawn the server.
 This is meant to help applications such as JupyterLab
 that are connected to a server that has stopped.
 
-_Version changed: 1.0_
+*Version changed: 1.0*
 
 JupyterHub 0.9 failed these API requests with status 404,
 but 1.0 uses 503.
@@ -205,12 +207,12 @@ and a POST request will trigger the actual spawn and redirect.
 
 ![The spawn form](../images/spawn-form.png)
 
-_Version added: 1.0_
+*Version added: 1.0*
 
 1.0 adds the ability to specify username and servername.
 Prior to 1.0, only `/hub/spawn` was recognized for the default server.
 
-_Version changed: 1.0_
+*Version changed: 1.0*
 
 Prior to 1.0, this page redirected back to `/hub/user/:username`,
 which was responsible for triggering spawn and rendering progress, etc.
@@ -219,7 +221,7 @@ which was responsible for triggering spawn and rendering progress, etc.
 
 ![The spawn pending page](../images/spawn-pending.png)
 
-_Version added: 1.0_ this URL is new in JupyterHub 1.0.
+*Version added: 1.0* this URL is new in JupyterHub 1.0.
 
 This page renders the progress view for the given spawn request.
 Once the server is ready,

docs/source/reference/websecurity.md

@@ -12,17 +12,17 @@ works.
 
 ## Semi-trusted and untrusted users
 
-JupyterHub is designed to be a _simple multi-user server for modestly sized
+JupyterHub is designed to be a *simple multi-user server for modestly sized
-groups_ of **semi-trusted** users. While the design reflects serving semi-trusted
+groups* of **semi-trusted** users. While the design reflects serving semi-trusted
 users, JupyterHub is not necessarily unsuitable for serving **untrusted** users.
 
 Using JupyterHub with **untrusted** users does mean more work by the
 administrator. Much care is required to secure a Hub, with extra caution on
 protecting users from each other as the Hub is serving untrusted users.
 
-One aspect of JupyterHub's _design simplicity_ for **semi-trusted** users is that
+One aspect of JupyterHub's *design simplicity* for **semi-trusted** users is that
-the Hub and single-user servers are placed in a _single domain_, behind a
+the Hub and single-user servers are placed in a *single domain*, behind a
-[_proxy_][configurable-http-proxy]. If the Hub is serving untrusted
+[*proxy*][configurable-http-proxy]. If the Hub is serving untrusted
 users, many of the web's cross-site protections are not applied between
 single-user servers and the Hub, or between single-user servers and each
 other, since browsers see the whole thing (proxy, Hub, and single user
@@ -40,7 +40,7 @@ server.
 To protect all users from each other, JupyterHub administrators must
 ensure that:
 
-- A user **does not have permission** to modify their single-user notebook server,
+* A user **does not have permission** to modify their single-user notebook server,
   including:
   - A user **may not** install new packages in the Python environment that runs
     their single-user server.
@@ -49,11 +49,11 @@ ensure that:
     directory that precedes the directory containing `jupyterhub-singleuser`.
   - A user may not modify environment variables (e.g. PATH, PYTHONPATH) for
     their single-user server.
-- A user **may not** modify the configuration of the notebook server
+* A user **may not** modify the configuration of the notebook server
   (the `~/.jupyter` or `JUPYTER_CONFIG_DIR` directory).
 
 If any additional services are run on the same domain as the Hub, the services
-**must never** display user-authored HTML that is neither _sanitized_ nor _sandboxed_
+**must never** display user-authored HTML that is neither *sanitized* nor *sandboxed*
 (e.g. IFramed) to any user that lacks authentication as the author of a file.
 
 ## Mitigate security issues
@@ -85,7 +85,7 @@ admin must enforce.
 ### Prevent spawners from evaluating shell configuration files
 
 For most Spawners, `PATH` is not something users can influence, but care should
-be taken to ensure that the Spawner does _not_ evaluate shell configuration
+be taken to ensure that the Spawner does *not* evaluate shell configuration
 files prior to launching the server.
 
 ### Isolate packages using virtualenv
@@ -125,6 +125,7 @@ versions up to date.
 A handy website for testing your deployment is
 [Qualsys' SSL analyzer tool](https://www.ssllabs.com/ssltest/analyze.html).
 
+
 [configurable-http-proxy]: https://github.com/jupyterhub/configurable-http-proxy
 
 ## Vulnerability reporting

docs/source/troubleshooting.md

@@ -4,20 +4,17 @@ When troubleshooting, you may see unexpected behaviors or receive an error
 message. This section provide links for identifying the cause of the
 problem and how to resolve it.
 
-[_Behavior_](#behavior)
+[*Behavior*](#behavior)
-
 - JupyterHub proxy fails to start
 - sudospawner fails to run
 - What is the default behavior when none of the lists (admin, allowed,
   allowed groups) are set?
 - JupyterHub Docker container not accessible at localhost
 
-[_Errors_](#errors)
+[*Errors*](#errors)
-
 - 500 error after spawning my single-user server
 
-[_How do I...?_](#how-do-i)
+[*How do I...?*](#how-do-i)
-
 - Use a chained SSL certificate
 - Install JupyterHub without a network connection
 - I want access to the whole filesystem, but still default users to their home directory
@@ -28,7 +25,7 @@ problem and how to resolve it.
 - Toree integration with HDFS rack awareness script
 - Where do I find Docker images and Dockerfiles related to JupyterHub?
 
-[_Troubleshooting commands_](#troubleshooting-commands)
+[*Troubleshooting commands*](#troubleshooting-commands)
 
 ## Behavior
 
@@ -37,8 +34,8 @@ problem and how to resolve it.
 If you have tried to start the JupyterHub proxy and it fails to start:
 
 - check if the JupyterHub IP configuration setting is
-  `c.JupyterHub.ip = '*'`; if it is, try `c.JupyterHub.ip = ''`
+  ``c.JupyterHub.ip = '*'``; if it is, try ``c.JupyterHub.ip = ''``
-- Try starting with `jupyterhub --ip=0.0.0.0`
+- Try starting with ``jupyterhub --ip=0.0.0.0``
 
 **Note**: If this occurs on Ubuntu/Debian, check that the you are using a
 recent version of node. Some versions of Ubuntu/Debian come with a version
@@ -111,7 +108,7 @@ sudo MY_ENV=abc123 \
 
 ### How can I view the logs for JupyterHub or the user's Notebook servers when using the DockerSpawner?
 
-Use `docker logs <container>` where `<container>` is the container name defined within `docker-compose.yml`. For example, to view the logs of the JupyterHub container use:
+Use `docker logs <container>` where `<container>` is the container name defined within `docker-compose.yml`.  For example, to view the logs of the JupyterHub container use:
 
     docker logs hub
 
@@ -135,11 +132,11 @@ There are two likely reasons for this:
 
 1. The single-user server cannot connect to the Hub's API (networking
    configuration problems)
-2. The single-user server cannot _authenticate_ its requests (invalid token)
+2. The single-user server cannot *authenticate* its requests (invalid token)
 
 #### Symptoms
 
-The main symptom is a failure to load _any_ page served by the single-user
+The main symptom is a failure to load *any* page served by the single-user
 server, met with a 500 error. This is typically the first page at `/user/<your_name>`
 after logging in or clicking "Start my server". When a single-user notebook server
 receives a request, the notebook server makes an API request to the Hub to
@@ -201,15 +198,15 @@ your server again.
 
 ##### Proxy settings (403 GET)
 
-When your whole JupyterHub sits behind a organization proxy (_not_ a reverse proxy like NGINX as part of your setup and _not_ the configurable-http-proxy) the environment variables `HTTP_PROXY`, `HTTPS_PROXY`, `http_proxy` and `https_proxy` might be set. This confuses the jupyterhub-singleuser servers: When connecting to the Hub for authorization they connect via the proxy instead of directly connecting to the Hub on localhost. The proxy might deny the request (403 GET). This results in the singleuser server thinking it has a wrong auth token. To circumvent this you should add `<hub_url>,<hub_ip>,localhost,127.0.0.1` to the environment variables `NO_PROXY` and `no_proxy`.
+When your whole JupyterHub sits behind a organization proxy (*not* a reverse proxy like NGINX as part of your setup and *not* the configurable-http-proxy) the environment variables `HTTP_PROXY`, `HTTPS_PROXY`, `http_proxy` and `https_proxy` might be set. This confuses the jupyterhub-singleuser servers: When connecting to the Hub for authorization they connect via the proxy instead of directly connecting to the Hub on localhost. The proxy might deny the request (403 GET). This results in the singleuser server thinking it has a wrong auth token. To circumvent this you should add `<hub_url>,<hub_ip>,localhost,127.0.0.1` to the environment variables `NO_PROXY` and `no_proxy`.
 
 ### Launching Jupyter Notebooks to run as an externally managed JupyterHub service with the `jupyterhub-singleuser` command returns a `JUPYTERHUB_API_TOKEN` error
 
 [JupyterHub services](https://jupyterhub.readthedocs.io/en/stable/reference/services.html) allow processes to interact with JupyterHub's REST API. Example use-cases include:
 
-- **Secure Testing**: provide a canonical Jupyter Notebook for testing production data to reduce the number of entry points into production systems.
+* **Secure Testing**: provide a canonical Jupyter Notebook for testing production data to reduce the number of entry points into production systems.
-- **Grading Assignments**: provide access to shared Jupyter Notebooks that may be used for management tasks such grading assignments.
+* **Grading Assignments**: provide access to shared Jupyter Notebooks that may be used for management tasks such grading assignments.
-- **Private Dashboards**: share dashboards with certain group members.
+* **Private Dashboards**: share dashboards with certain group members.
 
 If possible, try to run the Jupyter Notebook as an externally managed service with one of the provided [jupyter/docker-stacks](https://github.com/jupyter/docker-stacks).
 
@@ -234,7 +231,7 @@ With a docker container, pass in the environment variable with the run command:
       -e JUPYTERHUB_API_TOKEN=my_secret_token \
       jupyter/datascience-notebook:latest
 
-[This example](https://github.com/jupyterhub/jupyterhub/tree/HEAD/examples/service-notebook/external) demonstrates how to combine the use of the `jupyterhub-singleuser` environment variables when launching a Notebook as an externally managed service.
+[This example](https://github.com/jupyterhub/jupyterhub/tree/master/examples/service-notebook/external) demonstrates how to combine the use of the `jupyterhub-singleuser` environment variables when launching a Notebook as an externally managed service.
 
 ## How do I...?
 
@@ -253,6 +250,7 @@ You would then set in your `jupyterhub_config.py` file the `ssl_key` and
     c.JupyterHub.ssl_cert = your_host-chained.crt
     c.JupyterHub.ssl_key = your_host.key
 
+
 #### Example
 
 Your certificate provider gives you the following files: `example_host.crt`,
@@ -404,8 +402,8 @@ SyntaxError: Missing parentheses in call to 'print'
 In order to resolve this issue, there are two potential options.
 
 1. Update HDFS core-site.xml, so the parameter "net.topology.script.file.name" points to a custom
-   script (e.g. /etc/hadoop/conf/custom_topology_script.py). Copy the original script and change the first line point
+script (e.g. /etc/hadoop/conf/custom_topology_script.py). Copy the original script and change the first line point
-   to a python two installation (e.g. /usr/bin/python).
+to a python two installation (e.g. /usr/bin/python).
 2. In spark-env.sh add a Python 2 installation to your path (e.g. export PATH=/opt/anaconda2/bin:$PATH).
 
 ### Where do I find Docker images and Dockerfiles related to JupyterHub?

examples/bootstrap-script/README.md

@@ -5,22 +5,22 @@ do some preparation work in a bootstrapping process.
 
 Common use cases are:
 
-_Providing writeable storage for LDAP users_
+*Providing writeable storage for LDAP users*
 
 Your Jupyterhub is configured to use the LDAPAuthenticator and DockerSpawer.
 
-- The user has no file directory on the host since your are using LDAP.
+* The user has no file directory on the host since your are using LDAP.
-- When a user has no directory and DockerSpawner wants to mount a volume,
+* When a user has no directory and DockerSpawner wants to mount a volume,
-  the spawner will use docker to create a directory.
+the spawner will use docker to create a directory.
-  Since the docker daemon is running as root, the generated directory for the volume
+Since the docker daemon is running as root, the generated directory for the volume 
-  mount will not be writeable by the `jovyan` user inside of the container.
+mount will not be writeable by the `jovyan` user inside of the container. 
-  For the directory to be useful to the user, the permissions on the directory
+For the directory to be useful to the user, the permissions on the directory 
-  need to be modified for the user to have write access.
+need to be modified for the user to have write access.
 
-_Prepopulating Content_
+*Prepopulating Content*
 
 Another use would be to copy initial content, such as tutorial files or reference
-material, into the user's space when a notebook server is newly spawned.
+ material, into the user's space when a notebook server is newly spawned.
 
 You can define your own bootstrap process by implementing a `pre_spawn_hook` on any spawner.
 The Spawner itself is passed as parameter to your hook and you can easily get the contextual information out of the spawning process. 
@@ -28,7 +28,7 @@ The Spawner itself is passed as parameter to your hook and you can easily get th
 Similarly, there may be cases where you would like to clean up after a spawner stops.
 You may implement a `post_stop_hook` that is always executed after the spawner stops.
 
-If you implement a hook, make sure that it is _idempotent_. It will be executed every time
+If you implement a hook, make sure that it is *idempotent*. It will be executed every time
 a notebook server is spawned to the user. That means you should somehow
 ensure that things which should run only once are not running again and again.
 For example, before you create a directory, check if it exists.
@@ -148,9 +148,9 @@ else
     echo "...initial content loading for user ..."
     mkdir $USER_DIRECTORY/tutorials
     cd $USER_DIRECTORY/tutorials
-    wget https://github.com/jakevdp/PythonDataScienceHandbook/archive/HEAD.zip
+    wget https://github.com/jakevdp/PythonDataScienceHandbook/archive/master.zip
-    unzip -o HEAD.zip
+    unzip -o master.zip
-    rm HEAD.zip
+    rm master.zip
 fi
 
 exit 0

examples/bootstrap-script/bootstrap.sh

@@ -40,9 +40,9 @@ else
     echo "...initial content loading for user ..."
     mkdir $USER_DIRECTORY/tutorials
     cd $USER_DIRECTORY/tutorials
-    wget https://github.com/jakevdp/PythonDataScienceHandbook/archive/HEAD.zip
+    wget https://github.com/jakevdp/PythonDataScienceHandbook/archive/master.zip
-    unzip -o HEAD.zip
+    unzip -o master.zip
-    rm HEAD.zip
+    rm master.zip
 fi
 
 exit 0

examples/bootstrap-script/jupyterhub_config.py

@@ -10,7 +10,7 @@ from jupyter_client.localinterfaces import public_ips
 
 
 def create_dir_hook(spawner):
-    """Create directory"""
+    """ Create directory """
     username = spawner.user.name  # get the username
     volume_path = os.path.join('/volumes/jupyterhub', username)
     if not os.path.exists(volume_path):
@@ -20,7 +20,7 @@ def create_dir_hook(spawner):
 
 
 def clean_dir_hook(spawner):
-    """Delete directory"""
+    """ Delete directory """
     username = spawner.user.name  # get the username
     temp_path = os.path.join('/volumes/jupyterhub', username, 'temp')
     if os.path.exists(temp_path) and os.path.isdir(temp_path):

examples/external-oauth/README.md

@@ -16,62 +16,63 @@ implementations in other web servers or languages.
 
 ## Run the example
 
-1.  generate an API token:
+1. generate an API token:
 
         export JUPYTERHUB_API_TOKEN=$(openssl rand -hex 32)
 
-2.  launch a version of the the whoami service.
+2. launch a version of the the whoami service.
-    For `whoami-oauth`:
+   For `whoami-oauth`:
 
-         bash launch-service.sh &
+        bash launch-service.sh &
 
     or for `whoami-oauth-basic`:
 
-         bash launch-service-basic.sh &
+        bash launch-service-basic.sh &
 
-3.  Launch JupyterHub:
+3. Launch JupyterHub:
 
         jupyterhub
 
-4.  Visit http://127.0.0.1:5555/
+4. Visit http://127.0.0.1:5555/
 
 After logging in with your local-system credentials, you should see a JSON dump of your user info:
 
 ```json
 {
-  "admin": false,
+ "admin": false,
-  "last_activity": "2016-05-27T14:05:18.016372",
+ "last_activity": "2016-05-27T14:05:18.016372",
-  "name": "queequeg",
+ "name": "queequeg",
-  "pending": null,
+ "pending": null,
-  "server": "/user/queequeg"
+ "server": "/user/queequeg"
 }
 ```
 
+
 The essential pieces for using JupyterHub as an OAuth provider are:
 
 1. registering your service with jupyterhub:
 
-   ```python
+    ```python
-   c.JupyterHub.services = [
+    c.JupyterHub.services = [
-       {
+        {
-           # the name of your service
+            # the name of your service
-           # should be simple and unique.
+            # should be simple and unique.
-           # mostly used to identify your service in logging
+            # mostly used to identify your service in logging
-           "name": "my-service",
+            "name": "my-service",
-           # the oauth client id of your service
+            # the oauth client id of your service
-           # must be unique but isn't private
+            # must be unique but isn't private
-           # can be randomly generated or hand-written
+            # can be randomly generated or hand-written
-           "oauth_client_id": "abc123",
+            "oauth_client_id": "abc123",
-           # the API token and client secret of the service
+            # the API token and client secret of the service
-           # should be generated securely,
+            # should be generated securely,
-           # e.g. via `openssl rand -hex 32`
+            # e.g. via `openssl rand -hex 32`
-           "api_token": "abc123...",
+            "api_token": "abc123...",
-           # the redirect target for jupyterhub to send users
+            # the redirect target for jupyterhub to send users
-           # after successful authentication
+            # after successful authentication
-           "oauth_redirect_uri": "https://service-host/oauth_callback"
+            "oauth_redirect_uri": "https://service-host/oauth_callback"
-       }
+        }
-   ]
+    ]
-   ```
+    ```
 
 2. Telling your service how to authenticate with JupyterHub.
 

examples/postgres/README.md

@@ -4,14 +4,14 @@ This example shows how you can connect Jupyterhub to a Postgres database
 instead of the default SQLite backend.
 
 ### Running Postgres with Jupyterhub on the host.
-
 0. Uncomment and replace `ENV JPY_PSQL_PASSWORD arglebargle` with your own
    password in the Dockerfile for `examples/postgres/db`. (Alternatively, pass
    -e `JPY_PSQL_PASSWORD=<password>` when you start the db container.)
 
 1. `cd` to the root of your jupyterhub repo.
 
-2. Build the postgres image with `docker build -t jupyterhub-postgres-db examples/postgres/db`. This may take a minute or two the first time it's
+2. Build the postgres image with `docker build -t jupyterhub-postgres-db
+   examples/postgres/db`.  This may take a minute or two the first time it's
    run.
 
 3. Run the db image with `docker run -d -p 5433:5432 jupyterhub-postgres-db`.
@@ -24,22 +24,24 @@ instead of the default SQLite backend.
 5. Log in as the user running jupyterhub on your host machine.
 
 ### Running Postgres with Containerized Jupyterhub.
-
 0. Do steps 0-2 in from the above section, ensuring that the values set/passed
    for `JPY_PSQL_PASSWORD` match for the hub and db containers.
 
-1. Build the hub image with `docker build -t jupyterhub-postgres-hub examples/postgres/hub`. This may take a minute or two the first time it's
+1. Build the hub image with `docker build -t jupyterhub-postgres-hub
+   examples/postgres/hub`.  This may take a minute or two the first time it's
    run.
 
-2. Run the db image with `docker run -d --name=jpy-db jupyterhub-postgres`. Note that, unlike when connecting to a host machine
+2. Run the db image with `docker run -d --name=jpy-db
+   jupyterhub-postgres`. Note that, unlike when connecting to a host machine
    jupyterhub, we don't specify a port-forwarding scheme here, but we do need
    to specify a name for the container.
 
-3. Run the containerized hub with `docker run -it --link jpy-db:postgres jupyterhub-postgres-hub`. This instructs docker to run the hub container
+3. Run the containerized hub with `docker run -it --link jpy-db:postgres
+   jupyterhub-postgres-hub`.  This instructs docker to run the hub container
    with a link to the already-running db container, which will forward
    environment and connection information from the DB to the hub.
 
 4. Log in as one of the users defined in the `examples/postgres/hub/`
-   Dockerfile. By default `rhea` is the server's admin user, `io` and
+   Dockerfile.  By default `rhea` is the server's admin user, `io` and
    `ganymede` are non-admin users, and all users' passwords are their
    usernames.

examples/service-announcement/README.md

@@ -1,3 +1,4 @@
+
 # Simple Announcement Service Example
 
 This is a simple service that allows administrators to manage announcements
@@ -15,10 +16,10 @@ configuration file something like:
     ]
 
 This starts the announcements service up at `/services/announcement` when
-JupyterHub launches. By default the announcement text is empty.
+JupyterHub launches.  By default the announcement text is empty.
 
 The `announcement` module has a configurable port (default 8888) and an API
-prefix setting. By default the API prefix is `JUPYTERHUB_SERVICE_PREFIX` if
+prefix setting.  By default the API prefix is `JUPYTERHUB_SERVICE_PREFIX` if
 that environment variable is set or `/` if it is not.
 
 ## Managing the Announcement
@@ -26,7 +27,7 @@ that environment variable is set or `/` if it is not.
 Admin users can set the announcement text with an API token:
 
     $ curl -X POST -H "Authorization: token <token>"                        \
-        -d '{"announcement":"JupyterHub will be upgraded on August 14!"}'   \
+        -d "{'announcement':'JupyterHub will be upgraded on August 14!'}"   \
         https://.../services/announcement
 
 Anyone can read the announcement:
@@ -41,7 +42,7 @@ Anyone can read the announcement:
 The time the announcement was posted is recorded in the `timestamp` field and
 the user who posted the announcement is recorded in the `user` field.
 
-To clear the announcement text, just DELETE. Only admin users can do this.
+To clear the announcement text, just DELETE.  Only admin users can do this.
 
     $ curl -X POST -H "Authorization: token <token>"                        \
         https://.../services/announcement
@@ -49,11 +50,11 @@ To clear the announcement text, just DELETE. Only admin users can do this.
 ## Seeing the Announcement in JupyterHub
 
 To be able to render the announcement, include the provide `page.html` template
-that extends the base `page.html` template. Set `c.JupyterHub.template_paths`
+that extends the base `page.html` template.  Set `c.JupyterHub.template_paths`
 in JupyterHub's configuration to include the path to the extending template.
 The template changes the `announcement` element and does a JQuery `$.get()` call
 to retrieve the announcement text.
 
 JupyterHub's configurable announcement template variables can be set for various
-pages like login, logout, spawn, and home. Including the template provided in
+pages like login, logout, spawn, and home.  Including the template provided in
 this example overrides all of those.

examples/service-announcement/templates/page.html

@@ -1,9 +1,14 @@
-{% extends "templates/page.html" %} {% block announcement %}
+{% extends "templates/page.html" %}
-<div class="container text-center announcement"></div>
+{% block announcement %}
-{% endblock %} {% block script %} {{ super() }}
+<div class="container text-center announcement">
+</div>
+{% endblock %}
+
+{% block script %}
+{{ super() }}
 <script>
-  $.get("/services/announcement/", function (data) {
+$.get("/services/announcement/", function(data) {
     $(".announcement").html(data["announcement"]);
-  });
+});
 </script>
 {% endblock %}

examples/service-fastapi/Dockerfile

@@ -1,13 +0,0 @@
-FROM jupyterhub/jupyterhub
-
-# Create test user (PAM auth) and install single-user Jupyter 
-RUN useradd testuser --create-home --shell /bin/bash
-RUN echo 'testuser:passwd' | chpasswd
-RUN pip install jupyter 
-
-COPY app ./app
-COPY jupyterhub_config.py .
-COPY requirements.txt /tmp/requirements.txt
-RUN pip install -r /tmp/requirements.txt
-
-CMD ["jupyterhub", "--ip", "0.0.0.0"]

examples/service-fastapi/README.md

@@ -1,107 +0,0 @@
-# Fastapi
-
-[FastAPI](https://fastapi.tiangolo.com/) is a popular new web framework attractive for its type hinting, async support, automatic doc generation (Swagger), and more. Their [Feature highlights](https://fastapi.tiangolo.com/features/) sum it up nicely.
-
-# Swagger UI with OAuth demo
-
-![Fastapi Service Example](./fastapi_example.gif)
-
-# Try it out locally
-
-1. Install `fastapi` and other dependencies, then launch Jupyterhub
-
-```
-pip install -r requirements.txt
-jupyterhub --ip=127.0.0.1
-```
-
-2. Visit http://127.0.0.1:8000/services/fastapi or http://127.0.0.1:8000/services/fastapi/docs
-
-3. Try interacting programmatically. If you create a new token in your control panel or pull out the `JUPYTERHUB_API_TOKEN` in the single user environment, you can skip the third step here.
-
-```
-$ curl -X GET http://127.0.0.1:8000/services/fastapi/
-{"Hello":"World"}
-
-$ curl -X GET http://127.0.0.1:8000/services/fastapi/me
-{"detail":"Must login with token parameter, cookie, or header"}
-
-$ curl -X POST http://127.0.0.1:8000/hub/api/authorizations/token \
-       -d '{"username": "myname", "password": "mypasswd!"}' \
-       | jq '.token'
-"3fee13ce6d2845da9bd5f2c2170d3428"
-
-$ curl -X GET http://127.0.0.1:8000/services/fastapi/me \
-       -H "Authorization: Bearer 3fee13ce6d2845da9bd5f2c2170d3428" \
-       | jq .
-{
-  "name": "myname",
-  "admin": false,
-  "groups": [],
-  "server": null,
-  "pending": null,
-  "last_activity": "2021-04-07T18:05:11.587638+00:00",
-  "servers": null
-}
-```
-
-# Try it out in Docker
-
-1. Build and run the Docker image locally
-
-```bash
-sudo docker build . -t service-fastapi
-sudo docker run -it -p 8000:8000 service-fastapi
-```
-
-2. Visit http://127.0.0.1:8000/services/fastapi/docs. When going through the OAuth flow or getting a token from the control panel, you can log in with `testuser` / `passwd`.
-
-# PUBLIC_HOST
-
-If you are running your service behind a proxy, or on a Docker / Kubernetes infrastructure, you might run into an error during OAuth that says `Mismatching redirect URI`. In the Jupterhub logs, there will be a warning along the lines of: `[W 2021-04-06 23:40:06.707 JupyterHub provider:498] Redirect uri https://jupyterhub.my.cloud/services/fastapi/oauth_callback != /services/fastapi/oauth_callback`. This happens because Swagger UI adds the request host, as seen in the browser, to the Authorization URL.
-
-To solve that problem, the `oauth_redirect_uri` value in the service initialization needs to match what Swagger will auto-generate and what the service will use when POST'ing to `/oauth2/token`. In this example, setting the `PUBLIC_HOST` environment variable to your public-facing Hub domain (e.g. `https://jupyterhub.my.cloud`) should make it work.
-
-# Notes on security.py
-
-FastAPI has a concept of a [dependency injection](https://fastapi.tiangolo.com/tutorial/dependencies) using a `Depends` object (and a subclass `Security`) that is automatically instantiated/executed when it is a parameter for your endpoint routes. You can utilize a `Depends` object for re-useable common parameters or authentication mechanisms like the [`get_user`](https://fastapi.tiangolo.com/tutorial/security/get-current-user) pattern.
-
-JupyterHub OAuth has three ways to authenticate: a `token` url parameter; a `Authorization: Bearer <token>` header; and a (deprecated) `jupyterhub-services` cookie. FastAPI has helper functions that let us create `Security` (dependency injection) objects for each of those. When you need to allow multiple / optional authentication dependencies (`Security` objects), then you can use the argument `auto_error=False` and it will return `None` instead of raising an `HTTPException`.
-
-Endpoints that need authentication (`/me` and `/debug` in this example) can leverage the `get_user` pattern and effectively pull the user model from the Hub API when a request has authenticated with cookie / token / header all using the simple syntax,
-
-```python
-from .security import get_current_user
-from .models import User
-
-@router.get("/new_endpoint")
-async def new_endpoint(user: User = Depends(get_current_user)):
-    "Function that needs to work with an authenticated user"
-    return {"Hello": user.name}
-```
-
-# Notes on client.py
-
-FastAPI is designed to be an asynchronous web server, so the interactions with the Hub API should be made asynchronously as well. Instead of using `requests` to get user information from a token/cookie, this example uses [`httpx`](https://www.python-httpx.org/). `client.py` defines a small function that creates a `Client` (equivalent of `requests.Session`) with the Hub API url as it's `base_url` and adding the `JUPYTERHUB_API_TOKEN` to every header.
-
-Consider this a very minimal alternative to using `jupyterhub.services.auth.HubOAuth`
-
-```python
-# client.py
-import os
-
-def get_client():
-    base_url = os.environ["JUPYTERHUB_API_URL"]
-    token = os.environ["JUPYTERHUB_API_TOKEN"]
-    headers = {"Authorization": "Bearer %s" % token}
-    return httpx.AsyncClient(base_url=base_url, headers=headers)
-```
-
-```python
-# other modules
-from .client import get_client
-
-async with get_client() as client:
-    resp = await client.get('/endpoint')
-    ...
-```

examples/service-fastapi/app/__init__.py

@@ -1 +0,0 @@
-from .app import app

examples/service-fastapi/app/app.py

@@ -1,25 +0,0 @@
-import os
-
-from fastapi import FastAPI
-
-from .service import router
-
-### When managed by Jupyterhub, the actual endpoints
-### will be served out prefixed by /services/:name.
-### One way to handle this with FastAPI is to use an APIRouter.
-### All routes are defined in service.py
-
-app = FastAPI(
-    title="Example FastAPI Service",
-    version="0.1",
-    ### Serve out Swagger from the service prefix (<hub>/services/:name/docs)
-    openapi_url=router.prefix + "/openapi.json",
-    docs_url=router.prefix + "/docs",
-    redoc_url=router.prefix + "/redoc",
-    ### Add our service client id to the /docs Authorize form automatically
-    swagger_ui_init_oauth={"clientId": os.environ["JUPYTERHUB_CLIENT_ID"]},
-    ### Default /docs/oauth2 redirect will cause Hub
-    ### to raise oauth2 redirect uri mismatch errors
-    swagger_ui_oauth2_redirect_url=os.environ["JUPYTERHUB_OAUTH_CALLBACK_URL"],
-)
-app.include_router(router)

examples/service-fastapi/app/client.py

@@ -1,11 +0,0 @@
-import os
-
-import httpx
-
-
-# a minimal alternative to using HubOAuth class
-def get_client():
-    base_url = os.environ["JUPYTERHUB_API_URL"]
-    token = os.environ["JUPYTERHUB_API_TOKEN"]
-    headers = {"Authorization": "Bearer %s" % token}
-    return httpx.AsyncClient(base_url=base_url, headers=headers)

examples/service-fastapi/app/models.py

@@ -1,46 +0,0 @@
-from datetime import datetime
-from typing import Any
-from typing import List
-from typing import Optional
-
-from pydantic import BaseModel
-
-
-# https://jupyterhub.readthedocs.io/en/stable/_static/rest-api/index.html
-class Server(BaseModel):
-    name: str
-    ready: bool
-    pending: Optional[str]
-    url: str
-    progress_url: str
-    started: datetime
-    last_activity: datetime
-    state: Optional[Any]
-    user_options: Optional[Any]
-
-
-class User(BaseModel):
-    name: str
-    admin: bool
-    groups: List[str]
-    server: Optional[str]
-    pending: Optional[str]
-    last_activity: datetime
-    servers: Optional[List[Server]]
-
-
-# https://stackoverflow.com/questions/64501193/fastapi-how-to-use-httpexception-in-responses
-class AuthorizationError(BaseModel):
-    detail: str
-
-
-class HubResponse(BaseModel):
-    msg: str
-    request_url: str
-    token: str
-    response_code: int
-    hub_response: dict
-
-
-class HubApiError(BaseModel):
-    detail: HubResponse

examples/service-fastapi/app/security.py

@@ -1,61 +0,0 @@
-import os
-
-from fastapi import HTTPException
-from fastapi import Security
-from fastapi import status
-from fastapi.security import OAuth2AuthorizationCodeBearer
-from fastapi.security.api_key import APIKeyQuery
-
-from .client import get_client
-from .models import User
-
-### Endpoints can require authentication using Depends(get_current_user)
-### get_current_user will look for a token in url params or
-### Authorization: bearer token (header).
-### Hub technically supports cookie auth too, but it is deprecated so
-### not being included here.
-auth_by_param = APIKeyQuery(name="token", auto_error=False)
-
-auth_url = os.environ["PUBLIC_HOST"] + "/hub/api/oauth2/authorize"
-auth_by_header = OAuth2AuthorizationCodeBearer(
-    authorizationUrl=auth_url, tokenUrl="get_token", auto_error=False
-)
-### ^^ The flow for OAuth2 in Swagger is that the "authorize" button
-### will redirect user (browser) to "auth_url", which is the Hub login page.
-### After logging in, the browser will POST to our internal /get_token endpoint
-### with the auth code.  That endpoint POST's to Hub /oauth2/token with
-### our client_secret (JUPYTERHUB_API_TOKEN) and that code to get an
-### access_token, which it returns to browser, which places in Authorization header.
-
-### For consideration: optimize performance with a cache instead of
-### always hitting the Hub api?
-async def get_current_user(
-    auth_by_param: str = Security(auth_by_param),
-    auth_by_header: str = Security(auth_by_header),
-):
-    token = auth_by_param or auth_by_header
-    if token is None:
-        raise HTTPException(
-            status.HTTP_401_UNAUTHORIZED,
-            detail="Must login with token parameter or Authorization bearer header",
-        )
-
-    async with get_client() as client:
-        endpoint = "/user"
-        # normally we auth to Hub API with service api token,
-        # but this time auth as the user token to get user model
-        headers = {"Authorization": f"Bearer {token}"}
-        resp = await client.get(endpoint, headers=headers)
-        if resp.is_error:
-            raise HTTPException(
-                status.HTTP_400_BAD_REQUEST,
-                detail={
-                    "msg": "Error getting user info from token",
-                    "request_url": str(resp.request.url),
-                    "token": token,
-                    "response_code": resp.status_code,
-                    "hub_response": resp.json(),
-                },
-            )
-    user = User(**resp.json())
-    return user

examples/service-fastapi/app/service.py

@@ -1,70 +0,0 @@
-import os
-
-from fastapi import APIRouter
-from fastapi import Depends
-from fastapi import Form
-from fastapi import Request
-
-from .client import get_client
-from .models import AuthorizationError
-from .models import HubApiError
-from .models import User
-from .security import get_current_user
-
-# APIRouter prefix cannot end in /
-service_prefix = os.getenv("JUPYTERHUB_SERVICE_PREFIX", "").rstrip("/")
-router = APIRouter(prefix=service_prefix)
-
-
-@router.post("/get_token", include_in_schema=False)
-async def get_token(code: str = Form(...)):
-    "Callback function for OAuth2AuthorizationCodeBearer scheme"
-    # The only thing we need in this form post is the code
-    # Everything else we can hardcode / pull from env
-    async with get_client() as client:
-        redirect_uri = (
-            os.environ["PUBLIC_HOST"] + os.environ["JUPYTERHUB_OAUTH_CALLBACK_URL"],
-        )
-        data = {
-            "client_id": os.environ["JUPYTERHUB_CLIENT_ID"],
-            "client_secret": os.environ["JUPYTERHUB_API_TOKEN"],
-            "grant_type": "authorization_code",
-            "code": code,
-            "redirect_uri": redirect_uri,
-        }
-        resp = await client.post("/oauth2/token", data=data)
-    ### resp.json() is {'access_token': <token>, 'token_type': 'Bearer'}
-    return resp.json()
-
-
-@router.get("/")
-async def index():
-    "Non-authenticated function that returns {'Hello': 'World'}"
-    return {"Hello": "World"}
-
-
-# response_model and responses dict translate to OpenAPI (Swagger) hints
-# compare and contrast what the /me endpoint looks like in Swagger vs /debug
-@router.get(
-    "/me",
-    response_model=User,
-    responses={401: {'model': AuthorizationError}, 400: {'model': HubApiError}},
-)
-async def me(user: User = Depends(get_current_user)):
-    "Authenticated function that returns the User model"
-    return user
-
-
-@router.get("/debug")
-async def index(request: Request, user: User = Depends(get_current_user)):
-    """
-    Authenticated function that returns a few pieces of debug
-     * Environ of the service process
-     * Request headers
-     * User model
-    """
-    return {
-        "env": dict(os.environ),
-        "headers": dict(request.headers),
-        "user": user,
-    }

examples/service-fastapi/jupyterhub_config.py

@@ -1,31 +0,0 @@
-import os
-import warnings
-
-# When Swagger performs OAuth2 in the browser, it will set
-# the request host + relative path as the redirect uri, causing a
-# uri mismatch if the oauth_redirect_uri is just the relative path
-# is set in the c.JupyterHub.services entry (as per default).
-# Therefore need to know the request host ahead of time.
-if "PUBLIC_HOST" not in os.environ:
-    msg = (
-        "env PUBLIC_HOST is not set, defaulting to http://127.0.0.1:8000.  "
-        "This can cause problems with OAuth.  "
-        "Set PUBLIC_HOST to your public (browser accessible) host."
-    )
-    warnings.warn(msg)
-    public_host = "http://127.0.0.1:8000"
-else:
-    public_host = os.environ["PUBLIC_HOST"].rstrip('/')
-service_name = "fastapi"
-oauth_redirect_uri = f"{public_host}/services/{service_name}/oauth_callback"
-
-c.JupyterHub.services = [
-    {
-        "name": service_name,
-        "url": "http://127.0.0.1:10202",
-        "command": ["uvicorn", "app:app", "--port", "10202"],
-        "admin": True,
-        "oauth_redirect_uri": oauth_redirect_uri,
-        "environment": {"PUBLIC_HOST": public_host},
-    }
-]

examples/service-fastapi/requirements.txt

@@ -1,4 +0,0 @@
-fastapi
-httpx
-python-multipart
-uvicorn

examples/service-notebook/README.md

@@ -17,8 +17,8 @@ and the name of the shared-notebook service.
 
 In the external example, some extra steps are required to set up supervisor:
 
-1. select a system user to run the service. This is a user on the system, and does not need to be a Hub user. Add this to the user field in `shared-notebook.conf`, replacing `someuser`.
+1. select a system user to run the service. This is  a user on the system, and does not need to be a Hub user. Add this to the user field in `shared-notebook.conf`, replacing `someuser`.
 2. generate a secret token for authentication, and replace the `super-secret` fields in `shared-notebook-service` and `jupyterhub_config.py`
 3. install `shared-notebook-service` somewhere on your system, and update `/path/to/shared-notebook-service` to the absolute path of this destination
-4. copy `shared-notebook.conf` to `/etc/supervisor/conf.d/`
+3. copy `shared-notebook.conf` to `/etc/supervisor/conf.d/`
-5. `supervisorctl reload`
+4. `supervisorctl reload`

examples/service-whoami-flask/README.md

@@ -4,21 +4,21 @@ Uses `jupyterhub.services.HubAuth` to authenticate requests with the Hub in a [f
 
 ## Run
 
-1.  Launch JupyterHub and the `whoami service` with
+1. Launch JupyterHub and the `whoami service` with
 
         jupyterhub --ip=127.0.0.1
 
-2.  Visit http://127.0.0.1:8000/services/whoami/ or http://127.0.0.1:8000/services/whoami-oauth/
+2. Visit http://127.0.0.1:8000/services/whoami/ or http://127.0.0.1:8000/services/whoami-oauth/
 
 After logging in with your local-system credentials, you should see a JSON dump of your user info:
 
 ```json
 {
-  "admin": false,
+ "admin": false,
-  "last_activity": "2016-05-27T14:05:18.016372",
+ "last_activity": "2016-05-27T14:05:18.016372",
-  "name": "queequeg",
+ "name": "queequeg",
-  "pending": null,
+ "pending": null,
-  "server": "/user/queequeg"
+ "server": "/user/queequeg"
 }
 ```
 
@@ -29,4 +29,5 @@ A similar service could be run externally, by setting the JupyterHub service env
     JUPYTERHUB_API_TOKEN
     JUPYTERHUB_SERVICE_PREFIX
 
+
 [flask]: http://flask.pocoo.org

examples/service-whoami/README.md

@@ -6,21 +6,21 @@ There is an implementation each of cookie-based `HubAuthenticated` and OAuth-bas
 
 ## Run
 
-1.  Launch JupyterHub and the `whoami service` with
+1. Launch JupyterHub and the `whoami service` with
 
         jupyterhub --ip=127.0.0.1
 
-2.  Visit http://127.0.0.1:8000/services/whoami or http://127.0.0.1:8000/services/whoami-oauth
+2. Visit http://127.0.0.1:8000/services/whoami or http://127.0.0.1:8000/services/whoami-oauth
 
 After logging in with your local-system credentials, you should see a JSON dump of your user info:
 
 ```json
 {
-  "admin": false,
+ "admin": false,
-  "last_activity": "2016-05-27T14:05:18.016372",
+ "last_activity": "2016-05-27T14:05:18.016372",
-  "name": "queequeg",
+ "name": "queequeg",
-  "pending": null,
+ "pending": null,
-  "server": "/user/queequeg"
+ "server": "/user/queequeg"
 }
 ```
 

hooks/README.md

@@ -0,0 +1,3 @@
+# Docker Cloud build hooks
+
+These are the hooks

hooks/post_build

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -exuo pipefail
+
+# build jupyterhub-onbuild image
+docker build --build-arg BASE_IMAGE=$DOCKER_REPO:$DOCKER_TAG -t ${DOCKER_REPO}-onbuild:$DOCKER_TAG onbuild
+# build jupyterhub-demo image
+docker build --build-arg BASE_IMAGE=${DOCKER_REPO}-onbuild:$DOCKER_TAG -t ${DOCKER_REPO}-demo:$DOCKER_TAG demo-image

hooks/post_push

@@ -0,0 +1,42 @@
+#!/bin/bash
+set -exuo pipefail
+
+export ONBUILD=${DOCKER_REPO}-onbuild
+export DEMO=${DOCKER_REPO}-demo
+export REPOS="${DOCKER_REPO} ${ONBUILD} ${DEMO}"
+# push ONBUILD image
+docker push $ONBUILD:$DOCKER_TAG
+docker push $DEMO:$DOCKER_TAG
+
+function get_hub_version() {
+  rm -f hub_version
+  docker run --rm -v $PWD:/version -u $(id -u) -i $DOCKER_REPO:$DOCKER_TAG sh -c 'jupyterhub --version > /version/hub_version'
+  hub_xyz=$(cat hub_version)
+  split=( ${hub_xyz//./ } )
+  hub_xy="${split[0]}.${split[1]}"
+  # add .dev on hub_xy so it's 1.0.dev
+  if [[ ! -z "${split[3]:-}" ]]; then
+    hub_xy="${hub_xy}.${split[3]}"
+    latest=0
+  else
+    latest=1
+  fi
+}
+
+get_hub_version
+
+for repo in ${REPOS}; do
+  # when building master, push 0.9.0.dev as well
+  docker tag $repo:$DOCKER_TAG $repo:$hub_xyz
+  docker push $repo:$hub_xyz
+
+  # when building 0.9.x, push 0.9 as well
+  docker tag $repo:$DOCKER_TAG $repo:$hub_xy
+  docker push $repo:$hub_xy
+
+  # if building a stable release, tag latest as well
+  if [[ "$latest" == "1" ]]; then
+    docker tag $repo:$DOCKER_TAG $repo:latest
+    docker push $repo:latest
+  fi
+done

jupyterhub/_version.py

@@ -4,8 +4,8 @@
 
 version_info = (
     1,
-    5,
+    2,
-    1,
+    2,
     "",  # release (b1, rc1, or "" for final or dev)
     # "dev",  # dev or nothing for beta/rc/stable releases
 )

jupyterhub/alembic/versions/1cebaf56856c_session_id.py

@@ -23,7 +23,7 @@ tables = ('oauth_access_tokens', 'oauth_codes')
 
 def add_column_if_table_exists(table, column):
     engine = op.get_bind().engine
-    if table not in sa.inspect(engine).get_table_names():
+    if table not in engine.table_names():
         # table doesn't exist, no need to upgrade
         # because jupyterhub will create it on launch
         logger.warning("Skipping upgrade of absent table: %s", table)

jupyterhub/alembic/versions/4dc2d5a8c53c_user_options.py

@@ -17,8 +17,7 @@ from jupyterhub.orm import JSONDict
 
 
 def upgrade():
-    engine = op.get_bind().engine
+    tables = op.get_bind().engine.table_names()
-    tables = sa.inspect(engine).get_table_names()
     if 'spawners' in tables:
         op.add_column('spawners', sa.Column('user_options', JSONDict()))
 

jupyterhub/alembic/versions/56cc5a70207e_token_tracking.py

@@ -20,8 +20,7 @@ logger = logging.getLogger('alembic')
 
 
 def upgrade():
-    engine = op.get_bind().engine
+    tables = op.get_bind().engine.table_names()
-    tables = sa.inspect(engine).get_table_names()
     op.add_column('api_tokens', sa.Column('created', sa.DateTime(), nullable=True))
     op.add_column(
         'api_tokens', sa.Column('last_activity', sa.DateTime(), nullable=True)

jupyterhub/alembic/versions/99a28a4418e1_user_created.py

@@ -31,7 +31,7 @@ def upgrade():
         % (now,)
     )
 
-    tables = sa.inspect(c.engine).get_table_names()
+    tables = c.engine.table_names()
 
     if 'spawners' in tables:
         op.add_column('spawners', sa.Column('started', sa.DateTime, nullable=True))

jupyterhub/alembic/versions/d68c98b66cd4_client_description.py

@@ -16,8 +16,7 @@ import sqlalchemy as sa
 
 
 def upgrade():
-    engine = op.get_bind().engine
+    tables = op.get_bind().engine.table_names()
-    tables = sa.inspect(engine).get_table_names()
     if 'oauth_clients' in tables:
         op.add_column(
             'oauth_clients', sa.Column('description', sa.Unicode(length=1023))

jupyterhub/apihandlers/auth.py

@@ -222,14 +222,6 @@ class OAuthAuthorizeHandler(OAuthHandler, BaseHandler):
         # default: require confirmation
         return True
 
-    def get_login_url(self):
-        """
-        Support automatically logging in when JupyterHub is used as auth provider
-        """
-        if self.authenticator.auto_login_oauth2_authorize:
-            return self.authenticator.login_url(self.hub.base_url)
-        return super().get_login_url()
-
     @web.authenticated
     async def get(self):
         """GET /oauth/authorization
@@ -261,7 +253,7 @@ class OAuthAuthorizeHandler(OAuthHandler, BaseHandler):
             # Render oauth 'Authorize application...' page
             auth_state = await self.current_user.get_auth_state()
             self.write(
-                await self.render_template(
+                self.render_template(
                     "oauth.html",
                     auth_state=auth_state,
                     scopes=scopes,

jupyterhub/apihandlers/groups.py

@@ -42,7 +42,7 @@ class GroupListAPIHandler(_GroupAPIHandler):
 
     @admin_only
     async def post(self):
-        """POST creates Multiple groups"""
+        """POST creates Multiple groups """
         model = self.get_json_body()
         if not model or not isinstance(model, dict) or not model.get('groups'):
             raise web.HTTPError(400, "Must specify at least one group to create")

jupyterhub/apihandlers/users.py

@@ -9,7 +9,6 @@ from datetime import timezone
 
 from async_generator import aclosing
 from dateutil.parser import parse as parse_date
-from sqlalchemy import func
 from tornado import web
 from tornado.iostream import StreamClosedError
 
@@ -36,69 +35,15 @@ class SelfAPIHandler(APIHandler):
             user = self.get_current_user_oauth_token()
         if user is None:
             raise web.HTTPError(403)
-        if isinstance(user, orm.Service):
+        self.write(json.dumps(self.user_model(user)))
-            model = self.service_model(user)
-        else:
-            model = self.user_model(user)
-        self.write(json.dumps(model))
 
 
 class UserListAPIHandler(APIHandler):
-    def _user_has_ready_spawner(self, orm_user):
-        """Return True if a user has *any* ready spawners
-
-        Used for filtering from active -> ready
-        """
-        user = self.users[orm_user]
-        return any(spawner.ready for spawner in user.spawners.values())
-
     @admin_only
     def get(self):
-        state_filter = self.get_argument("state", None)
-
-        # post_filter
-        post_filter = None
-
-        if state_filter in {"active", "ready"}:
-            # only get users with active servers
-            # an 'active' Spawner has a server record in the database
-            # which means Spawner.server != None
-            # it may still be in a pending start/stop state.
-            # join filters out users with no Spawners
-            query = (
-                self.db.query(orm.User)
-                # join filters out any Users with no Spawners
-                .join(orm.Spawner)
-                # this implicitly gets Users with *any* active server
-                .filter(orm.Spawner.server != None)
-            )
-            if state_filter == "ready":
-                # have to post-process query results because active vs ready
-                # can only be distinguished with in-memory Spawner properties
-                post_filter = self._user_has_ready_spawner
-
-        elif state_filter == "inactive":
-            # only get users with *no* active servers
-            # as opposed to users with *any inactive servers*
-            # this is the complement to the above query.
-            # how expensive is this with lots of servers?
-            query = (
-                self.db.query(orm.User)
-                .outerjoin(orm.Spawner)
-                .outerjoin(orm.Server)
-                .group_by(orm.User.id)
-                .having(func.count(orm.Server.id) == 0)
-            )
-        elif state_filter:
-            raise web.HTTPError(400, "Unrecognized state filter: %r" % state_filter)
-        else:
-            # no filter, return all users
-            query = self.db.query(orm.User)
-
         data = [
             self.user_model(u, include_servers=True, include_state=True)
-            for u in query
+            for u in self.db.query(orm.User)
-            if (post_filter is None or post_filter(u))
         ]
         self.write(json.dumps(data))
 
@@ -237,9 +182,6 @@ class UserAPIHandler(APIHandler):
                 )
 
         await maybe_future(self.authenticator.delete_user(user))
-
-        await user.delete_spawners()
-
         # remove from registry
         self.users.delete(user)
 
@@ -480,18 +422,10 @@ class UserServerAPIHandler(APIHandler):
         options = self.get_json_body()
         remove = (options or {}).get('remove', False)
 
-        async def _remove_spawner(f=None):
+        def _remove_spawner(f=None):
-            """Remove the spawner object
+            if f and f.exception():
-
+                return
-            only called after it stops successfully
-            """
-            if f:
-                # await f, stop on error,
-                # leaving resources in the db in case of failure to stop
-                await f
             self.log.info("Deleting spawner %s", spawner._log_name)
-            await maybe_future(user._delete_spawner(spawner))
-
             self.db.delete(spawner.orm_spawner)
             user.spawners.pop(server_name, None)
             self.db.commit()
@@ -512,8 +446,7 @@ class UserServerAPIHandler(APIHandler):
             self.set_header('Content-Type', 'text/plain')
             self.set_status(202)
             if remove:
-                # schedule remove when stop completes
+                spawner._stop_future.add_done_callback(_remove_spawner)
-                asyncio.ensure_future(_remove_spawner(spawner._stop_future))
             return
 
         if spawner.pending:
@@ -531,10 +464,9 @@ class UserServerAPIHandler(APIHandler):
 
         if remove:
             if stop_future:
-                # schedule remove when stop completes
+                stop_future.add_done_callback(_remove_spawner)
-                asyncio.ensure_future(_remove_spawner(spawner._stop_future))
             else:
-                await _remove_spawner()
+                _remove_spawner()
 
         status = 202 if spawner._stop_pending else 204
         self.set_header('Content-Type', 'text/plain')

jupyterhub/app.py

@@ -5,10 +5,10 @@
 import asyncio
 import atexit
 import binascii
+import json
 import logging
 import os
 import re
-import secrets
 import signal
 import socket
 import sys
@@ -29,14 +29,6 @@ from urllib.parse import urlunparse
 if sys.version_info[:2] < (3, 3):
     raise ValueError("Python < 3.3 not supported: %s" % sys.version)
 
-# For compatibility with python versions 3.6 or earlier.
-# asyncio.Task.all_tasks() is fully moved to asyncio.all_tasks() starting with 3.9. Also applies to current_task.
-try:
-    asyncio_all_tasks = asyncio.all_tasks
-    asyncio_current_task = asyncio.current_task
-except AttributeError as e:
-    asyncio_all_tasks = asyncio.Task.all_tasks
-    asyncio_current_task = asyncio.Task.current_task
 
 from dateutil.parser import parse as parse_date
 from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
@@ -89,7 +81,6 @@ from .pagination import Pagination
 from .proxy import Proxy, ConfigurableHTTPProxy
 from .traitlets import URLPrefix, Command, EntryPointType, Callable
 from .utils import (
-    catch_db_error,
     maybe_future,
     url_path_join,
     print_stacks,
@@ -356,42 +347,6 @@ class JupyterHub(Application):
         Default is two weeks.
         """,
     ).tag(config=True)
-
-    oauth_token_expires_in = Integer(
-        help="""Expiry (in seconds) of OAuth access tokens.
-
-        The default is to expire when the cookie storing them expires,
-        according to `cookie_max_age_days` config.
-
-        These are the tokens stored in cookies when you visit
-        a single-user server or service.
-        When they expire, you must re-authenticate with the Hub,
-        even if your Hub authentication is still valid.
-        If your Hub authentication is valid,
-        logging in may be a transparent redirect as you refresh the page.
-
-        This does not affect JupyterHub API tokens in general,
-        which do not expire by default.
-        Only tokens issued during the oauth flow
-        accessing services and single-user servers are affected.
-
-        .. versionadded:: 1.4
-            OAuth token expires_in was not previously configurable.
-        .. versionchanged:: 1.4
-            Default now uses cookie_max_age_days so that oauth tokens
-            which are generally stored in cookies,
-            expire when the cookies storing them expire.
-            Previously, it was one hour.
-        """,
-        config=True,
-    )
-
-    @default("oauth_token_expires_in")
-    def _cookie_max_age_seconds(self):
-        """default to cookie max age, where these tokens are stored"""
-        # convert cookie max age days to seconds
-        return int(self.cookie_max_age_days * 24 * 3600)
-
     redirect_to_server = Bool(
         True, help="Redirect user to server (if running), instead of control panel."
     ).tag(config=True)
@@ -411,8 +366,7 @@ class JupyterHub(Application):
         300, help="Interval (in seconds) at which to update last-activity timestamps."
     ).tag(config=True)
     proxy_check_interval = Integer(
-        5,
+        30, help="Interval (in seconds) at which to check if the proxy is running."
-        help="DEPRECATED since version 0.8: Use ConfigurableHTTPProxy.check_running_interval",
     ).tag(config=True)
     service_check_interval = Integer(
         60,
@@ -726,7 +680,6 @@ class JupyterHub(Application):
     ).tag(config=True)
 
     _proxy_config_map = {
-        'proxy_check_interval': 'check_running_interval',
         'proxy_cmd': 'command',
         'debug_proxy': 'debug',
         'proxy_auth_token': 'auth_token',
@@ -858,66 +811,6 @@ class JupyterHub(Application):
     def _hub_prefix_default(self):
         return url_path_join(self.base_url, '/hub/')
 
-    hub_routespec = Unicode(
-        "/",
-        help="""
-        The routing prefix for the Hub itself.
-
-        Override to send only a subset of traffic to the Hub.
-        Default is to use the Hub as the default route for all requests.
-
-        This is necessary for normal jupyterhub operation,
-        as the Hub must receive requests for e.g. `/user/:name`
-        when the user's server is not running.
-
-        However, some deployments using only the JupyterHub API
-        may want to handle these events themselves,
-        in which case they can register their own default target with the proxy
-        and set e.g. `hub_routespec = /hub/` to serve only the hub's own pages, or even `/hub/api/` for api-only operation.
-
-        Note: hub_routespec must include the base_url, if any.
-
-        .. versionadded:: 1.4
-        """,
-    ).tag(config=True)
-
-    @default("hub_routespec")
-    def _default_hub_routespec(self):
-        # Default routespec for the Hub is the *app* base url
-        # not the hub URL, so the Hub receives requests for non-running servers
-        # use `/` with host-based routing so the Hub
-        # gets requests for all hosts
-        if self.subdomain_host:
-            routespec = '/'
-        else:
-            routespec = self.base_url
-        return routespec
-
-    @validate("hub_routespec")
-    def _validate_hub_routespec(self, proposal):
-        """ensure leading/trailing / on custom routespec prefix
-
-        - trailing '/' always required
-        - leading '/' required unless using subdomains
-        """
-        routespec = proposal.value
-        if not routespec.endswith("/"):
-            routespec = routespec + "/"
-        if not self.subdomain_host and not routespec.startswith("/"):
-            routespec = "/" + routespec
-        return routespec
-
-    @observe("hub_routespec")
-    def _hub_routespec_changed(self, change):
-        if change.new == change.old:
-            return
-        routespec = change.new
-        if routespec not in {'/', self.base_url}:
-            self.log.warning(
-                f"Using custom route for Hub: {routespec}."
-                " Requests for not-running servers may not be handled."
-            )
-
     @observe('base_url')
     def _update_hub_prefix(self, change):
         """add base URL to hub prefix"""
@@ -945,30 +838,15 @@ class JupyterHub(Application):
         to reduce the cost of checking authentication tokens.
         """,
     ).tag(config=True)
-    cookie_secret = Union(
+    cookie_secret = Bytes(
-        [Bytes(), Unicode()],
         help="""The cookie secret to use to encrypt cookies.
 
         Loaded from the JPY_COOKIE_SECRET env variable by default.
 
         Should be exactly 256 bits (32 bytes).
-        """,
+        """
     ).tag(config=True, env='JPY_COOKIE_SECRET')
 
-    @validate('cookie_secret')
-    def _validate_secret_key(self, proposal):
-        """Coerces strings with even number of hexadecimal characters to bytes."""
-        r = proposal['value']
-        if isinstance(r, str):
-            try:
-                return bytes.fromhex(r)
-            except ValueError:
-                raise ValueError(
-                    "cookie_secret set as a string must contain an even amount of hexadecimal characters."
-                )
-        else:
-            return r
-
     @observe('cookie_secret')
     def _cookie_secret_check(self, change):
         secret = change.new
@@ -1476,26 +1354,6 @@ class JupyterHub(Application):
         """,
     ).tag(config=True)
 
-    use_legacy_stopped_server_status_code = Bool(
-        True,
-        help="""
-        Return 503 rather than 424 when request comes in for a non-running server.
-
-        Prior to JupyterHub 2.0, this returns a 503 when any request comes in for
-        a user server that is currently not running. By default, JupyterHub 2.0
-        will return a 424 - this makes operational metric dashboards more useful.
-
-        JupyterLab < 3.2 expected the 503 to know if the user server is no longer
-        running, and prompted the user to start their server. Set this config to
-        true to retain the old behavior, so JupyterLab < 3.2 can continue to show
-        the appropriate UI when the user server is stopped.
-
-        This option will default to False in JupyterHub 2.0, and be removed in a
-        future release.
-        """,
-        config=True,
-    )
-
     def init_handlers(self):
         h = []
         # load handlers from the authenticator
@@ -1592,7 +1450,7 @@ class JupyterHub(Application):
         if not secret:
             secret_from = 'new'
             self.log.debug("Generating new %s", trait_name)
-            secret = secrets.token_bytes(COOKIE_SECRET_BYTES)
+            secret = os.urandom(COOKIE_SECRET_BYTES)
 
         if secret_file and secret_from == 'new':
             # if we generated a new secret, store it in the secret_file
@@ -1749,7 +1607,6 @@ class JupyterHub(Application):
         """Load the Hub URL config"""
         hub_args = dict(
             base_url=self.hub_prefix,
-            routespec=self.hub_routespec,
             public_host=self.subdomain_host,
             certfile=self.internal_ssl_cert,
             keyfile=self.internal_ssl_key,
@@ -1765,15 +1622,17 @@ class JupyterHub(Application):
             hub_args['ip'] = self.hub_ip
             hub_args['port'] = self.hub_port
 
-        self.hub = Hub(**hub_args)
+        # routespec for the Hub is the *app* base url
+        # not the hub URL, so it receives requests for non-running servers
+        # use `/` with host-based routing so the Hub
+        # gets requests for all hosts
+        host = ''
+        if self.subdomain_host:
+            routespec = '/'
+        else:
+            routespec = self.base_url
 
-        if not self.subdomain_host:
+        self.hub = Hub(routespec=routespec, **hub_args)
-            api_prefix = url_path_join(self.hub.base_url, "api/")
-            if not api_prefix.startswith(self.hub.routespec):
-                self.log.warning(
-                    f"Hub API prefix {api_prefix} not on prefix {self.hub.routespec}. "
-                    "The Hub may not receive any API requests from outside."
-                )
 
         if self.hub_connect_ip:
             self.hub.connect_ip = self.hub_connect_ip
@@ -1992,7 +1851,7 @@ class JupyterHub(Application):
                         # don't allow bad tokens to create users
                         db.delete(obj)
                         db.commit()
-                    raise
+                        raise
             else:
                 self.log.debug("Not duplicating token %s", orm_token)
         db.commit()
@@ -2000,7 +1859,6 @@ class JupyterHub(Application):
     # purge expired tokens hourly
     purge_expired_tokens_interval = 3600
 
-    @catch_db_error
     def purge_expired_tokens(self):
         """purge all expiring token objects from the database
 
@@ -2016,7 +1874,7 @@ class JupyterHub(Application):
         await self._add_tokens(self.service_tokens, kind='service')
         await self._add_tokens(self.api_tokens, kind='user')
 
-        await self.purge_expired_tokens()
+        self.purge_expired_tokens()
         # purge expired tokens hourly
         # we don't need to be prompt about this
         # because expired tokens cannot be used anyway
@@ -2063,14 +1921,18 @@ class JupyterHub(Application):
                     raise AttributeError("No such service field: %s" % key)
                 setattr(service, key, value)
 
-            if service.api_token:
+            if service.managed:
+                if not service.api_token:
+                    # generate new token
+                    # TODO: revoke old tokens?
+                    service.api_token = service.orm.new_api_token(
+                        note="generated at startup"
+                    )
+                else:
+                    # ensure provided token is registered
+                    self.service_tokens[service.api_token] = service.name
+            else:
                 self.service_tokens[service.api_token] = service.name
-            elif service.managed:
-                # generate new token
-                # TODO: revoke old tokens?
-                service.api_token = service.orm.new_api_token(
-                    note="generated at startup"
-                )
 
             if service.url:
                 parsed = urlparse(service.url)
@@ -2258,7 +2120,7 @@ class JupyterHub(Application):
             self.log.debug(
                 "Awaiting checks for %i possibly-running spawners", len(check_futures)
             )
-            await asyncio.gather(*check_futures)
+            await gen.multi(check_futures)
         db.commit()
 
         # only perform this query if we are going to log it
@@ -2276,7 +2138,6 @@ class JupyterHub(Application):
             lambda: self.db,
             url_prefix=url_path_join(base_url, 'api/oauth2'),
             login_url=url_path_join(base_url, 'login'),
-            token_expires_in=self.oauth_token_expires_in,
         )
 
     def cleanup_oauth_clients(self):
@@ -2326,7 +2187,7 @@ class JupyterHub(Application):
     def init_tornado_settings(self):
         """Set up the tornado settings dict."""
         base_url = self.hub.base_url
-        jinja_options = dict(autoescape=True, enable_async=True)
+        jinja_options = dict(autoescape=True)
         jinja_options.update(self.jinja_environment_options)
         base_path = self._template_paths_default()[0]
         if base_path not in self.template_paths:
@@ -2338,14 +2199,6 @@ class JupyterHub(Application):
             ]
         )
         jinja_env = Environment(loader=loader, **jinja_options)
-        # We need a sync jinja environment too, for the times we *must* use sync
-        # code - particularly in RequestHandler.write_error. Since *that*
-        # is called from inside the asyncio event loop, we can't actulaly just
-        # schedule it on the loop - without starting another thread with its
-        # own loop, which seems not worth the trouble. Instead, we create another
-        # environment, exactly like this one, but sync
-        del jinja_options['enable_async']
-        jinja_env_sync = Environment(loader=loader, **jinja_options)
 
         login_url = url_path_join(base_url, 'login')
         logout_url = self.authenticator.logout_url(base_url)
@@ -2392,7 +2245,6 @@ class JupyterHub(Application):
             template_path=self.template_paths,
             template_vars=self.template_vars,
             jinja2_env=jinja_env,
-            jinja2_env_sync=jinja_env_sync,
             version_hash=version_hash,
             subdomain_host=self.subdomain_host,
             domain=self.domain,
@@ -2664,7 +2516,6 @@ class JupyterHub(Application):
         with open(self.config_file, mode='w') as f:
             f.write(config_text)
 
-    @catch_db_error
     async def update_last_activity(self):
         """Update User.last_activity timestamps from the proxy"""
         routes = await self.proxy.get_all_routes()
@@ -2957,7 +2808,9 @@ class JupyterHub(Application):
     async def shutdown_cancel_tasks(self, sig):
         """Cancel all other tasks of the event loop and initiate cleanup"""
         self.log.critical("Received signal %s, initiating shutdown...", sig.name)
-        tasks = [t for t in asyncio_all_tasks() if t is not asyncio_current_task()]
+        tasks = [
+            t for t in asyncio.Task.all_tasks() if t is not asyncio.Task.current_task()
+        ]
 
         if tasks:
             self.log.debug("Cancelling pending tasks")
@@ -2970,7 +2823,7 @@ class JupyterHub(Application):
             except StopAsyncIteration as e:
                 self.log.error("Caught StopAsyncIteration Exception", exc_info=True)
 
-            tasks = [t for t in asyncio_all_tasks()]
+            tasks = [t for t in asyncio.Task.all_tasks()]
             for t in tasks:
                 self.log.debug("Task status: %s", t)
         await self.cleanup()

jupyterhub/auth.py

@@ -101,10 +101,7 @@ class Authenticator(LoggingConfigurable):
         """
     ).tag(config=True)
 
-    whitelist = Set(
+    whitelist = Set(help="Deprecated, use `Authenticator.allowed_users`", config=True,)
-        help="Deprecated, use `Authenticator.allowed_users`",
-        config=True,
-    )
 
     allowed_users = Set(
         help="""
@@ -185,13 +182,6 @@ class Authenticator(LoggingConfigurable):
         """
     )
 
-    def get_custom_html(self, base_url):
-        """Get custom HTML for the authenticator.
-
-        .. versionadded: 1.4
-        """
-        return self.custom_html
-
     login_service = Unicode(
         help="""
         Name of the login service that this authenticator is providing using to authenticate users.
@@ -646,26 +636,6 @@ class Authenticator(LoggingConfigurable):
         """,
     )
 
-    auto_login_oauth2_authorize = Bool(
-        False,
-        config=True,
-        help="""
-        Automatically begin login process for OAuth2 authorization requests
-
-        When another application is using JupyterHub as OAuth2 provider, it
-        sends users to `/hub/api/oauth2/authorize`. If the user isn't logged
-        in already, and auto_login is not set, the user will be dumped on the
-        hub's home page, without any context on what to do next.
-
-        Setting this to true will automatically redirect users to login if
-        they aren't logged in *only* on the `/hub/api/oauth2/authorize`
-        endpoint.
-
-        .. versionadded:: 1.5
-
-        """,
-    )
-
     def login_url(self, base_url):
         """Override this when registering a custom login handler
 
@@ -745,9 +715,7 @@ for _old_name, _new_name, _version in [
     ("check_blacklist", "check_blocked_users", "1.2"),
 ]:
     setattr(
-        Authenticator,
+        Authenticator, _old_name, _deprecated_method(_old_name, _new_name, _version),
-        _old_name,
-        _deprecated_method(_old_name, _new_name, _version),
     )
 
 
@@ -810,9 +778,7 @@ class LocalAuthenticator(Authenticator):
         """
     ).tag(config=True)
 
-    group_whitelist = Set(
+    group_whitelist = Set(help="""DEPRECATED: use allowed_groups""",).tag(config=True)
-        help="""DEPRECATED: use allowed_groups""",
-    ).tag(config=True)
 
     allowed_groups = Set(
         help="""

jupyterhub/dbutil.py

@@ -26,9 +26,10 @@ def write_alembic_ini(alembic_ini='alembic.ini', db_url='sqlite:///jupyterhub.sq
 
     Parameters
     ----------
-    alembic_ini : str
+
+    alembic_ini: str
         path to the alembic.ini file that should be written.
-    db_url : str
+    db_url: str
         The SQLAlchemy database url, e.g. `sqlite:///jupyterhub.sqlite`.
     """
     with open(ALEMBIC_INI_TEMPLATE_PATH) as f:
@@ -57,11 +58,13 @@ def _temp_alembic_ini(db_url):
 
     Parameters
     ----------
-    db_url : str
+
+    db_url: str
         The SQLAlchemy database url, e.g. `sqlite:///jupyterhub.sqlite`.
 
     Returns
     -------
+
     alembic_ini: str
         The path to the temporary alembic.ini that we have created.
         This file will be cleaned up on exit from the context manager.

jupyterhub/event-schemas/server-actions/v1.yaml

@@ -19,14 +19,14 @@ description: |
   2. Events are only recorded when an action succeeds.
 type: object
 required:
-  - action
+- action
-  - username
+- username
-  - servername
+- servername
 properties:
   action:
     enum:
-      - start
+    - start
-      - stop
+    - stop
     description: |
       Action performed by JupyterHub.
 

jupyterhub/handlers/base.py

@@ -40,7 +40,6 @@ from ..metrics import SERVER_STOP_DURATION_SECONDS
 from ..metrics import ServerPollStatus
 from ..metrics import ServerSpawnStatus
 from ..metrics import ServerStopStatus
-from ..metrics import TOTAL_USERS
 from ..objects import Server
 from ..spawner import LocalProcessSpawner
 from ..user import User
@@ -81,14 +80,9 @@ class BaseHandler(RequestHandler):
         """
         try:
             await self.get_current_user()
-        except Exception as e:
+        except Exception:
-            # ensure get_current_user is never called again for this handler,
-            # since it failed
-            self._jupyterhub_user = None
             self.log.exception("Failed to get current user")
-            if isinstance(e, SQLAlchemyError):
+            self._jupyterhub_user = None
-                self.log.error("Rolling back session due to database error")
-                self.db.rollback()
 
         return await maybe_future(super().prepare())
 
@@ -431,8 +425,7 @@ class BaseHandler(RequestHandler):
             except Exception:
                 # don't let errors here raise more than once
                 self._jupyterhub_user = None
-                # but still raise, which will get handled in .prepare()
+                self.log.exception("Error getting current user")
-                raise
         return self._jupyterhub_user
 
     @property
@@ -460,7 +453,6 @@ class BaseHandler(RequestHandler):
             # not found, create and register user
             u = orm.User(name=username)
             self.db.add(u)
-            TOTAL_USERS.inc()
             self.db.commit()
             user = self._user_from_orm(u)
         return user
@@ -497,12 +489,7 @@ class BaseHandler(RequestHandler):
         self.clear_cookie(
             'jupyterhub-services',
             path=url_path_join(self.base_url, 'services'),
-            **kwargs,
+            **kwargs
-        )
-        # clear tornado cookie
-        self.clear_cookie(
-            '_xsrf',
-            **self.settings.get('xsrf_cookie_kwargs', {}),
         )
         # Reset _jupyterhub_user
         self._jupyterhub_user = None
@@ -1178,36 +1165,16 @@ class BaseHandler(RequestHandler):
             "<a href='{home}'>home page</a>.".format(home=home)
         )
 
-    def get_template(self, name, sync=False):
+    def get_template(self, name):
-        """
+        """Return the jinja template object for a given name"""
-        Return the jinja template object for a given name
+        return self.settings['jinja2_env'].get_template(name)
 
-        If sync is True, we return a Template that is compiled without async support.
+    def render_template(self, name, **ns):
-        Only those can be used in synchronous code.
-
-        If sync is False, we return a Template that is compiled with async support
-        """
-        if sync:
-            key = 'jinja2_env_sync'
-        else:
-            key = 'jinja2_env'
-        return self.settings[key].get_template(name)
-
-    def render_template(self, name, sync=False, **ns):
-        """
-        Render jinja2 template
-
-        If sync is set to True, we render the template & return a string
-        If sync is set to False, we return an awaitable
-        """
         template_ns = {}
         template_ns.update(self.template_namespace)
         template_ns.update(ns)
-        template = self.get_template(name, sync)
+        template = self.get_template(name)
-        if sync:
+        return template.render(**template_ns)
-            return template.render(**template_ns)
-        else:
-            return template.render_async(**template_ns)
 
     @property
     def template_namespace(self):
@@ -1282,19 +1249,17 @@ class BaseHandler(RequestHandler):
             # Content-Length must be recalculated.
             self.clear_header('Content-Length')
 
-        # render_template is async, but write_error can't be!
+        # render the template
-        # so we run it sync here, instead of making a sync version of render_template
-
         try:
-            html = self.render_template('%s.html' % status_code, sync=True, **ns)
+            html = self.render_template('%s.html' % status_code, **ns)
         except TemplateNotFound:
             self.log.debug("No template for %d", status_code)
             try:
-                html = self.render_template('error.html', sync=True, **ns)
+                html = self.render_template('error.html', **ns)
             except:
                 # In this case, any side effect must be avoided.
                 ns['no_spawner_check'] = True
-                html = self.render_template('error.html', sync=True, **ns)
+                html = self.render_template('error.html', **ns)
 
         self.write(html)
 
@@ -1336,7 +1301,7 @@ class UserUrlHandler(BaseHandler):
 
     **Changed Behavior as of 1.0** This handler no longer triggers a spawn. Instead, it checks if:
 
-    1. server is not active, serve page prompting for spawn (status: 424)
+    1. server is not active, serve page prompting for spawn (status: 503)
     2. server is ready (This shouldn't happen! Proxy isn't updated yet. Wait a bit and redirect.)
     3. server is active, redirect to /hub/spawn-pending to monitor launch progress
        (will redirect back when finished)
@@ -1355,14 +1320,7 @@ class UserUrlHandler(BaseHandler):
         self.log.warning(
             "Failing suspected API request to not-running server: %s", self.request.path
         )
-
+        self.set_status(503)
-        # If we got here, the server is not running. To differentiate
-        # that the *server* itself is not running, rather than just the particular
-        # resource *in* the server is not found, we return a 424 instead of a 404.
-        # We allow retaining the old behavior to support older JupyterLab versions
-        self.set_status(
-            424 if not self.app.use_legacy_stopped_server_status_code else 503
-        )
         self.set_header("Content-Type", "application/json")
 
         spawn_url = urlparse(self.request.full_url())._replace(query="")
@@ -1523,20 +1481,18 @@ class UserUrlHandler(BaseHandler):
             self.redirect(pending_url, status=303)
             return
 
-        # If we got here, the server is not running. To differentiate
+        # if we got here, the server is not running
-        # that the *server* itself is not running, rather than just the particular
+        # serve a page prompting for spawn and 503 error
-        # page *in* the server is not found, we return a 424 instead of a 404.
+        # visiting /user/:name no longer triggers implicit spawn
-        # We allow retaining the old behavior to support older JupyterLab versions
+        # without explicit user action
         spawn_url = url_concat(
             url_path_join(self.hub.base_url, "spawn", user.escaped_name, server_name),
             {"next": self.request.uri},
         )
-        self.set_status(
+        self.set_status(503)
-            424 if not self.app.use_legacy_stopped_server_status_code else 503
-        )
 
         auth_state = await user.get_auth_state()
-        html = await self.render_template(
+        html = self.render_template(
             "not_running.html",
             user=user,
             server_name=server_name,
@@ -1586,23 +1542,20 @@ class UserUrlHandler(BaseHandler):
         if self.subdomain_host:
             target = user.host + target
 
+        referer = self.request.headers.get('Referer', '')
         # record redirect count in query parameter
         if redirects:
             self.log.warning("Redirect loop detected on %s", self.request.uri)
             # add capped exponential backoff where cap is 10s
-            await asyncio.sleep(min(1 * (2**redirects), 10))
+            await gen.sleep(min(1 * (2 ** redirects), 10))
             # rewrite target url with new `redirects` query value
             url_parts = urlparse(target)
             query_parts = parse_qs(url_parts.query)
             query_parts['redirects'] = redirects + 1
             url_parts = url_parts._replace(query=urlencode(query_parts, doseq=True))
             target = urlunparse(url_parts)
-        else:
+        elif '/user/{}'.format(user.name) in referer or not referer:
-            # Start redirect counter.
+            # add first counter only if it's a redirect from /user/:name -> /hub/user/:name
-            # This should only occur for redirects from /user/:name -> /hub/user/:name
-            # when the corresponding server is already ready.
-            # We don't check this explicitly (direct visits to /hub/user are technically possible),
-            # but that's now the only normal way to get here.
             target = url_concat(target, {'redirects': 1})
 
         self.redirect(target)

jupyterhub/handlers/login.py

@@ -3,7 +3,6 @@
 # Distributed under the terms of the Modified BSD License.
 import asyncio
 
-from jinja2 import Template
 from tornado import web
 from tornado.escape import url_escape
 from tornado.httputil import url_concat
@@ -73,14 +72,14 @@ class LogoutHandler(BaseHandler):
         Override this function to set a custom logout page.
         """
         if self.authenticator.auto_login:
-            html = await self.render_template('logout.html')
+            html = self.render_template('logout.html')
             self.finish(html)
         else:
             self.redirect(self.settings['login_url'], permanent=False)
 
     async def get(self):
         """Log the user out, call the custom action, forward the user
-        to the logout page
+            to the logout page
         """
         await self.default_handle_logout()
         await self.handle_logout()
@@ -91,23 +90,17 @@ class LoginHandler(BaseHandler):
     """Render the login page."""
 
     def _render(self, login_error=None, username=None):
-        context = {
+        return self.render_template(
-            "next": url_escape(self.get_argument('next', default='')),
+            'login.html',
-            "username": username,
+            next=url_escape(self.get_argument('next', default='')),
-            "login_error": login_error,
+            username=username,
-            "login_url": self.settings['login_url'],
+            login_error=login_error,
-            "authenticator_login_url": url_concat(
+            custom_html=self.authenticator.custom_html,
+            login_url=self.settings['login_url'],
+            authenticator_login_url=url_concat(
                 self.authenticator.login_url(self.hub.base_url),
                 {'next': self.get_argument('next', '')},
             ),
-        }
-        custom_html = Template(
-            self.authenticator.get_custom_html(self.hub.base_url)
-        ).render(**context)
-        return self.render_template(
-            'login.html',
-            **context,
-            custom_html=custom_html,
         )
 
     async def get(self):
@@ -139,7 +132,7 @@ class LoginHandler(BaseHandler):
                     self.redirect(auto_login_url)
                 return
             username = self.get_argument('username', default='')
-            self.finish(await self._render(username=username))
+            self.finish(self._render(username=username))
 
     async def post(self):
         # parse the arguments dict
@@ -156,7 +149,7 @@ class LoginHandler(BaseHandler):
             self._jupyterhub_user = user
             self.redirect(self.get_next_url(user))
         else:
-            html = await self._render(
+            html = self._render(
                 login_error='Invalid username or password', username=data['username']
             )
             self.finish(html)

jupyterhub/handlers/metrics.py

@@ -1,4 +1,3 @@
-"""Handlers for serving prometheus metrics"""
 from prometheus_client import CONTENT_TYPE_LATEST
 from prometheus_client import generate_latest
 from prometheus_client import REGISTRY
@@ -18,7 +17,4 @@ class MetricsHandler(BaseHandler):
         self.write(generate_latest(REGISTRY))
 
 
-default_handlers = [
+default_handlers = [(r'/metrics$', MetricsHandler)]
-    (r'/metrics$', MetricsHandler),
-    (r'/api/metrics$', MetricsHandler),
-]

jupyterhub/handlers/pages.py

@@ -71,7 +71,7 @@ class HomeHandler(BaseHandler):
             url = url_path_join(self.hub.base_url, 'spawn', user.escaped_name)
 
         auth_state = await user.get_auth_state()
-        html = await self.render_template(
+        html = self.render_template(
             'home.html',
             auth_state=auth_state,
             user=user,
@@ -98,7 +98,7 @@ class SpawnHandler(BaseHandler):
 
     async def _render_form(self, for_user, spawner_options_form, message=''):
         auth_state = await for_user.get_auth_state()
-        return await self.render_template(
+        return self.render_template(
             'spawn.html',
             for_user=for_user,
             auth_state=auth_state,
@@ -382,7 +382,7 @@ class SpawnPendingHandler(BaseHandler):
                 self.hub.base_url, "spawn", user.escaped_name, server_name
             )
             self.set_status(500)
-            html = await self.render_template(
+            html = self.render_template(
                 "not_running.html",
                 user=user,
                 auth_state=auth_state,
@@ -406,7 +406,7 @@ class SpawnPendingHandler(BaseHandler):
                 page = "stop_pending.html"
             else:
                 page = "spawn_pending.html"
-            html = await self.render_template(
+            html = self.render_template(
                 page,
                 user=user,
                 spawner=spawner,
@@ -433,7 +433,7 @@ class SpawnPendingHandler(BaseHandler):
             spawn_url = url_path_join(
                 self.hub.base_url, "spawn", user.escaped_name, server_name
             )
-            html = await self.render_template(
+            html = self.render_template(
                 "not_running.html",
                 user=user,
                 auth_state=auth_state,
@@ -457,8 +457,7 @@ class AdminHandler(BaseHandler):
     @web.authenticated
     @admin_only
     async def get(self):
-        pagination = Pagination(url=self.request.uri, config=self.config)
+        page, per_page, offset = Pagination(config=self.config).get_page_args(self)
-        page, per_page, offset = pagination.get_page_args(self)
 
         available = {'name', 'admin', 'running', 'last_activity'}
         default_sort = ['admin', 'name']
@@ -501,27 +500,30 @@ class AdminHandler(BaseHandler):
         # get User.col.desc() order objects
         ordered = [getattr(c, o)() for c, o in zip(cols, orders)]
 
-        query = self.db.query(orm.User).outerjoin(orm.Spawner).distinct(orm.User.id)
-        subquery = query.subquery("users")
         users = (
             self.db.query(orm.User)
-            .select_entity_from(subquery)
             .outerjoin(orm.Spawner)
             .order_by(*ordered)
             .limit(per_page)
             .offset(offset)
         )
-
         users = [self._user_from_orm(u) for u in users]
 
         running = []
         for u in users:
             running.extend(s for s in u.spawners.values() if s.active)
 
-        pagination.total = query.count()
+        total = self.db.query(orm.User.id).count()
+        pagination = Pagination(
+            url=self.request.uri,
+            total=total,
+            page=page,
+            per_page=per_page,
+            config=self.config,
+        )
 
         auth_state = await self.current_user.get_auth_state()
-        html = await self.render_template(
+        html = self.render_template(
             'admin.html',
             current_user=self.current_user,
             auth_state=auth_state,
@@ -611,7 +613,7 @@ class TokenPageHandler(BaseHandler):
         oauth_clients = sorted(oauth_clients, key=sort_key, reverse=True)
 
         auth_state = await self.current_user.get_auth_state()
-        html = await self.render_template(
+        html = self.render_template(
             'token.html',
             api_tokens=api_tokens,
             oauth_clients=oauth_clients,
@@ -623,7 +625,7 @@ class TokenPageHandler(BaseHandler):
 class ProxyErrorHandler(BaseHandler):
     """Handler for rendering proxy error pages"""
 
-    async def get(self, status_code_s):
+    def get(self, status_code_s):
         status_code = int(status_code_s)
         status_message = responses.get(status_code, 'Unknown HTTP Error')
         # build template namespace
@@ -647,10 +649,10 @@ class ProxyErrorHandler(BaseHandler):
         self.set_header('Content-Type', 'text/html')
         # render the template
         try:
-            html = await self.render_template('%s.html' % status_code, **ns)
+            html = self.render_template('%s.html' % status_code, **ns)
         except TemplateNotFound:
             self.log.debug("No template for %d", status_code)
-            html = await self.render_template('error.html', **ns)
+            html = self.render_template('error.html', **ns)
 
         self.write(html)
 
@@ -678,5 +680,4 @@ default_handlers = [
     (r'/token', TokenPageHandler),
     (r'/error/(\d+)', ProxyErrorHandler),
     (r'/health$', HealthCheckHandler),
-    (r'/api/health$', HealthCheckHandler),
 ]

jupyterhub/log.py

@@ -2,9 +2,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 import json
-import logging
 import traceback
-from functools import partial
 from http.cookies import SimpleCookie
 from urllib.parse import urlparse
 from urllib.parse import urlunparse
@@ -134,25 +132,19 @@ def log_request(handler):
         status < 300 and isinstance(handler, (StaticFileHandler, HealthCheckHandler))
     ):
         # static-file success and 304 Found are debug-level
-        log_level = logging.DEBUG
+        log_method = access_log.debug
     elif status < 400:
-        log_level = logging.INFO
+        log_method = access_log.info
     elif status < 500:
-        log_level = logging.WARNING
+        log_method = access_log.warning
     else:
-        log_level = logging.ERROR
+        log_method = access_log.error
 
     uri = _scrub_uri(request.uri)
     headers = _scrub_headers(request.headers)
 
     request_time = 1000.0 * handler.request.request_time()
 
-    # always log slow responses (longer than 1s) at least info-level
-    if request_time >= 1000 and log_level < logging.INFO:
-        log_level = logging.INFO
-
-    log_method = partial(access_log.log, log_level)
-
     try:
         user = handler.current_user
     except (HTTPError, RuntimeError):

jupyterhub/metrics.py

@@ -3,9 +3,9 @@ Prometheus metrics exported by JupyterHub
 
 Read https://prometheus.io/docs/practices/naming/ for naming
 conventions for metrics & labels. We generally prefer naming them
-`jupyterhub_<noun>_<verb>_<type_suffix>`. So a histogram that's tracking
+`<noun>_<verb>_<type_suffix>`. So a histogram that's tracking
 the duration (in seconds) of servers spawning would be called
-jupyterhub_server_spawn_duration_seconds.
+SERVER_SPAWN_DURATION_SECONDS.
 
 We also create an Enum for each 'status' type label in every metric
 we collect. This is to make sure that the metrics exist regardless
@@ -14,10 +14,6 @@ create them, the metric spawn_duration_seconds{status="failure"}
 will not actually exist until the first failure. This makes dashboarding
 and alerting difficult, so we explicitly list statuses and create
 them manually here.
-
-.. versionchanged:: 1.3
-
-    added ``jupyterhub_`` prefix to metric names.
 """
 from enum import Enum
 
@@ -25,13 +21,13 @@ from prometheus_client import Gauge
 from prometheus_client import Histogram
 
 REQUEST_DURATION_SECONDS = Histogram(
-    'jupyterhub_request_duration_seconds',
+    'request_duration_seconds',
     'request duration for all HTTP requests',
     ['method', 'handler', 'code'],
 )
 
 SERVER_SPAWN_DURATION_SECONDS = Histogram(
-    'jupyterhub_server_spawn_duration_seconds',
+    'server_spawn_duration_seconds',
     'time taken for server spawning operation',
     ['status'],
     # Use custom bucket sizes, since the default bucket ranges
@@ -40,27 +36,25 @@ SERVER_SPAWN_DURATION_SECONDS = Histogram(
 )
 
 RUNNING_SERVERS = Gauge(
-    'jupyterhub_running_servers', 'the number of user servers currently running'
+    'running_servers', 'the number of user servers currently running'
 )
 
-TOTAL_USERS = Gauge('jupyterhub_total_users', 'total number of users')
+TOTAL_USERS = Gauge('total_users', 'total number of users')
 
 CHECK_ROUTES_DURATION_SECONDS = Histogram(
-    'jupyterhub_check_routes_duration_seconds',
+    'check_routes_duration_seconds', 'Time taken to validate all routes in proxy'
-    'Time taken to validate all routes in proxy',
 )
 
 HUB_STARTUP_DURATION_SECONDS = Histogram(
-    'jupyterhub_hub_startup_duration_seconds', 'Time taken for Hub to start'
+    'hub_startup_duration_seconds', 'Time taken for Hub to start'
 )
 
 INIT_SPAWNERS_DURATION_SECONDS = Histogram(
-    'jupyterhub_init_spawners_duration_seconds', 'Time taken for spawners to initialize'
+    'init_spawners_duration_seconds', 'Time taken for spawners to initialize'
 )
 
 PROXY_POLL_DURATION_SECONDS = Histogram(
-    'jupyterhub_proxy_poll_duration_seconds',
+    'proxy_poll_duration_seconds', 'duration for polling all routes from proxy'
-    'duration for polling all routes from proxy',
 )
 
 
@@ -85,9 +79,7 @@ for s in ServerSpawnStatus:
 
 
 PROXY_ADD_DURATION_SECONDS = Histogram(
-    'jupyterhub_proxy_add_duration_seconds',
+    'proxy_add_duration_seconds', 'duration for adding user routes to proxy', ['status']
-    'duration for adding user routes to proxy',
-    ['status'],
 )
 
 
@@ -108,7 +100,7 @@ for s in ProxyAddStatus:
 
 
 SERVER_POLL_DURATION_SECONDS = Histogram(
-    'jupyterhub_server_poll_duration_seconds',
+    'server_poll_duration_seconds',
     'time taken to poll if server is running',
     ['status'],
 )
@@ -135,9 +127,7 @@ for s in ServerPollStatus:
 
 
 SERVER_STOP_DURATION_SECONDS = Histogram(
-    'jupyterhub_server_stop_seconds',
+    'server_stop_seconds', 'time taken for server stopping operation', ['status']
-    'time taken for server stopping operation',
-    ['status'],
 )
 
 
@@ -158,7 +148,7 @@ for s in ServerStopStatus:
 
 
 PROXY_DELETE_DURATION_SECONDS = Histogram(
-    'jupyterhub_proxy_delete_duration_seconds',
+    'proxy_delete_duration_seconds',
     'duration for deleting user routes from proxy',
     ['status'],
 )

jupyterhub/oauth/provider.py

@@ -256,7 +256,7 @@ class JupyterHubRequestValidator(RequestValidator):
         self.db.commit()
 
     def get_authorization_code_scopes(self, client_id, code, redirect_uri, request):
-        """Extracts scopes from saved authorization code.
+        """ Extracts scopes from saved authorization code.
         The scopes returned by this method is used to route token requests
         based on scopes passed to Authorization Code requests.
         With that the token endpoint knows when to include OpenIDConnect
@@ -342,7 +342,7 @@ class JupyterHubRequestValidator(RequestValidator):
         orm_access_token = orm.OAuthAccessToken(
             client=client,
             grant_type=orm.GrantType.authorization_code,
-            expires_at=int(orm.OAuthAccessToken.now() + token['expires_in']),
+            expires_at=orm.OAuthAccessToken.now() + token['expires_in'],
             refresh_token=token['refresh_token'],
             # TODO: save scopes,
             # scopes=scopes,
@@ -558,25 +558,20 @@ class JupyterHubOAuthServer(WebApplicationServer):
 
         hash its client_secret before putting it in the database.
         """
-        # Update client if it already exists, else create it
+        # clear existing clients with same ID
-        # Sqlalchemy doesn't have a good db agnostic UPSERT,
+        for orm_client in self.db.query(orm.OAuthClient).filter_by(
-        # so we do this manually. It's protected inside a
+            identifier=client_id
-        # transaction, so should fail if there are multiple
+        ):
-        # rows with the same identifier.
+            self.db.delete(orm_client)
-        orm_client = (
+        self.db.commit()
-            self.db.query(orm.OAuthClient).filter_by(identifier=client_id).one_or_none()
+
+        orm_client = orm.OAuthClient(
+            identifier=client_id,
+            secret=hash_token(client_secret),
+            redirect_uri=redirect_uri,
+            description=description,
         )
-        if orm_client is None:
+        self.db.add(orm_client)
-            orm_client = orm.OAuthClient(
-                identifier=client_id,
-            )
-            self.db.add(orm_client)
-            app_log.info(f'Creating oauth client {client_id}')
-        else:
-            app_log.info(f'Updating oauth client {client_id}')
-        orm_client.secret = hash_token(client_secret)
-        orm_client.redirect_uri = redirect_uri
-        orm_client.description = description
         self.db.commit()
 
     def fetch_by_client_id(self, client_id):
@@ -584,9 +579,9 @@ class JupyterHubOAuthServer(WebApplicationServer):
         return self.db.query(orm.OAuthClient).filter_by(identifier=client_id).first()
 
 
-def make_provider(session_factory, url_prefix, login_url, **oauth_server_kwargs):
+def make_provider(session_factory, url_prefix, login_url):
     """Make an OAuth provider"""
     db = session_factory()
     validator = JupyterHubRequestValidator(db)
-    server = JupyterHubOAuthServer(db, validator, **oauth_server_kwargs)
+    server = JupyterHubOAuthServer(db, validator)
     return server

jupyterhub/orm.py

@@ -223,7 +223,7 @@ class User(Base):
 
 
 class Spawner(Base):
-    """ "State about a Spawner"""
+    """"State about a Spawner"""
 
     __tablename__ = 'spawners'
 
@@ -318,7 +318,7 @@ class Expiring:
     which should be unix timestamp or datetime object
     """
 
-    now = utcnow  # function, must return float timestamp or datetime
+    now = utcnow  # funciton, must return float timestamp or datetime
     expires_at = None  # must be defined
 
     @property
@@ -768,7 +768,7 @@ def check_db_revision(engine):
     - Empty databases are tagged with the current revision
     """
     # Check database schema version
-    current_table_names = set(inspect(engine).get_table_names())
+    current_table_names = set(engine.table_names())
     my_table_names = set(Base.metadata.tables.keys())
 
     from .dbutil import _temp_alembic_ini

jupyterhub/pagination.py

@@ -1,6 +1,7 @@
 """Basic class to manage pagination utils."""
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
+from traitlets import Bool
 from traitlets import default
 from traitlets import Integer
 from traitlets import observe
@@ -80,13 +81,13 @@ class Pagination(Configurable):
         try:
             self.per_page = int(per_page)
         except Exception:
-            self.per_page = self.default_per_page
+            self.per_page = self._default_per_page
 
         try:
             self.page = int(page)
             if self.page < 1:
                 self.page = 1
-        except Exception:
+        except:
             self.page = 1
 
         return self.page, self.per_page, self.per_page * (self.page - 1)
@@ -106,14 +107,14 @@ class Pagination(Configurable):
 
     def calculate_pages_window(self):
         """Calculates the set of pages to render later in links() method.
-        It returns the list of pages to render via links for the pagination
+           It returns the list of pages to render via links for the pagination
-        By default, as we've observed in other applications, we're going to render
+           By default, as we've observed in other applications, we're going to render
-        only a finite and predefined number of pages, avoiding visual fatigue related
+           only a finite and predefined number of pages, avoiding visual fatigue related
-        to a long list of pages. By default, we render 7 pages plus some inactive links with the characters '...'
+           to a long list of pages. By default, we render 7 pages plus some inactive links with the characters '...'
-        to point out that there are other pages that aren't explicitly rendered.
+           to point out that there are other pages that aren't explicitly rendered.
-        The primary way of work is to provide current webpage and 5 next pages, the last 2 ones
+           The primary way of work is to provide current webpage and 5 next pages, the last 2 ones
-        (in case the current page + 5 does not overflow the total lenght of pages) and the first one for reference.
+           (in case the current page + 5 does not overflow the total lenght of pages) and the first one for reference.
-        """
+           """
 
         before_page = 2
         after_page = 2
@@ -157,9 +158,9 @@ class Pagination(Configurable):
     @property
     def links(self):
         """Get the links for the pagination.
-        Getting the input from calculate_pages_window(), generates the HTML code
+           Getting the input from calculate_pages_window(), generates the HTML code
-        for the pages to render, plus the arrows to go onwards and backwards (if needed).
+           for the pages to render, plus the arrows to go onwards and backwards (if needed).
-        """
+           """
         if self.total_pages == 1:
             return []
 

jupyterhub/proxy.py

@@ -24,8 +24,8 @@ import time
 from functools import wraps
 from subprocess import Popen
 from urllib.parse import quote
-from weakref import WeakKeyDictionary
 
+from tornado import gen
 from tornado.httpclient import AsyncHTTPClient
 from tornado.httpclient import HTTPError
 from tornado.httpclient import HTTPRequest
@@ -33,7 +33,6 @@ from tornado.ioloop import PeriodicCallback
 from traitlets import Any
 from traitlets import Bool
 from traitlets import default
-from traitlets import Dict
 from traitlets import Instance
 from traitlets import Integer
 from traitlets import observe
@@ -45,6 +44,7 @@ from .metrics import CHECK_ROUTES_DURATION_SECONDS
 from .metrics import PROXY_POLL_DURATION_SECONDS
 from .objects import Server
 from .utils import exponential_backoff
+from .utils import make_ssl_context
 from .utils import url_path_join
 from jupyterhub.traitlets import Command
 
@@ -55,18 +55,11 @@ def _one_at_a_time(method):
     If multiple concurrent calls to this method are made,
     queue them instead of allowing them to be concurrently outstanding.
     """
-    # use weak dict for locks
+    method._lock = asyncio.Lock()
-    # so that the lock is always acquired within the current asyncio loop
-    # should only be relevant in testing, where eventloops are created and destroyed often
-    method._locks = WeakKeyDictionary()
 
     @wraps(method)
     async def locked_method(*args, **kwargs):
-        loop = asyncio.get_event_loop()
+        async with method._lock:
-        lock = method._locks.get(loop, None)
-        if lock is None:
-            lock = method._locks[loop] = asyncio.Lock()
-        async with lock:
             return await method(*args, **kwargs)
 
     return locked_method
@@ -120,26 +113,6 @@ class Proxy(LoggingConfigurable):
         """,
     )
 
-    extra_routes = Dict(
-        {},
-        config=True,
-        help="""
-        Additional routes to be maintained in the proxy.
-
-        A dictionary with a route specification as key, and
-        a URL as target. The hub will ensure this route is present
-        in the proxy.
-
-        If the hub is running in host based mode (with
-        JupyterHub.subdomain_host set), the routespec *must*
-        have a domain component (example.com/my-url/). If the
-        hub is not running in host based mode, the routespec
-        *must not* have a domain component (/my-url/).
-
-        Helpful when the hub is running in API-only mode.
-        """,
-    )
-
     def start(self):
         """Start the proxy.
 
@@ -319,7 +292,7 @@ class Proxy(LoggingConfigurable):
             if service.server:
                 futures.append(self.add_service(service))
         # wait after submitting them all
-        await asyncio.gather(*futures)
+        await gen.multi(futures)
 
     async def add_all_users(self, user_dict):
         """Update the proxy table from the database.
@@ -332,7 +305,7 @@ class Proxy(LoggingConfigurable):
                 if spawner.ready:
                     futures.append(self.add_user(user, name))
         # wait after submitting them all
-        await asyncio.gather(*futures)
+        await gen.multi(futures)
 
     @_one_at_a_time
     async def check_routes(self, user_dict, service_dict, routes=None):
@@ -358,7 +331,7 @@ class Proxy(LoggingConfigurable):
             route = routes[self.app.hub.routespec]
             if route['target'] != hub.host:
                 self.log.warning(
-                    "Updating Hub route %s → %s", route['target'], hub.host
+                    "Updating default route %s → %s", route['target'], hub.host
                 )
                 futures.append(self.add_hub_route(hub))
 
@@ -412,24 +385,19 @@ class Proxy(LoggingConfigurable):
                     )
                     futures.append(self.add_service(service))
 
-        # Add extra routes we've been configured for
-        for routespec, url in self.extra_routes.items():
-            good_routes.add(routespec)
-            futures.append(self.add_route(routespec, url, {'extra': True}))
-
         # Now delete the routes that shouldn't be there
         for routespec in routes:
             if routespec not in good_routes:
                 self.log.warning("Deleting stale route %s", routespec)
                 futures.append(self.delete_route(routespec))
 
-        await asyncio.gather(*futures)
+        await gen.multi(futures)
         stop = time.perf_counter()  # timer stops here when user is deleted
         CHECK_ROUTES_DURATION_SECONDS.observe(stop - start)  # histogram metric
 
     def add_hub_route(self, hub):
         """Add the default route for the Hub"""
-        self.log.info("Adding route for Hub: %s => %s", hub.routespec, hub.host)
+        self.log.info("Adding default route for Hub: %s => %s", hub.routespec, hub.host)
         return self.add_route(hub.routespec, self.hub.host, {'hub': True})
 
     async def restore_routes(self):
@@ -483,11 +451,7 @@ class ConfigurableHTTPProxy(Proxy):
         Loaded from the CONFIGPROXY_AUTH_TOKEN env variable by default.
         """
     ).tag(config=True)
-    check_running_interval = Integer(
+    check_running_interval = Integer(5, config=True)
-        5,
-        help="Interval (in seconds) at which to check if the proxy is running.",
-        config=True,
-    )
 
     @default('auth_token')
     def _auth_token_default(self):
@@ -623,34 +587,6 @@ class ConfigurableHTTPProxy(Proxy):
             self.log.debug("PID file %s already removed", self.pid_file)
             pass
 
-    def _get_ssl_options(self):
-        """List of cmd proxy options to use internal SSL"""
-        cmd = []
-        proxy_api = 'proxy-api'
-        proxy_client = 'proxy-client'
-        api_key = self.app.internal_proxy_certs[proxy_api][
-            'keyfile'
-        ]  # Check content in next test and just patch manulaly or in the config of the file
-        api_cert = self.app.internal_proxy_certs[proxy_api]['certfile']
-        api_ca = self.app.internal_trust_bundles[proxy_api + '-ca']
-
-        client_key = self.app.internal_proxy_certs[proxy_client]['keyfile']
-        client_cert = self.app.internal_proxy_certs[proxy_client]['certfile']
-        client_ca = self.app.internal_trust_bundles[proxy_client + '-ca']
-
-        cmd.extend(['--api-ssl-key', api_key])
-        cmd.extend(['--api-ssl-cert', api_cert])
-        cmd.extend(['--api-ssl-ca', api_ca])
-        cmd.extend(['--api-ssl-request-cert'])
-        cmd.extend(['--api-ssl-reject-unauthorized'])
-
-        cmd.extend(['--client-ssl-key', client_key])
-        cmd.extend(['--client-ssl-cert', client_cert])
-        cmd.extend(['--client-ssl-ca', client_ca])
-        cmd.extend(['--client-ssl-request-cert'])
-        cmd.extend(['--client-ssl-reject-unauthorized'])
-        return cmd
-
     async def start(self):
         """Start the proxy process"""
         # check if there is a previous instance still around
@@ -682,7 +618,27 @@ class ConfigurableHTTPProxy(Proxy):
         if self.ssl_cert:
             cmd.extend(['--ssl-cert', self.ssl_cert])
         if self.app.internal_ssl:
-            cmd.extend(self._get_ssl_options())
+            proxy_api = 'proxy-api'
+            proxy_client = 'proxy-client'
+            api_key = self.app.internal_proxy_certs[proxy_api]['keyfile']
+            api_cert = self.app.internal_proxy_certs[proxy_api]['certfile']
+            api_ca = self.app.internal_trust_bundles[proxy_api + '-ca']
+
+            client_key = self.app.internal_proxy_certs[proxy_client]['keyfile']
+            client_cert = self.app.internal_proxy_certs[proxy_client]['certfile']
+            client_ca = self.app.internal_trust_bundles[proxy_client + '-ca']
+
+            cmd.extend(['--api-ssl-key', api_key])
+            cmd.extend(['--api-ssl-cert', api_cert])
+            cmd.extend(['--api-ssl-ca', api_ca])
+            cmd.extend(['--api-ssl-request-cert'])
+            cmd.extend(['--api-ssl-reject-unauthorized'])
+
+            cmd.extend(['--client-ssl-key', client_key])
+            cmd.extend(['--client-ssl-cert', client_cert])
+            cmd.extend(['--client-ssl-ca', client_ca])
+            cmd.extend(['--client-ssl-request-cert'])
+            cmd.extend(['--client-ssl-reject-unauthorized'])
         if self.app.statsd_host:
             cmd.extend(
                 [

jupyterhub/services/auth.py

@@ -19,11 +19,11 @@ import string
 import time
 import uuid
 import warnings
-from unittest import mock
 from urllib.parse import quote
 from urllib.parse import urlencode
 
 import requests
+from tornado.gen import coroutine
 from tornado.httputil import url_concat
 from tornado.log import app_log
 from tornado.web import HTTPError
@@ -668,15 +668,12 @@ class HubOAuth(HubAuth):
 
         Parameters
         ----------
-        handler : RequestHandler
+        handler (RequestHandler): A tornado RequestHandler
-            A tornado RequestHandler
+        next_url (str): The page to redirect to on successful login
-        next_url : str
-            The page to redirect to on successful login
 
         Returns
         -------
-        state : str
+        state (str): The OAuth state that has been stored in the cookie (url safe, base64-encoded)
-            The OAuth state that has been stored in the cookie (url safe, base64-encoded)
         """
         extra_state = {}
         if handler.get_cookie(self.state_cookie_name):
@@ -713,8 +710,7 @@ class HubOAuth(HubAuth):
 
         Parameters
         ----------
-        next_url : str
+        next_url (str): The URL of the page to redirect to on successful login.
-            The URL of the page to redirect to on successful login.
 
         Returns
         -------
@@ -837,12 +833,8 @@ class HubAuthenticated(object):
             # add state argument to OAuth url
             state = self.hub_auth.set_state_cookie(self, next_url=self.request.uri)
             login_url = url_concat(login_url, {'state': state})
-        # temporary override at setting level,
+        app_log.debug("Redirecting to login url: %s", login_url)
-        # to allow any subclass overrides of get_login_url to preserve their effect
+        return login_url
-        # for example, APIHandler raises 403 to prevent redirects
-        with mock.patch.dict(self.application.settings, {"login_url": login_url}):
-            app_log.debug("Redirecting to login url: %s", login_url)
-            return super().get_login_url()
 
     def check_hub_user(self, model):
         """Check whether Hub-authenticated user or service should be allowed.
@@ -927,8 +919,8 @@ class HubAuthenticated(object):
             self._hub_auth_user_cache = None
             raise
 
-        # store ?token=... tokens passed via url in a cookie for future requests
+        # store tokens passed via url or header in a cookie for future requests
-        url_token = self.get_argument('token', '')
+        url_token = self.hub_auth.get_token(self)
         if (
             user_model
             and url_token
@@ -958,7 +950,8 @@ class HubOAuthCallbackHandler(HubOAuthenticated, RequestHandler):
     .. versionadded: 0.8
     """
 
-    async def get(self):
+    @coroutine
+    def get(self):
         error = self.get_argument("error", False)
         if error:
             msg = self.get_argument("error_description", error)