Merge branch 'master' into master

Author: takluyver

CONTRIBUTING.rst

@@ -80,9 +80,9 @@ If you do not see that your Jupyter Notebook is not running on dev mode, it's po
 running other instances of Jupyter Notebook. You can try the following steps:
 
 1. Uninstall all instances of the notebook package. These include any installations you made using
-   pip or conda
-2. Run ``python3 -m pip install -e .`` in the notebook repository to install the notebook from there
-3. Run ``npm run build`` to make sure the Javascript and CSS are updated and compiled
+   pip or conda.
+2. Run ``python3 -m pip install -e .`` in the notebook repository to install the notebook from there.
+3. Run ``npm run build`` to make sure the Javascript and CSS are updated and compiled.
 4. Launch with ``python3 -m notebook --port 8989``, and check that the browser is pointing to ``localhost:8989``
    (rather than the default 8888). You don't necessarily have to launch with port 8989, as long as you use
    a port that is neither the default nor in use, then it should be fine.
@@ -98,16 +98,16 @@ this command whenever there are changes to JavaScript or LESS sources::
 
     npm run build
 
-**IMPORTANT:** Don't forget to run ``npm run build`` after switching branches. 
-When switching between branches of different versions (e.g. ``4.x`` and 
-``master``), run ``pip install -e .``. If you have tried the above and still 
+**IMPORTANT:** Don't forget to run ``npm run build`` after switching branches.
+When switching between branches of different versions (e.g. ``4.x`` and
+``master``), run ``pip install -e .``. If you have tried the above and still
 find that the notebook is not reflecting the current source code, try cleaning
 the repo with ``git clean -xfd`` and reinstalling with ``pip install -e .``.
 
 Development Tip
 """""""""""""""
 
-When doing development, you can use this command to automatically rebuild 
+When doing development, you can use this command to automatically rebuild
 JavaScript and LESS sources as they are modified::
 
     npm run build:watch
@@ -116,7 +116,7 @@ Git Hooks
 """""""""
 
 If you want to automatically update dependencies and recompile JavaScript and
-CSS after checking out a new commit, you can install post-checkout and 
+CSS after checking out a new commit, you can install post-checkout and
 post-merge hooks which will do it for you::
 
     git-hooks/install-hooks.sh
@@ -132,7 +132,7 @@ Python Tests
 
 Install dependencies::
 
-    pip install -e .[test]
+    pip install -e '.[test]'
 
 To run the Python tests, use::
 

COPYING.md renamed to LICENSE

@@ -1,5 +1,3 @@
-# Licensing terms
-
 This project is licensed under the terms of the Modified BSD License
 (also known as New or Revised or 3-Clause BSD), as follows:
 

MANIFEST.in

@@ -1,4 +1,4 @@
-include COPYING.md
+include LICENSE
 include CONTRIBUTING.rst
 include README.md
 include package.json

bower.json

@@ -5,13 +5,13 @@
     "backbone": "components/backbone#~1.2",
     "bootstrap": "bootstrap#~3.4",
     "bootstrap-tour": "0.9.0",
-    "codemirror": "components/codemirror#~5.37",
+    "codemirror": "components/codemirror#~5.48.4",
     "create-react-class": "https://cdn.jsdelivr.net/npm/[email protected]/create-react-class.min.js",
     "es6-promise": "~1.0",
     "font-awesome": "components/font-awesome#~4.7.0",
     "google-caja": "5669",
     "jed": "~1.1.1",
-    "jquery": "components/jquery#~3.3",
+    "jquery": "components/jquery#~3.4.1",
     "jquery-typeahead": "~2.0.0",
     "jquery-ui": "components/jqueryui#~1.12",
     "marked": "~0.5",

docs-translations/ko-KR/README.md

@@ -13,8 +13,8 @@ Jupyter notebook 은 상호 교환을 위한 웹 기반 환경입니다.
 ### Jupyter notebook, 사용자의 언어에 독립적인 IPython notebook의 진화
 Jupyter notebook은 Jupyter 프로젝트를 위한 사용자 언어에 독립적인 HTML 응용 프로그램입니다.
 2015년에 Jupyter notebook은 IPython 코드 기반의 The Big Split™ 의 일부분으로 시작되었습니다.
