Skip to content

Commit 3d930a7

Browse files
juhaschjuhasch
authored
Merge pull request #3 from ipython-contrib/master
Sync
2 parents 3a0425c + 8ce83e7 commit 3d930a7

Some content is hidden

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

53 files changed

+720
-307
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.1
2+
current_version = 0.5.3
33
commit = True
44
message = release {new_version}
55
tag = False

‎.travis.yml

Lines changed: 12 additions & 21 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,42 +18,33 @@ matrix:
1818
include:
1919
# packaging sanity check
2020
- os: linux
21-
python: '3.6'
21+
python: '3.8'
2222
env: TOXENV=check
2323
# python linting
2424
- os: linux
25-
python: '3.6'
25+
python: '3.8'
2626
env: TOXENV=lint
2727
# check docs build correctly
2828
- os: linux
29-
python: '3.6'
29+
python: '3.8'
3030
env: TOXENV=docs_build
3131
# check docs links
3232
- os: linux
33-
python: '3.6'
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.6'
45-
env: TOXENV=py36-notebook54
44+
python: '3.8'
45+
env: TOXENV=py38-notebook
4646
- os: linux
47-
python: '3.6'
48-
env: TOXENV=py36-notebook55
49-
- os: linux
50-
python: '3.6'
51-
env: TOXENV=py36-notebook44
52-
- os: linux
53-
python: '3.6'
54-
env: TOXENV=py36-notebook
55-
- os: linux
56-
python: '3.6'
47+
python: '3.8'
5748
env: TOXENV=appveyorartifacts
5849
allow_failures:
5950
- env: TOXENV=appveyorartifacts

‎CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,15 @@ 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.5.3
22+
-----
23+
24+
- 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).
25+
- Update `install_requires` list in `setup.py` with 'nbconvert >=6.0'
26+
- Drop support for python < 3.6
27+
- [toc2] fix for disappearing sidebar in static html_toc export [#1548](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1548)
28+
- Fix Extensions Not Loading for Large Notebooks [#1499](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1499)
29+
- Support non-live notebook such as nbconvert output [#1535](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1535)
2330

2431
0.5.1
2532
-----

‎README.md

Lines changed: 1 addition & 1 deletion
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/)

‎appveyor.yml

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,17 @@ 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: 'py36-notebook44'
16+
- TOXENV: 'py37-notebook60'
2417
TOXPYTHON: C:\Python36\python.exe
25-
PYTHON_HOME: C:\Python36
26-
PYTHON_VERSION: '3.6'
27-
PYTHON_ARCH: '32'
18+
PYTHON_HOME: C:\Python37
19+
PYTHON_VERSION: '3.7'
20+
PYTHON_ARCH: '64'
2821

29-
- TOXENV: 'py36-notebook54'
30-
TOXPYTHON: C:\Python36\python.exe
31-
PYTHON_HOME: C:\Python36
32-
PYTHON_VERSION: '3.6'
33-
PYTHON_ARCH: '32'
34-
35-
- TOXENV: 'py36-notebook55'
36-
TOXPYTHON: C:\Python36\python.exe
37-
PYTHON_HOME: C:\Python36
38-
PYTHON_VERSION: '3.6'
39-
PYTHON_ARCH: '32'
22+
- TOXENV: 'py38-notebook60'
23+
TOXPYTHON: C:\Python38\python.exe
24+
PYTHON_HOME: C:\Python38
25+
PYTHON_VERSION: '3.8'
26+
PYTHON_ARCH: '64'
4027

4128
init:
4229
- ps: echo $env:TOXENV

‎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/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ for details.
1515
To mitigate this issue, you can increase the timeout for requirejs by adding it in your custom.js:
1616

1717
// default is 30s, increase to 1 minute
18-
window.requirejs.config({waitseconds: 60});
18+
window.requirejs.config({waitSeconds: 60});
1919
2020
You can find details of where to find/create a custom.js file at the notebook documentation
2121
about [custom.js](http://jupyter-notebook.readthedocs.io/en/latest/examples/Notebook/JavaScript%20Notebook%20Extensions.html#custom.js).

‎setup.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
# Imports
77
# -----------------------------------------------------------------------------
88

9-
from __future__ import print_function
10-
119
import os
1210
from glob import glob
1311

@@ -42,14 +40,14 @@ def main():
4240
`the repository issues page <https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues>`_
4341
if you encounter any problems, and create a new issue if needed!
4442
""", # noqa: E501
45-
version='0.5.1',
43+
version='0.5.3',
4644
author='ipython-contrib and jupyter-contrib developers',
4745
author_email='[email protected]',
4846
url=('https://github.com/'
4947
'ipython-contrib/jupyter_contrib_nbextensions.git'),
5048
download_url=('https://github.com/'
5149
'ipython-contrib/jupyter_contrib_nbextensions'
52-
'/tarball/0.5.1'),
50+
'/tarball/0.5.3'),
5351
keywords=['IPython', 'Jupyter', 'notebook'],
5452
license='BSD',
5553
platforms=['Any'],
@@ -65,11 +63,11 @@ def main():
6563
'jupyter_contrib_core >=0.3.3',
6664
'jupyter_core',
6765
'jupyter_highlight_selected_word >=0.1.1',
68-
'jupyter_latex_envs >=1.3.8',
66+
'jupyter_latex_envs >=1.4.0',
6967
'jupyter_nbextensions_configurator >=0.4.0',
70-
'nbconvert >=4.2',
71-
'notebook >=4.0',
72-
'pyyaml',
68+
'nbconvert >=6.0',
69+
'notebook >=6.0',
70+
# 'pyyaml',
7371
'tornado',
7472
'traitlets >=4.1',
7573
'lxml'
@@ -81,7 +79,7 @@ def main():
8179
'pip',
8280
'requests',
8381
],
84-
'test:python_version == "2.7"': [
82+
'test:python_version == "3.8"': [
8583
'mock',
8684
],
8785
},

‎src/jupyter_contrib_nbextensions/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import jupyter_nbextensions_configurator
66

7-
__version__ = '0.5.1'
7+
__version__ = '0.5.3'
88

99

1010
def _jupyter_server_extension_paths():

‎src/jupyter_contrib_nbextensions/application.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# -*- coding: utf-8 -*-
22
"""App to install/remove jupyter_contrib_nbextensions."""
33

4-
from __future__ import print_function, unicode_literals
5-
64
import copy
75
import sys
86

0 commit comments

Comments
 (0)