Skip to content

Commit 9334b85

Browse files
authored
Merge branch 'ipython-contrib:master' into master
2 parents 109ff6c + 2248f6e commit 9334b85

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1271
-781
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.5.0
2+
current_version = 0.6.0
33
commit = True
44
message = release {new_version}
55
tag = False

.travis.yml

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# http://travis-ci.org/#!/ipython-contrib/jupyter_contrib_nbextensions
1+
# http://travis-ci.org/#!/ipython-contrib/jupyter_contrib_nbextensions
22
language: python
3-
dist: trusty # required for pandoc>1.9.1
3+
dist: xenial
44
sudo: false
55
addons:
66
apt_packages:
@@ -18,57 +18,33 @@ matrix:
1818
include:
1919
# packaging sanity check
2020
- os: linux
21-
python: '3.4'
21+
python: '3.8'
2222
env: TOXENV=check
2323
# python linting
2424
- os: linux
25-
python: '3.4'
25+
python: '3.8'
2626
env: TOXENV=lint
2727
# check docs build correctly
2828
- os: linux
29-
python: '3.4'
29+
python: '3.8'
3030
env: TOXENV=docs_build
3131
# check docs links
3232
- os: linux
33-
python: '3.4'
33+
python: '3.8'
3434
env: TOXENV=docs_linkcheck
3535
# check that conda build/install works
3636
- os: linux
37-
python: '3.6'
37+
python: '3.8'
3838
env: TOXENV=condarecipe
3939
# linux, various python and notebook versions
4040
- os: linux
41-
python: '2.7'
42-
env: TOXENV=py27-notebook
41+
python: '3.8'
42+
env: TOXENV=py38-notebook60
4343
- os: linux
44-
python: '3.3'
45-
env: TOXENV=py33-notebook
44+
python: '3.8'
45+
env: TOXENV=py38-notebook
4646
- os: linux
47-
python: '3.4'
48-
env: TOXENV=py34-notebook40
49-
- os: linux
50-
python: '3.4'
51-
env: TOXENV=py34-notebook41
52-
- os: linux
53-
python: '3.4'
54-
env: TOXENV=py34-notebook42
55-
- os: linux
56-
python: '3.4'
57-
env: TOXENV=py34-notebook43
58-
- os: linux
59-
python: '3.4'
60-
env: TOXENV=py34-notebook44
61-
- os: linux
62-
python: '3.4'
63-
env: TOXENV=py34-notebook4x
64-
- os: linux
65-
python: '3.5'
66-
env: TOXENV=py35-notebook
67-
- os: linux
68-
python: '3.6'
69-
env: TOXENV=py36-notebook
70-
- os: linux
71-
python: '3.4'
47+
python: '3.8'
7248
env: TOXENV=appveyorartifacts
7349
allow_failures:
7450
- env: TOXENV=appveyorartifacts

CHANGELOG.md

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,33 @@ readthedocs stuff gets all the shiny link goodness. Thanks!
1818
Unreleased (aka. GitHub master)
1919
-------------------------------
2020

