Merge branch 'master' into helm

Author: minrk

.gitignore

@@ -13,6 +13,7 @@ build
 dist
 node_modules
 screenshots
+nbviewer/git_info.json
 # ignore downloaded notebook sources
 notebook-*
 .eggs/

Dockerfile

@@ -1,81 +1,49 @@
 # Define a builder image
-FROM debian:jessie as builder
+FROM python:3.7-buster as builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV LANG=C.UTF-8
-RUN apt-get update && \
-  apt-get install -yq --no-install-recommends \
-    curl \
-    bzip2 \
-    ca-certificates
-
-ENV MINICONDA_VERSION 4.7.10
-ENV PATH=/opt/conda/bin:$PATH
-RUN cd /tmp && \
-    curl -sSL https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh -o /tmp/miniconda.sh && \
-    echo "1c945f2b3335c7b2b15130b1b2dc5cf4 *miniconda.sh" | md5sum -c - && \
-    /bin/bash miniconda.sh -f -b -p /opt/conda && \
-    rm miniconda.sh && \
-    /opt/conda/bin/conda config --system --prepend channels conda-forge && \
-    /opt/conda/bin/conda config --system --set auto_update_conda false && \
-    /opt/conda/bin/conda config --system --set show_channel_urls true && \
-    /opt/conda/bin/conda install --quiet --yes conda="${MINICONDA_VERSION%.*}.*" && \
-    /opt/conda/bin/conda update --all --quiet --yes && \
-    conda clean -tipsy
-
-# NodeJS toolchain
-WORKDIR /srv/nbviewer
-RUN conda install nodejs git
-COPY ./package.json /srv/nbviewer/
-RUN npm install .
+RUN apt-get update \
+ && apt-get install -yq --no-install-recommends \
+    ca-certificates \
+    libcurl4-gnutls-dev \
+    git \
+    nodejs \
+    npm
 
 # Python requirements
-ADD ./requirements.txt /srv/nbviewer/
-RUN conda install --file requirements.txt
+COPY ./requirements-dev.txt /srv/nbviewer/
+COPY ./requirements.txt /srv/nbviewer/
+RUN python3 -mpip install -r /srv/nbviewer/requirements-dev.txt -r /srv/nbviewer/requirements.txt
 
-# Add bower requirements
-COPY [ \
-  "./nbviewer/static/bower.json", \
-  "./nbviewer/static/.bowerrc", \
-  "/srv/nbviewer/nbviewer/static/" \
-]
-
-# Invoke bower
-WORKDIR /srv/nbviewer/nbviewer/static
-RUN ../../node_modules/.bin/bower install \
-  --allow-root \
-  --config.interactive=false
-
-# Build CSS
 WORKDIR /srv/nbviewer
-RUN conda install invoke
-COPY ./nbviewer/static/less /srv/nbviewer/nbviewer/static/less/
-COPY ./tasks.py /srv/nbviewer/
-RUN invoke less
-
-# Remove build-only packages so that we can copy a clean conda environment
-# to the runtime image. Need to leave git intact: it's a runtime dep!
-RUN conda remove -y nodejs invoke && \
-  conda clean -ay && \
-  rm -rf /opt/conda/pkgs /opt/conda/conda-meta && \
-  rm -rf /srv/nbviewer/node_modules /srv/nbviewer/notebook-*
 
-# Copy source tree in and only keep .git so that the version
-# web resource works properly
+# Copy source tree in
 COPY . /srv/nbviewer
+RUN python3 setup.py build && \
+    python3 -mpip wheel -vv . -w /wheels
 
 # Now define the runtime image
-FROM debian:jessie
+FROM python:3.7-slim-buster
+LABEL maintainer="Jupyter Project <[email protected]>"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV LANG=C.UTF-8
 