-IPython 3는 *IPython notebook* 과 같은 사용자 언어에 독립적인 코드와 *IPython kernel for Python* 과 같은 특정언어 기반의 코드의 기능을 가지고 출시되었습니다.
-컴퓨터에는 많은 언어가 사용되기 때문에, Jupyter 프로젝트는 사용자 언어에 독립적인 **Jupyter notebook** 을 이 저장소와 개인의 독립적인 저장소에 있는 특정언어 중심의 커널의 도움으로 지속적으로 개발할 것입니다.
+IPython 3는 *IPython notebook* 과 같은 사용자 언어에 독립적인 코드와 *IPython kernel for Python* 과 같은 특정 언어 기반의 코드의 기능을 가지고 출시되었습니다.
+컴퓨터에는 많은 언어가 사용되기 때문에, Jupyter 프로젝트는 사용자 언어에 독립적인 **Jupyter notebook** 을 이 저장소와 개인의 독립적인 저장소에 있는 특정 언어 중심의 커널의 도움으로 지속적으로 개발할 것입니다.
 [[The Big Split™ announcement](https://blog.jupyter.org/2015/04/15/the-big-split/)]
 [[Jupyter Ascending blog post](http://blog.jupyter.org/2015/08/12/first-release-of-jupyter/)]
 

docs/source/changelog.rst

@@ -21,6 +21,44 @@ We strongly recommend that you upgrade pip to version 9+ of pip before upgrading
     Use ``pip install pip --upgrade`` to upgrade pip. Check pip version with
     ``pip --version``.
 
+.. _release-6.0.2:
+
+6.0.2
+-----
+
+- Update JQuery dependency to version 3.4.1 to fix security vulnerability (CVE-2019-11358)
+- Update CodeMirror to version 5.48.4 to fix Python formatting issues
+- Continue removing obsolete Python 2.x code/dependencies
+- Multiple documentation updates
+
+Thanks for all the contributors:
+
+- David Robles
+- Jason Grout
+- Kerwin Sun
+- Kevin Bates
+- Kyle Kelley
+- Luciano Resende
+- Marcus D Sherman
+- Sasaki Takeru
+- Tom Jarosz
+- Vidar Tonaas Fauske
+- Wes Turner
+- Zachary Sailer
+
+.. _release-6.0.1:
+
+6.0.1
+-----
+
+- Attempt to re-establish websocket connection to Gateway (:ghpull:`4777`)
+- Add missing react-dom js to package data (:ghpull:`4772`)
+
+Thanks for all the contributors:
+
+- Eunsoo Park
+- Min RK
+
 .. _release-6.0:
 
 6.0

docs/source/examples/Notebook/Typesetting Equations.ipynb

@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The Markdown parser included in the Jupyter Notebook is MathJax-aware.  This means that you can freely mix in mathematical expressions using the [MathJax subset of Tex and LaTeX](http://docs.mathjax.org/en/latest/tex.html#tex-support).  [Some examples from the MathJax site](https://www.mathjax.org/demos/tex-samples/) are reproduced below, as well as the Markdown+TeX source."
+    "The Markdown parser included in the Jupyter Notebook is MathJax-aware.  This means that you can freely mix in mathematical expressions using the [MathJax subset of Tex and LaTeX](https://docs.mathjax.org/en/latest/input/tex/).  [Some examples from the MathJax demos site](https://mathjax.github.io/MathJax-demos-web/) are reproduced below, as well as the Markdown+TeX source."
    ]
   },
   {
@@ -272,9 +272,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.1"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }

docs/source/examples/Notebook/Working With Markdown Cells.ipynb

@@ -155,7 +155,7 @@
     "\n",
     "or other languages:\n",
     "\n",
-    "    if (i=0; i<n; i++) {\n",
+    "    for (i=0; i<n; i++) {\n",
     "      printf(\"hello %d\\n\", i);\n",
     "      x += 4;\n",
     "    }"

docs/source/extending/contents.rst

@@ -79,8 +79,11 @@ model. There are three model types: **notebook**, **file**, and **directory**.
 
 - ``file`` models
     - The ``format`` field is either ``"text"`` or ``"base64"``.
-    - The ``mimetype`` field is ``text/plain`` for text-format models and
-      ``application/octet-stream`` for base64-format models.
+    - The ``mimetype`` field can be any mimetype string, but defaults to 
+      ``text/plain`` for text-format models and
+      ``application/octet-stream`` for base64-format models. For files with
+      unknown mime types (e.g. unknown file extensions), this field may be
+      `None`.
     - The ``content`` field is always of type ``unicode``.  For text-format
       file models, ``content`` simply contains the file's bytes after decoding
       as UTF-8.  Non-text (``base64``) files are read as bytes, base64 encoded,
@@ -97,11 +100,13 @@ model. There are three model types: **notebook**, **file**, and **directory**.
    .. _contentfree:
 
    In certain circumstances, we don't need the full content of an entity to
-   complete a Contents API request.  In such cases, we omit the ``mimetype``,
-   ``content``, and ``format`` keys from the model. This most commonly occurs
-   when listing a directory, in which circumstance we represent files within
-   the directory as content-less models to avoid having to recursively traverse
-   and serialize the entire filesystem.
+   complete a Contents API request. In such cases, we omit the ``content``, and
+   ``format`` keys from the model. The default values for the ``mimetype``
+   field will might also not be evaluated, in which case it will be set as `None`.
+   This reduced reply most commonly occurs when listing a directory, in
+   which circumstance we represent files within the directory as content-less
+   models to avoid having to recursively traverse and serialize the entire
+   filesystem.
 
 **Sample Models**
 

notebook/auth/login.py

@@ -6,10 +6,8 @@
 import re
 import os
 
-try:
-    from urllib.parse import urlparse # Py 3
-except ImportError:
-    from urlparse import urlparse # Py 2
+from urllib.parse import urlparse
+
 import uuid
 
 from tornado.escape import url_escape