Merge branch 'master' into delete-to-trash

Author: takluyver

.gitignore

@@ -33,3 +33,6 @@ src
 Read the Docs
 config.rst
 
+/.project
+/.pydevproject
+

.travis.yml

@@ -8,15 +8,15 @@ python:
     - 3.5.1  # Set to 3.5.1 since travis has not yet included as default for 3.5
     - 2.7
 
-sudo: false
+sudo: required
 
 env:
   global:
     - PATH=$TRAVIS_BUILD_DIR/pandoc:$PATH
   matrix:
+    - GROUP=js/notebook
     - GROUP=python
     - GROUP=js/base
-    - GROUP=js/notebook
     - GROUP=js/services
     - GROUP=js/tree
 
@@ -29,15 +29,19 @@ before_install:
     - npm --version
     - npm upgrade -g npm
     - npm install
-    - 'if [[ $GROUP == js* ]]; then  npm install -g [email protected]; fi'
+    - |
+      if [[ $GROUP == js* ]]; then 
+        npm install -g [email protected] [email protected]
+      fi
     - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
 
 install:
     - pip install -f travis-wheels/wheelhouse file://$PWD#egg=notebook[test]
+    - wget https://github.com/jgm/pandoc/releases/download/1.19.1/pandoc-1.19.1-1-amd64.deb && sudo dpkg -i pandoc-1.19.1-1-amd64.deb
+
 
 script:
     - 'if [[ $GROUP == js* ]]; then travis_retry python -m notebook.jstest ${GROUP:3}; fi'
-    - 'if [[ $GROUP == "js/notebook" ]]; then npm run lint; fi'
     - 'if [[ $GROUP == python ]]; then nosetests -v --with-coverage --cover-package=notebook notebook; fi'
 
 matrix:

CONTRIBUTING.rst

@@ -24,22 +24,20 @@ Installing Node.js and npm
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Building the Notebook from its GitHub source code requires some tools to
-create and minify JavaScript components and the CSS.
-Namely, that's Node.js and Node's package manager, ``npm``.
+create and minify JavaScript components and the CSS,
+specifically Node.js and Node's package manager, ``npm``.
+It should be node version ≥ 6.0.
 
 If you use ``conda``, you can get them with::
 
-    conda install -c javascript nodejs
+    conda install -c conda-forge nodejs
 
 If you use `Homebrew <http://brew.sh/>`_ on Mac OS X::
 
     brew install node
 
-For Debian/Ubuntu systems, you should use the ``nodejs-legacy`` package instead
-of the ``node`` package::
-
-    sudo apt-get update
-    sudo apt-get install nodejs-legacy npm
+Installation on Linux may vary, but be aware that the `nodejs` or `npm` packages
+included in the system package repository may be too old to work properly.
 
 You can also use the installer from the `Node.js website <https://nodejs.org>`_.
 
@@ -50,14 +48,13 @@ Installing the Jupyter Notebook
 Once you have installed the dependencies mentioned above, use the following
 steps::
 
-    pip install setuptools pip --upgrade --user
+    pip install --upgrade setuptools pip
     git clone https://github.com/jupyter/notebook
     cd notebook
-    pip install -e . --user
+    pip install -e .
 
-If you want the development environment to be available for all users of your
-system (assuming you have the necessary rights) or if you are installing in a
-virtual environment, just drop the ``--user`` option.
+If you are using a system-wide Python installation and you only want to install the notebook for you,
+you can add ``--user`` to the install commands.
 
 Once you have done this, you can launch the master branch of Jupyter notebook
 from any directory in your system with::
@@ -72,25 +69,28 @@ There is a build step for the JavaScript and CSS in the notebook.
 To make sure that you are working with up-to-date code, you will need to run
 this command whenever there are changes to JavaScript or LESS sources::
 
-    python setup.py js css
+    npm run build
+
+**IMPORTANT:** Don't forget to run ``npm run build`` after switching branches. 
+When switching between branches of different versions (e.g. ``4.x`` and 
+``master``), run ``pip install -e .``. If you have tried the above and still 
+find that the notebook is not reflecting the current source code, try cleaning
+the repo with ``git clean -xfd`` and reinstalling with ``pip install -e .``.
 
-Prototyping Tip
+Development Tip
 """""""""""""""
 
-When doing prototyping which needs quick iteration of the Notebook's
-JavaScript, run this in the root of the repository::
+When doing development, you can use this command to automatically rebuild 
+JavaScript and LESS sources as they are modified::
 
     npm run build:watch
 
-This will cause WebPack to monitor the files you edit and recompile them on the
-fly.
-
 Git Hooks
 """""""""
 