21-
This is where each new PR to the project should add a summary of its changes,
22-
which makes it much easier to fill in each release's changelog :)
21+
0.6.0
22+
-----
23+
- Fix CI
24+
- Add license.txt in setup.cfg#
25+
- Fix Readme
26+
27+
0.5.3
28+
-----
29+
30+
- Replace `template_path` with `extra_template_paths` [#1532](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1532). Nbconvert 6.0 replaced `template_path` with `extra_template_paths` (see https://nbconvert.readthedocs.io/en/latest/changelog.html#significant-changes). This change in Nbconvert 6.0 causes errors in jupyter_latex_envs and in jupyter_contrib_nbextensions (see [#1529](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1529).
31+
- Update `install_requires` list in `setup.py` with 'nbconvert >=6.0'
32+
- Drop support for python < 3.6
33+
- [toc2] fix for disappearing sidebar in static html_toc export [#1548](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1548)
34+
- Fix Extensions Not Loading for Large Notebooks [#1499](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1499)
35+
- Support non-live notebook such as nbconvert output [#1535](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1535)
36+
37+
0.5.1
38+
-----
39+
40+
- Fix for navigation hotkeys [#1378](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1378)
41+
- `gist_it` Making github endpoint configurable to support publishing gists to Github Enterprise [#1364](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1364)
42+
- Fix treefilter [#1359](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1359)
43+
- Enable ruler extension in editor [#1296](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1296)
44+
- Several spelling fixes
45+
- Configure `code_prettify` extension to load custom yapf styles by default [#1376](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1376)
2346

47+
Travis/AppVeyor testing is currently broken due to outdated configuration. Will hopefully be working in 0.5.2 again.
2448

2549
0.5.0
2650
-----

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
We are super happy that you intend to contribute to the nbextensions! You can discuss improvements in issues and implement them in pull requests.
44

5+
Because this is a volunteer effort, we cannot provide support for all of the extensions.
6+
So if you contribute a new extension, please stick around and help others using it.
7+
58
## Create an issue
69

710
Do not hesitate to open up an issue, you can discuss bugs, improvements or new extensions in them. Creating an issue is a good starting point for code contributions. The community can support you with experience of similar extensions, pros and cons, what to look for etc.

LICENSE.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
Licensing terms
2+
===============
3+
4+
This project is licensed under the terms of the Modified BSD License
5+
(also known as New or Revised or 3-Clause BSD), as follows:
6+
7+
- Copyright (c) 2016 jupyter-contrib developers
8+
9+
All rights reserved.
10+
11+
Redistribution and use in source and binary forms, with or without
12+
modification, are permitted provided that the following conditions are met:
13+
14+
Redistributions of source code must retain the above copyright notice, this
15+
list of conditions and the following disclaimer.
16+
17+
Redistributions in binary form must reproduce the above copyright notice, this
18+
list of conditions and the following disclaimer in the documentation and/or
19+
other materials provided with the distribution.
20+
21+
Neither the name of the project development team nor the names of its
22+
contributors may be used to endorse or promote products derived from this
23+
software without specific prior written permission.
24+
25+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
26+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
27+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
28+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
29+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
30+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
31+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
32+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
33+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
34+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Jupyter notebook extensions
2-
===========================
2+
=============================
33

44
[![Join the chat at https://gitter.im/ipython-contrib/jupyter_contrib_nbextensions](https://img.shields.io/gitter/room/ipython-contrib/jupyter_contrib_nbextensions.svg?maxAge=3600)](https://gitter.im/ipython-contrib/jupyter_contrib_nbextensions?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
55
[![Documentation Status](https://readthedocs.org/projects/jupyter-contrib-nbextensions/badge/?version=latest)](https://jupyter-contrib-nbextensions.readthedocs.io/en/latest/)
@@ -38,6 +38,13 @@ Most nbextensions have been updated to work with both Jupyter 4.x and 5.x, but o
3838

3939
This repo is pretty much all in the main master branch, although there remain vestigial branches for IPython notebook versions 2.x and 3.x.
4040

41+
JupyterLab
42+
==========
43+
44+
Due to major differences between the Jupyter Notebook and JupyterLab, the extensions in this
45+
repository will not work in JupyterLab. You will find a list of alternative extensions for
46+
JupyterLab on [jupyterlab-contrib](https://jupyterlab-contrib.github.io/migrate_from_classical.html).
47+
4148

4249
Documentation
4350
=============
@@ -85,7 +92,7 @@ templates, pre-/postprocessors, and exporters.
8592
### PIP
8693

8794
All of the nbextensions in this repo are provided as parts of a python package,
88-
which is installable in the usual manner, using `pip` or the `setup.py` script.
95+
which is installable in the usual manner using `pip` or the `setup.py` script.
8996
To install the current version from PyPi, simply type
9097

9198
pip install jupyter_contrib_nbextensions
@@ -109,8 +116,8 @@ You can install both using
109116
conda install -c conda-forge jupyter_contrib_nbextensions
110117

111118
This also automatically installs the Javascript and CSS files
112-
(using `jupyter contrib nbextension install --sys-prefix`), so the second
113-
installation step below can therefore be skipped.
119+
(using `jupyter contrib nbextension install --sys-prefix`), therefore
120+
the second installation step below can be skipped.
114121

115122

116123
### Installation from cloned Repo
@@ -148,7 +155,7 @@ including
148155
* `--sys-prefix` to install into python's `sys.prefix`, useful for instance in
149156
virtual environments, such as with conda
150157
* `--symlink` to symlink the nbextensions rather than copying each file
151-
(recommended, on non-Windows platforms).
158+
(recommended on non-Windows platforms).
152159
* `--debug`, for more-verbose output
153160

154161
In addition, two further option flags are provided to perform either only the
@@ -197,7 +204,7 @@ their options. You can then open the `nbextensions` tab on the tree
197204
(dashboard/file browser) notebook page to configure nbextensions.
198205
You will have access there to a dashboard where extensions can be
199206
enabled/disabled via checkboxes.
200-
Additionally a short documentation for each extension is displayed, and
207+
Additionally, a short documentation for each extension is displayed, and
201208
configuration options are presented.
202209

203210
![jupyter_nbextensions_configurator](https://raw.githubusercontent.com/Jupyter-contrib/jupyter_nbextensions_configurator/master/src/jupyter_nbextensions_configurator/static/nbextensions_configurator/icon.png)
@@ -209,7 +216,10 @@ configuration options are presented.
209216
For complex or customized installation scenarios, please look at the
210217
documentation for installing notebook extensions, server extensions, nbconvert
211218
pre/postprocessors and templates on the [Jupyter homepage](https://jupyter.org).
212-
Most nbextensions here should work fine with jupyterhub (because jupyterhub spawns regular notebook servers for each individual user), but won't work with jupyterlab (because the jupyterlab javascript framework is different to notebook's, and still rapidly changing under active development).
219+
Most nbextensions here should work fine with JupyterHub (because JupyterHub spawns
220+
regular notebook servers for each individual user), but won't work with JupyterLab
221+
(because the Javascript framework of JupyterLab is different from the notebook's, and
222+
is still rapidly changing under active development).
213223

214224
See also [installing Jupyter](https://jupyter.readthedocs.io/en/latest/install.html)
215225

appveyor.yml

Lines changed: 17 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -13,61 +13,21 @@ environment:
1313
# appropriate libxml headers. As a result, make pip use binary packages.
1414
PIP_ONLY_BINARY: lxml
1515
matrix:
16-
17-
- TOXENV: 'py27-notebook'
18-
TOXPYTHON: C:\Python27\python.exe
19-
PYTHON_HOME: C:\Python27
20-
PYTHON_VERSION: '2.7'
21-
PYTHON_ARCH: '32'
22-
23-
- TOXENV: 'py33-notebook'
24-
TOXPYTHON: C:\Python33\python.exe
25-
PYTHON_HOME: C:\Python33
26-
PYTHON_VERSION: '3.3'
27-
PYTHON_ARCH: '32'
28-
29-
- TOXENV: 'py34-notebook40'
30-
TOXPYTHON: C:\Python34\python.exe
31-
PYTHON_HOME: C:\Python34
32-
PYTHON_VERSION: '3.4'
33-
PYTHON_ARCH: '32'
34-
35-
- TOXENV: 'py34-notebook41'
36-
TOXPYTHON: C:\Python34\python.exe
37-
PYTHON_HOME: C:\Python34
38-
PYTHON_VERSION: '3.4'
39-
PYTHON_ARCH: '32'
40-
41-
- TOXENV: 'py34-notebook42'
42-
TOXPYTHON: C:\Python34\python.exe
43-
PYTHON_HOME: C:\Python34
44-
PYTHON_VERSION: '3.4'
45-
PYTHON_ARCH: '32'
46-
47-
- TOXENV: 'py34-notebook43'
48-
TOXPYTHON: C:\Python34\python.exe
49-
PYTHON_HOME: C:\Python34
50-
PYTHON_VERSION: '3.4'
51-
PYTHON_ARCH: '32'
52-
53-
- TOXENV: 'py34-notebook44'
54-
TOXPYTHON: C:\Python34\python.exe
55-
PYTHON_HOME: C:\Python34
56-
PYTHON_VERSION: '3.4'
57-
PYTHON_ARCH: '32'
58-
59-
- TOXENV: 'py34-notebook4x'
60-
TOXPYTHON: C:\Python34\python.exe
61-
PYTHON_HOME: C:\Python34
62-
PYTHON_VERSION: '3.4'
63-
PYTHON_ARCH: '32'
64-
65-
- TOXENV: 'py35-notebook'
66-
TOXPYTHON: C:\Python35\python.exe
67-
PYTHON_HOME: C:\Python35
68-
PYTHON_VERSION: '3.5'
69-
PYTHON_ARCH: '32'
70-
16+
- TOXENV: 'py36-notebook57'
17+
TOXPYTHON: C:\Python36-x64\python.exe
18+
PYTHON_HOME: C:\Python36-x64
19+
PYTHON_VERSION: '3.6'
20+
PYTHON_ARCH: '64'
21+
- TOXENV: 'py36-notebook64'
22+
TOXPYTHON: C:\Python36-x64\python.exe
23+
PYTHON_HOME: C:\Python36-x64
24+
PYTHON_VERSION: '3.6'
25+
PYTHON_ARCH: '64'
26+
- TOXENV: 'py36-notebook'
27+
TOXPYTHON: C:\Python36-x64\python.exe
28+
PYTHON_HOME: C:\Python36-x64
29+
PYTHON_VERSION: '3.6'
30+
PYTHON_ARCH: '64'
7131
init:
7232
- ps: echo $env:TOXENV
7333
- ps: ls C:\Python*
@@ -81,9 +41,9 @@ install:
8141
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
8242
# Upgrade to the latest version of pip to avoid it displaying warnings
8343
# about it being out of date.
84-
- 'pip install --disable-pip-version-check --user --upgrade pip'
44+
- 'python -m pip install --disable-pip-version-check --user --upgrade pip'
8545
# install tox
86-
- pip install tox
46+
- python -m pip install tox
8747
# install of the actual project is handled by tox in tests
8848
test_script:
8949
# run tox tests

conda.recipe/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ requirements:
2525
- jupyter_contrib_core >=0.3.3
2626
- jupyter_core
2727
- jupyter_highlight_selected_word >=0.1.1
28-
- jupyter_latex_envs >=1.3.8
28+
- jupyter_latex_envs >=1.4.0
2929
- jupyter_nbextensions_configurator >=0.4.0
3030
- nbconvert >=4.2
31-
- notebook >=4.0
31+
- notebook >=6.0
3232
- pyyaml
3333
- tornado
3434
- traitlets >=4.1

docs/source/autogen_scripts/autogen_nbextensions_list.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
List of provided nbextensions
5757
=============================
5858
59+
.. note::
60+
61+
For JupyterLab, alternative extensions can be found `there <https://jupyterlab-contrib.github.io/migrate_from_classical.html>`_.
62+
5963
.. the hidden toc is used to suppress warnings about readmes which are
6064
.. not for individual nbextensions, but are linked to by nbextensions'
6165
.. individual readmes

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
# built documents.
4242
#
4343
# The short X.Y version.
44-
version = '0.5.0'
44+
version = '0.5.1'
4545
# The full version, including alpha/beta/rc tags.
46-
release = '0.5.0'
46+
release = '0.5.1'
4747

4848
# The suffix(es) of source filenames.
4949
# You can specify multiple suffix as a list of strings

0 commit comments

Comments
 (0)