Skip to content

Monkey patch 102516 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 475 commits into
base: master
Choose a base branch
from
Open
Changes from 3 commits
Commits
Show all changes
475 commits
Select commit Hold shift + click to select a range
95790be
kernel halt confirmation dialog
ivanov Jan 19, 2017
03e410b
rename Halt to Shutdown
ivanov Jan 25, 2017
051e430
fix tests
ivanov Jan 25, 2017
eb73920
Merge pull request #2070 from ivanov/halt-kernel
minrk Jan 25, 2017
cd47dac
Merge pull request #2061 from dkrenn/dkrenn/event-finished-exec
minrk Jan 25, 2017
0e38b00
Patch CodeMirror after `bower install`
gnestor Jan 25, 2017
83a2e83
declare contents variable
minrk Jan 25, 2017
5721d7c
Merge pull request #2073 from minrk/var-contents
minrk Jan 25, 2017
393a04d
Merge pull request #2066 from jupyter/cm-up
minrk Jan 25, 2017
482ea4b
Adds edit and view buttons, #1752
Sep 10, 2016
a7387b8
Revise https://github.com/jupyter/notebook/pull/1755
gnestor Nov 17, 2016
b7dcae6
Update View and Edit conditions
gnestor Nov 18, 2016
0034f2a
Create `/view` route, handler, and template
gnestor Jan 25, 2017
224294c
Use `/view` route for HTML files
gnestor Jan 25, 2017
3cbb570
Add `test_view_html`
gnestor Jan 25, 2017
acf4fa8
Clean up
gnestor Jan 25, 2017
3d7f0f2
Make dialogs draggable
gnestor Jan 26, 2017
12688f2
show message only on dev
Carreau Jan 26, 2017
74ac1c0
drag modal dialogs by the header only
ivanov Jan 26, 2017
1088371
Merge pull request #5 from ivanov/draggable-dialog
gnestor Jan 26, 2017
532a66b
Display "move" cursor within modal header
gnestor Jan 26, 2017
ecc3ea0
Merge pull request #2076 from gnestor/draggable-dialog
ivanov Jan 26, 2017
7276986
doc typos related with issue #2069
Jan 27, 2017
c75a9d8
Merge pull request #2077 from kikocorreoso/master
minrk Jan 27, 2017
87b5b2f
Fix missing running kernels
parente Jan 28, 2017
fecab00
Merge pull request #2078 from parente/fix-missing-kernelspec
takluyver Jan 28, 2017
1bc6e20
trigger event change.Cell
dkrenn Jan 29, 2017
be5cf10
Merge pull request #2065 from jinmehta13/console-welcome-message
Carreau Jan 29, 2017
39b756b
Merge pull request #1905 from gnestor/pr/1755
takluyver Jan 30, 2017
27cfa29
Merge pull request #2048 from vidartf/tags-bar
takluyver Jan 30, 2017
bee0f83
Merge pull request #2083 from dkrenn/dkrenn/event-change-cell
minrk Jan 30, 2017
ef32784
Add swagger yaml file to package_data
takluyver Jan 30, 2017
ba7e718
Merge pull request #2085 from takluyver/i2082
takluyver Jan 30, 2017
52ba4c9
Update changelog
gnestor Jan 31, 2017
9726316
fix and tests for the issue related with the trailing slash using 'nb…
Jan 31, 2017
4c9f130
fix issue with OS in tests
Jan 31, 2017
0ed0af5
Remove hardcoded widgets check
takluyver Jan 31, 2017
934f872
Merge pull request #2089 from gnestor/4.3.2
takluyver Jan 31, 2017
0eff9ef
Merge pull request #2093 from takluyver/rm-widgets-hardcode
minrk Jan 31, 2017
5eda102
Merge pull request #2091 from kikocorreoso/ndextension-install-traili…
minrk Jan 31, 2017
2b09d59
re-add `npm run build:watch`
minrk Jan 31, 2017
20e017b
add edit button to shortcuts dialog
minrk Jan 31, 2017
99ad209
Update links to example notebooks
takluyver Jan 31, 2017
9ad19e9
avoid stacked "changed on disk" dialogs
minrk Jan 31, 2017
9058de7
Remove link to outdated note about roundtrip conversions
takluyver Jan 31, 2017
7aa7781
Update Intersphinx URL for IPython
takluyver Jan 31, 2017
1b47ac7
Restore https
takluyver Jan 31, 2017
5bb475e
Update nbviewer Github URLs
takluyver Jan 31, 2017
271c4b1
Merge pull request #2095 from minrk/build-watch
blink1073 Jan 31, 2017
2eb7bf1
Merge pull request #2098 from minrk/double-change-on-disk
blink1073 Jan 31, 2017
9988ce1
Start to list new features in changelog
Carreau Jan 31, 2017
13cd66a
Merge pull request #2096 from minrk/edit-shortcuts-link
Carreau Feb 1, 2017
7850fae
Merge pull request #2099 from takluyver/docs-eg-nbs-links
Carreau Feb 1, 2017
ad805b1
Merge pull request #2105 from Carreau/edit-changelog
willingc Feb 1, 2017
ad01950
Merge nbserver_extensions
minrk Feb 1, 2017
c0dd153
Try using Miniconda already on Appveyor rather than downloading
takluyver Feb 1, 2017
1797f34
test merging serverextensions from sys and user config
minrk Feb 1, 2017
e70e7be
remove unused code in nbextensions
minrk Feb 1, 2017
c31834e
Merge pull request #2109 from takluyver/appveyor-conda
minrk Feb 1, 2017
f0d5ccb
disable all config in tests
minrk Feb 1, 2017
c807268
Clarify where docs are specific to IPython
takluyver Feb 1, 2017
8ebc593
Isolate directionality of a string from surrounding
ebraminio Feb 1, 2017
90429ad
Add a menu item to edit keyboard shortcuts.
Carreau Jan 31, 2017
3c1a25f
Merge pull request #2114 from ebraminio/master
Carreau Feb 1, 2017
2361985
test dirs are paths, not TempDir objects
minrk Feb 1, 2017
fde1c6e
handle self.config_dir and self.config_file_name in server_extensions
minrk Feb 1, 2017
dacfd21
Add back xterm.css
gnestor Feb 1, 2017
3b82344
Merge pull request #2116 from gnestor/xterm-css
Carreau Feb 2, 2017
6b4ec57
Fix typos.
Carreau Feb 2, 2017
90d30d2
Merge pull request #2108 from minrk/merge-server-extensions
Carreau Feb 2, 2017
4a16c37
Merge pull request #2111 from minrk/patch-env
Carreau Feb 2, 2017
49c2e79
Revert "Isolate directionality of a string from surrounding"
ebraminio Feb 2, 2017
8fbf1fb
Merge pull request #2104 from Carreau/shortcut-edit-menu
takluyver Feb 2, 2017
b3a4384
Merge pull request #2119 from ebraminio/master
takluyver Feb 2, 2017
6a163d5
Upgrade xtermjs to 2.2.3
takluyver Feb 2, 2017
5de7731
remove token query parameter from pages on load
minrk Feb 3, 2017
2042b2a
Merge pull request #2124 from takluyver/xterm-223
minrk Feb 3, 2017
7c3b101
Add shortcut p for command palette
takluyver Feb 3, 2017
6c59533
Apply find-and-replace to selected cells only by default.
Jessime Feb 3, 2017
423fd5e
Merge pull request #2129 from takluyver/i2121
Carreau Feb 3, 2017
fbb5a43
Update style for code tar in `.well`
Carreau Feb 3, 2017
6d0b45b
Remove double border in Find and replace UI.
Carreau Feb 3, 2017
f42584b
Merge pull request #2133 from Carreau/fix-code-well
takluyver Feb 4, 2017
8e477e5
Merge pull request #2128 from minrk/remove-token-url
minrk Feb 6, 2017
9cf239f
Merge pull request #2132 from Carreau/fix-find-replace-css
minrk Feb 6, 2017
3dc91c9
remove unused variable in token removal
minrk Feb 6, 2017
9364db7
Add cmdtrl-shift-f shortcut to show command palette
takluyver Feb 6, 2017
326077f
Merge pull request #2137 from minrk/unused-found
takluyver Feb 6, 2017
6fbb391
Bump up tornado buffer sizes to allow saving large notebooks
takluyver Feb 6, 2017
900e77d
Merge pull request #2139 from takluyver/save-larger
rgbkrk Feb 6, 2017
7784723
add base_url to view page
minrk Feb 7, 2017
0ccb548
Merge pull request #2138 from takluyver/f-cmd-palette
minrk Feb 7, 2017
2ce065a
switchClass is undefined
minrk Feb 7, 2017
fc2e03a
Merge pull request #2145 from minrk/view-base-url
takluyver Feb 7, 2017
4773326
Work on changelog for 5.0
takluyver Feb 7, 2017
d51fa4b
Centre images
takluyver Feb 7, 2017
4ad5165
Fix layout issue of "Edit Keybord shortcut" on Firefox
Carreau Feb 7, 2017
683a184
Merge pull request #2131 from Jessime/find_replace
ellisonbg Feb 7, 2017
b98c801
Merge pull request #2152 from Carreau/fix-kbd-ff
Carreau Feb 7, 2017
f482d40
Use arrows-v for find in all cells icon
takluyver Feb 7, 2017
6bf2aab
Merge pull request #2148 from takluyver/changelog-50
Carreau Feb 8, 2017
038eda8
Merge pull request #2157 from takluyver/fr-all-cells-icon
Carreau Feb 8, 2017
f84b969
Merge pull request #2146 from minrk/modified-sort-link
minrk Feb 8, 2017
f982c0d
attachment mimebundle values are strings, not lists
minrk Feb 8, 2017
f638807
copying cells copies attachments
minrk Feb 8, 2017
6473d6e
Merge pull request #2159 from minrk/attachments
takluyver Feb 8, 2017
f06aca7
Wrap prompts in bdi for rtl layout
Carreau Feb 3, 2017
f924613
Add 4.4 to changelog
gnestor Feb 9, 2017
ce4e7ee
Merge pull request #2163 from gnestor/4.4
gnestor Feb 9, 2017
8420668
Uncomment 5.0 section in changelog
gnestor Feb 9, 2017
844d069
Merge pull request #2165 from gnestor/4.4
takluyver Feb 9, 2017
0543d55
Upgrade xterm.js to 2.3.1
blink1073 Feb 10, 2017
b2b12ec
Merge pull request #2171 from blink1073/xterm-2.3
takluyver Feb 10, 2017
b72ab07
Add a clearOutput code cell event
jasongrout Feb 10, 2017
080fae2
DOC: Fix typo
ericdill Feb 13, 2017
765a453
Merge pull request #2181 from ericdill/typo
minrk Feb 13, 2017
f63fbe3
Upgrade xterm.js to newly released 2.3.2
takluyver Feb 13, 2017
260a944
Merge pull request #2184 from takluyver/xtermjs-232
rgbkrk Feb 13, 2017
9e162ff
Fix the left cell border
gnestor Feb 13, 2017
674ac62
Update dev install/build docs
gnestor Feb 13, 2017
3e1f545
Merge pull request #2185 from gnestor/docs-rebuild
willingc Feb 14, 2017
cb24759
Support ANSI underline and inverse properties.
tonycpsu Feb 14, 2017
aadb343
Add unerline and inverse to ANSI test notebook.
tonycpsu Feb 14, 2017
0e453e7
Merge pull request #2175 from gnestor/left-cell-border
takluyver Feb 14, 2017
d3cd858
Fix ANSI bold/underline/inverse test to reset after each line.
tonycpsu Feb 14, 2017
a33d136
Merge pull request #2186 from tonycpsu/master
takluyver Feb 14, 2017
971c63d
Update codecell.js
jasongrout Feb 14, 2017
a1dca23
Merge pull request #2173 from jasongrout/clearoutput-5
gnestor Feb 14, 2017
23d5520
UX: Put notebook first on new menu
Carreau Feb 14, 2017
1a412fc
Use form not div so that enter can submit changes
mpacer Feb 14, 2017
6f1ef4a
Merge pull request #2189 from Carreau/notebook-first
gnestor Feb 14, 2017
088dabf
Merge pull request #2188 from michaelpacer/enter_keybinding
takluyver Feb 15, 2017
ebb1f74
release 5.0.0b1
takluyver Feb 15, 2017
747fcf0
Back to development
takluyver Feb 15, 2017
c5711eb
Large structural changes to the keybinding help interface.
mpacer Feb 15, 2017
6b08b86
Some polishing, variable name change, etc.
mpacer Feb 16, 2017
b91c921
Add line breaks
mpacer Feb 16, 2017
8543b4e
Put short description at top, longer at bottom
mpacer Feb 17, 2017
240186a
Add Cmdtrl description
mpacer Feb 17, 2017
1f93cb6
Clarify prefix exclusion
mpacer Feb 17, 2017
c305d8f
Merge pull request #2198 from michaelpacer/keybinding_docs
takluyver Feb 18, 2017
f384662
Fix viewing HTML in sandboxed iframe
takluyver Feb 20, 2017
b683d6f
Merge pull request #2208 from takluyver/fix-view-html
minrk Feb 20, 2017
1e3eb0e
[Tags UI] Replace <a>X</a> with FA icon
vidartf Feb 20, 2017
1f11cd1
[Tags UI] Style input controls according to review
vidartf Feb 20, 2017
2d42e62
Don't use jquery-ui data selector
minrk Feb 21, 2017
076f4e9
Merge pull request #2211 from minrk/data-selector
takluyver Feb 21, 2017
9dd3818
Merge pull request #2134 from Carreau/rtl-prompt
Carreau Feb 22, 2017
7733aeb
Fixed issue 980
joined Feb 23, 2017
2b4145e
[TagsUI] Prevent highlighting of tagbar input box
vidartf Feb 23, 2017
98b07e7
Merge pull request #2210 from vidartf/tags-ui-review
Carreau Feb 23, 2017
06f2a72
Merge pull request #1 from delftswa2017/fix-issue-980
John-Pap Feb 23, 2017
0447a20
Merge branch 'master' of https://github.com/jupyter/notebook into fix…
joined Feb 23, 2017
e3b89c3
Update docs on enabling notebook server extensions
takluyver Feb 24, 2017
a38eadb
Fix spelling
takluyver Feb 24, 2017
0be7071
updated changelog for nbextensions
nickylimjj Feb 25, 2017
0d595f3
keep within 80 cols, fix typos
nickylimjj Feb 25, 2017
e51a468
Merge pull request #2226 from nickylimjj/nbserver-ext_changelog
willingc Feb 25, 2017
2f266d3
Only show View button for HTML files.
ellisonbg Feb 26, 2017
5974cbe
Don't show Edit button on files we know we can't edit or ipynb
ellisonbg Feb 26, 2017
6846dee
Fixing notebook behavior of Edit.
ellisonbg Feb 26, 2017
9415f89
Super minor style fixes for the cell tag UI.
ellisonbg Feb 26, 2017
0736356
Merge pull request #2224 from takluyver/doc-nbserver-extensions
Carreau Feb 26, 2017
2e0d44b
retab with spaces.
Carreau Feb 26, 2017
c9a4455
Merge pull request #2230 from ellisonbg/cell-tag-design
ellisonbg Feb 26, 2017
de26378
Adjust HTML table style (GH2209)
jorisvandenbossche Feb 26, 2017
2472e89
Merge pull request #2231 from jorisvandenbossche/table-style
ellisonbg Feb 26, 2017
7816203
Note bundler API, kernel activity additions
parente Feb 27, 2017
5fe331e
Merge pull request #2232 from parente/changelog-5.0-api-adds
takluyver Feb 27, 2017
8014f1c
Updated docs on installed phantomjs
louise-davies Feb 27, 2017
b2d048a
[WIP] Show server root directory in move dialog
takluyver Feb 27, 2017
7a82ae4
Merge pull request #2233 from louise-davies/contributing-docs
takluyver Feb 27, 2017
e751e1c
Implement discussed behavior:
Carreau Feb 27, 2017
c03c133
Merge pull request #2229 from ellisonbg/edit-view-buttons
takluyver Feb 28, 2017
3c40901
Add support for '\\[' and '\\]' as math delimiters, refactoring.
joined Mar 1, 2017
3b50d4b
Add comments
joined Mar 1, 2017
44a1e99
Remove misleading local variable declaration
Mar 1, 2017
c782cb3
Swap $ and $$ delimiters order to avoid conflicts.
joined Mar 1, 2017
7d4965a
fix of uploading large files crashes the browser #96 + adding unit tests
Feb 8, 2017
7cd5927
add a dialog for large file size warning + simplify chunking logic
Mar 2, 2017
5945873
Add cell position when calculating location of cursor for tooltip
takluyver Mar 2, 2017
a304f9d
split tags on commas and whitespace
minrk Mar 3, 2017
7286839
always handle click event on remove-tag-btn
minrk Mar 3, 2017
0ebcb7a
test tags cell toolbar
minrk Mar 3, 2017
a834717
Merge pull request #2244 from delftswa2017/fix-issue-1911
minrk Mar 3, 2017
752fb34
Merge pull request #2246 from takluyver/tooltip-pos
minrk Mar 3, 2017
a42fa3f
Merge pull request #2162 from blackrock/master
rgbkrk Mar 3, 2017
c4d2c1a
Merge pull request #2249 from minrk/test-tags
gnestor Mar 7, 2017
018db6c
Tell user how to avoid token authentication.
Carreau Mar 7, 2017
9a817f7
Add test for LaTeX parsing
mpacer Mar 8, 2017
96676c0
Use `contents_manager.root_dir`
gnestor Mar 8, 2017
92cfd65
Use flex box vs. table
gnestor Mar 8, 2017
ee82acd
update token info on login page
minrk Mar 8, 2017
b7b6ec2
Added more test cases, added spacing so that it was technically valid
mpacer Mar 8, 2017
e32631a
Merge pull request #12 from minrk/token-message
Carreau Mar 8, 2017
ecb309d
Merge pull request #2257 from Carreau/tell-pw
minrk Mar 8, 2017
2125922
Set default `root_dir` for ContentsManager
gnestor Mar 8, 2017
32df89f
Set `server_root_dir` based on user directory path
gnestor Mar 8, 2017
ead73b9
Merge pull request #2220 from delftswa2017/fix-issue-980
rgbkrk Mar 9, 2017
420715e
Merge pull request #2234 from takluyver/i2204
minrk Mar 9, 2017
a531aeb
Add modal styles
gnestor Mar 9, 2017
a6562d1
Merge pull request #2268 from gnestor/patch-2234
gnestor Mar 9, 2017
3194aba
release 5.0.0b2
gnestor Mar 9, 2017
c8841b6
Back to development
gnestor Mar 9, 2017
8816def
Typo fix
Mar 10, 2017
21baa9b
Merge pull request #2274 from jupyter/michaelpacer-patch-1
minrk Mar 11, 2017
47bbd07
updated decodestring
adimitrova Mar 13, 2017
02cc130
changed to pass python 2 tests too
adimitrova Mar 13, 2017
2fe8e46
Throw error if deprecated `decodestring` is used
gnestor Mar 14, 2017
0800284
Merge pull request #2280 from delftswa2017/fix-deprecation-warning
Carreau Mar 14, 2017
d635525
Make mime bundle accessible to renderers
gnestor Mar 14, 2017
f510806
fix wait condition in display_id test
minrk Mar 15, 2017
273e8f9
display_id target index is now outputs.length - 1
minrk Mar 15, 2017
7756fd3
restore append-after-render
minrk Mar 15, 2017
93d8f3f
add output_added.OutputArea event
minrk Mar 15, 2017
96044f6
test updating execute_result
minrk Mar 15, 2017
5da6eb6
only consider stream output for data rate limit
minrk Mar 15, 2017
59c9df1
show current rate limit values in rate limit messages
minrk Mar 15, 2017
6b031e8
Merge pull request #2286 from gnestor/mime-bundle
gnestor Mar 16, 2017
64fe3f1
Trigger 'cleared' event when output area is cleared
gnestor Mar 16, 2017
b12bd4c
release 5.0.0-rc.1
gnestor Mar 16, 2017
8de7a52
Back to development
gnestor Mar 16, 2017
8aa04b9
Enforce version number at build time.
Carreau Mar 17, 2017
0087065
Merge pull request #2302 from Carreau/pep440
gnestor Mar 17, 2017
f57b92d
update nodejs installation instructions
minrk Mar 17, 2017
885ebc3
invert `--user` recommendation in CONTRIBUTING
minrk Mar 17, 2017
94122d6
Merge pull request #2305 from minrk/contributing-tweak
rgbkrk Mar 17, 2017
9f8158a
Use Markdown image references in example notebook
takluyver Mar 20, 2017
003f553
Merge pull request #2313 from takluyver/i2304
Carreau Mar 20, 2017
b69509f
Move preact, preact-compat, and proptypes to bower
gnestor Mar 21, 2017
200a58c
Merge pull request #2319 from gnestor/preact
rgbkrk Mar 21, 2017
d2c539f
Explain how to use cell tags in changelog
takluyver Mar 21, 2017
fc0354e
Remove drop shadow from Tag UI for consistency.
Carreau Mar 21, 2017
ae2316a
Merge pull request #2324 from Carreau/tagui
takluyver Mar 21, 2017
d1ad588
Merge pull request #2323 from takluyver/chglog-how-to-tag
takluyver Mar 22, 2017
de61e20
Merge pull request #2293 from minrk/stream-data-rate
rgbkrk Mar 22, 2017
15341ac
Revert "only consider stream output for data rate limit"
minrk Mar 22, 2017
2b2d321
Merge pull request #2326 from jupyter/revert-2293-stream-data-rate
takluyver Mar 22, 2017
9b771de
Add latex button to dropdown
mpacer Mar 22, 2017
f2f9237
Remove cell toolbar reminder
gnestor Mar 22, 2017
ab92722
Merge pull request #2329 from mpacer/latex_export
takluyver Mar 23, 2017
ece0a77
Merge pull request #2331 from gnestor/celltoolbar-reminder
takluyver Mar 23, 2017
e294313
Remove addition of cell toolbar reminder
takluyver Mar 23, 2017
7bb3b82
Merge pull request #2333 from takluyver/rm-celltoolbar-reminder
gnestor Mar 23, 2017
35c37c0
release 5.0.0rc2
gnestor Mar 23, 2017
e9c9c3a
Back to development
gnestor Mar 23, 2017
0b9cb8b
Added an export module to expose vars for monkey patching
dalejung Jul 9, 2016
85862fd
resolved
dalejung Mar 25, 2017
71a7fde
Move notebook loading after nbextensions
dalejung Oct 30, 2016
ffaf67c
ENH: Handle extension errors internally to ensure nbextensions load
dalejung Oct 30, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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>`_.

Expand All @@ -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::
Expand Down Expand Up @@ -108,7 +105,7 @@ Python Tests

Install dependencies::

pip install -e .[test] --user
pip install -e .[test]

To run the Python tests, use::

Expand Down Expand Up @@ -157,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::

Expand Down