-If you want to automatically update dependencies, recompile the JavaScript, and
-recompile the CSS after checking out a new commit, you can install
-post-checkout and post-merge hooks which will do it for you::
+If you want to automatically update dependencies and recompile JavaScript and
+CSS after checking out a new commit, you can install post-checkout and 
+post-merge hooks which will do it for you::
 
     git-hooks/install-hooks.sh
 
@@ -105,7 +105,7 @@ Python Tests
 
 Install dependencies::
 
-    pip install -e .[test] --user
+    pip install -e .[test]
 
 To run the Python tests, use::
 
@@ -121,7 +121,7 @@ JavaScript Tests
 To run the JavaScript tests, you will need to have PhantomJS and CasperJS
 installed::
 
-    npm install -g casperjs phantomjs@1.9.18
+    npm install -g casperjs phantomjs-prebuilt
 
 Then, to run the JavaScript tests::
 
@@ -154,10 +154,9 @@ containing all the necessary packages (except pandoc), use::
 .. _conda environment:
     http://conda.pydata.org/docs/using/envs.html#use-environment-from-file
 
-If you want to install the necessary packages with ``pip`` instead, use
-(omitting --user if working in a virtual environment)::
+If you want to install the necessary packages with ``pip`` instead::
 
-    pip install -r docs/doc-requirements.txt --user
+    pip install -r docs/doc-requirements.txt
 
 Once you have installed the required packages, you can build the docs with::
 

MANIFEST.in

@@ -1,5 +1,5 @@
 include COPYING.md
-include CONTRIBUTING.md
+include CONTRIBUTING.rst
 include README.md
 include package.json
 include bower.json

appveyor.yml

@@ -3,30 +3,20 @@ matrix:
   fast_finish: true
 
 environment:
-  CONDA_INSTALL_LOCN: "C:\\conda"
   matrix:
     - CONDA_PY: 35
+      CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
     - CONDA_PY: 27
+      CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
 
 platform:
   - x64
 
 build: off
 
 install:
-  - appveyor DownloadFile "https://raw.githubusercontent.com/conda-forge/conda-smithy/master/bootstrap-obvious-ci-and-miniconda.py"
-  - cmd: python bootstrap-obvious-ci-and-miniconda.py %CONDA_INSTALL_LOCN% %platform% %CONDA_PY:~0,1% --without-obvci
-
-  # Add a hack to switch to `conda` version `4.1.12` before activating.
-  # This is required to handle a long path activation issue.
-  # Verbatim from https://github.com/conda-forge/conda-smithy/pull/329
-  - cmd: set "OLDPATH=%PATH%"
-  - cmd: set "PATH=%CONDA_INSTALL_LOCN%\\Scripts;%CONDA_INSTALL_LOCN%\\Library\\bin;%PATH%"
-  - cmd: conda install --yes --quiet conda=4.1.12
-  - cmd: set "PATH=%OLDPATH%"
-  - cmd: set "OLDPATH="
-
   - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
+  - cmd: conda update --yes --quiet conda
   - cmd: conda config --set show_channel_urls true
   - cmd: conda config --add channels conda-forge
   - cmd: conda install -y pyzmq tornado jupyter_client nbformat nbconvert ipykernel pip nodejs nose

bower.json

@@ -5,16 +5,25 @@
     "backbone": "components/backbone#~1.2",
     "bootstrap": "components/bootstrap#~3.3",
     "bootstrap-tour": "0.9.0",
-    "codemirror": "components/codemirror#~5.21",
-    "font-awesome": "components/font-awesome#~4.2.0",
+    "codemirror": "components/codemirror#~5.27",
+    "es6-promise": "~1.0",
+    "font-awesome": "components/font-awesome#~4.7.0",
     "google-caja": "5669",
+    "jed": "~1.1.1",
     "jquery": "components/jquery#~2.0",
     "jquery-typeahead": "~2.0.0",
     "jquery-ui": "components/jqueryui#~1.10",
     "marked": "~0.3",
     "MathJax": "components/MathJax#~2.6",
+    "moment": "~2.8.4",
+    "preact": "https://unpkg.com/preact@^7.2.0/dist/preact.min.js",
+    "preact-compat": "https://unpkg.com/preact-compat@^3.14.3/dist/preact-compat.min.js",
+    "proptypes": "https://unpkg.com/proptypes@^0.14.4/index.js",
     "requirejs": "~2.1",
+    "requirejs-text": "~2.0.15",
+    "requirejs-plugins": "~1.0.3",
     "text-encoding": "~0.1",
-    "underscore": "components/underscore#~1.8.3"
+    "underscore": "components/underscore#~1.8.3",
+    "xterm.js": "sourcelair/xterm.js#~2.8.1"
   }
 }