-COPY --from=builder /opt/conda /opt/conda
-COPY --from=builder /srv/nbviewer /srv/nbviewer
+RUN apt-get update \
+ && apt-get install -yq --no-install-recommends \
+    ca-certificates \
+    libcurl4 \
+    git \
+ && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-LABEL maintainer="Jupyter Project <[email protected]>"
+
+COPY --from=builder /wheels /wheels
+RUN python3 -mpip install --no-cache /wheels/*
 
 # To change the number of threads use
 # docker run -d -e NBVIEWER_THREADS=4 -p 80:8080 nbviewer
 ENV NBVIEWER_THREADS 2
-ENV PATH=/opt/conda/bin:$PATH
 WORKDIR /srv/nbviewer
 EXPOSE 8080
 USER nobody

MANIFEST.in

@@ -1,3 +1,4 @@
 include versioneer.py
 include nbviewer/_version.py
-include requirements.txt
+include requirements.txt
+include nbviewer/git_info.json

README.md

@@ -1,6 +1,8 @@
 # Jupyter Notebook Viewer
 
-Jupyter nbviewer is the web application behind [The Jupyter Notebook Viewer](http://nbviewer.ipython.org), which is graciously hosted by [Rackspace](https://developer.rackspace.com/?nbviewer=awesome).
+Jupyter nbviewer is the web application behind
+[The Jupyter Notebook Viewer](http://nbviewer.jupyter.org),
+which is graciously hosted by [OVHCloud](https://ovhcloud.com).
 
 Run this locally to get most of the features of nbviewer on your own network.
 

nbviewer/templates/faq.md

@@ -159,9 +159,10 @@ the [nbconvert documentation](https://nbconvert.readthedocs.io/) for details.
 
 ## Where is nbviewer.jupyter.org hosted?
 
-[Rackspace](https://developer.rackspace.com/?nbviewer=awesome) graciously hosts
-nbviewer.jupyter.org. Thanks to Rackspace, we are able to provider a public
-nbviewer instance as a free service.
+[OVHCloud](https://ovhcloud.com) graciously hosts nbviewer.jupyter.org.
+Thanks to OVHCloud, we are able to provider a public nbviewer instance as a free service.
+
+nbviewer was generously hosted by Rackspace until March, 2020.
 
 ## Can I access nbviewer.jupyter.org over https?
 

nbviewer/templates/layout.html

@@ -131,7 +131,7 @@
         <div class="col-md-4">
           <p>
             Delivered by <a href="http://www.fastly.com/">Fastly</a>,
-            Rendered by <a href="https://developer.rackspace.com/?nbviewer=awesome">Rackspace</a>
+            Rendered by <a href="https://ovhcloud.com">OVHCloud</a>
           </p>
           <p>
             nbviewer GitHub <a href="https://github.com/jupyter/nbviewer">repository</a>.

nbviewer/utils.py

@@ -12,6 +12,8 @@
 
 import cgi
 from contextlib import contextmanager
+import json
+import os
 import re
 from subprocess import check_output
 import time
@@ -30,6 +32,9 @@
     'access_token',
 ]
 
+HERE = os.path.dirname(__file__)
+GIT_INFO_JSON = os.path.join(HERE, 'git_info.json')
+
 
 class EmptyClass(object):
     """
@@ -193,8 +198,11 @@ def parse_header_links(value):
     return links
 
 
-def git_info(path):
+def git_info(path, force_git=False):
     """Return some git info"""
+    if os.path.exists(GIT_INFO_JSON) and not force_git:
+        with open(GIT_INFO_JSON, 'r') as f:
+            return json.load(f)
     command = ['git', 'log', '-1', '--format=%H\n%s\n%cD']
     sha, msg, date = check_output(command, cwd=path).decode('utf8').splitlines()
     return dict(

requirements-dev.txt

@@ -3,4 +3,3 @@ invoke>=0.13.0
 mock>=1.3.0  # python34 and older versions of mock do not play well together.
 nose
 requests
--e .

setup.py

@@ -25,6 +25,7 @@ def sh(cmd):
 
 def preflight():
     log.info("Building LESS")
+    sh(['invoke', 'git-info'])
     sh(['npm', 'install'])
     sh(['invoke', 'bower'])
     sh(['invoke', 'less'])
@@ -50,7 +51,7 @@ def walk_subpkg(name):
 
 pkg_data = {
     "nbviewer": (
-        ['frontpage.json'] +
+        ['frontpage.json', 'git_info.json'] +
         walk_subpkg('static') +
         walk_subpkg('templates') +
         walk_subpkg('providers')

tasks.py

@@ -3,6 +3,7 @@
 
 from __future__ import print_function
 
+import json
 import os
 import hashlib
 import pipes
@@ -151,6 +152,21 @@ def sdist(ctx):
     ctx.run('python setup.py sdist')
 
 
+@invoke.task
+def git_info(ctx):
+    sys.path.insert(0, os.path.join(APP_ROOT, "nbviewer"))
+    try:
+        from utils import git_info, GIT_INFO_JSON
+        info = git_info(APP_ROOT, force_git=True)
+    except Exception as e:
+        print("Failed to get git info", e)
+        return
+    print("Writing git info to %s" % GIT_INFO_JSON)
+    with open(GIT_INFO_JSON, "w") as f:
+        json.dump(info, f)
+    sys.path.pop(0)
+
+
 @invoke.task
 def release(ctx):
     bower(ctx)