Skip to content

Commit 77cc674

Browse files
committed
Merge branch 'master' into cell_filter
2 parents 6e47267 + 02a9fb9 commit 77cc674

File tree

26 files changed

+491
-398
lines changed

26 files changed

+491
-398
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ matrix:
8282
allow_failures:
8383
- env: TOXENV=appveyorartifacts
8484
- env: TOXENV=docs_linkcheck
85+
- env: TOXENV=lint
8586
env:
8687
global:
8788
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so

CHANGELOG.md

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ Unreleased (aka. GitHub master)
2121
This is where each new PR to the project should add a summary of its changes,
2222
which makes it much easier to fill in each release's changelog :)
2323

24+
Repo-level stuff:
25+
26+
- Added CONTRIBUTING.md
27+
[#1224](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1224)
28+
[@consideratio](https://github.com/consideratio)
29+
30+
New features and bugfixes:
31+
32+
- `init_cell`
33+
* Warning dialog now always relevant, fixes [#1223](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1223). [#1226](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1226) [@consideratio](https://github.com/consideratio)
2434

2535
0.4.0
2636
-----
@@ -29,23 +39,23 @@ Repo-level stuff:
2939

3040
- Require newer version of
3141
[`jupyter_nbextensions_configurator`](https://github.com/jupyter-contrib/jupyter_nbextensions_configurator)
32-
[#1197](https://github.com/ipython-contrib/pull/1197)
42+
[#1197](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1197)
3343
[@jcb91](https://github.com/jcb91)
3444
- Remove version-pinning from lxml dependency
35-
[#1174](https://github.com/ipython-contrib/pull/1174)
45+
[#1174](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1174)
3646
[@codypiersall](https://github.com/codypiersall)
3747
- Use `requirejs` vs. `require`, to align with notebook usage
38-
[#1165](https://github.com/ipython-contrib/pull/1165)
48+
[#1165](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1165)
3949
[@gnestor](https://github.com/gnestor)
4050
- `tests` specify exceptions (new flake8 moan)
41-
[#1143](https://github.com/ipython-contrib/pull/1143)
51+
[#1143](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1143)
4252
[@jcb91](https://github.com/jcb91)
4353
- move `js_highlight.py` into nbconvert_support, specify exception type
44-
[#1140](https://github.com/ipython-contrib/pull/1140)
54+
[#1140](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1140)
4555
[@jcb91](https://github.com/jcb91)
4656
- docs updates
47-
[#1200](https://github.com/ipython-contrib/pull/1200),
48-
[#1201](https://github.com/ipython-contrib/pull/1201)
57+
[#1200](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1200),
58+
[#1201](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1201)
4959
[@jcb91](https://github.com/jcb91)
5060

5161
New features and bugfixes:
@@ -54,69 +64,69 @@ New features and bugfixes:
5464
[#1213](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1213)
5565
[@benelot](https://github.com/benelot)
5666
- `livemdpreview` __new nbextension added!__
57-
[#1155](https://github.com/ipython-contrib/pull/1155)
67+
[#1155](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1155)
5868
[@jcb91](https://github.com/jcb91)
5969
- `nbTranslate`
6070
* Typos + readability improvements
61-
[#1191](https://github.com/ipython-contrib/pull/1191)
71+
[#1191](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1191)
6272
[@adyavanapalli](https://github.com/adyavanapalli),
6373
* Fix typo and revise text for better readability
64-
[#1190](https://github.com/ipython-contrib/pull/1190)
74+
[#1190](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1190)
6575
[@adyavanapalli](https://github.com/adyavanapalli),
6676
* use traitlets > 4.1 tag API
67-
[#1138](https://github.com/ipython-contrib/pull/1138)
77+
[#1138](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1138)
6878
[@jcb91](https://github.com/jcb91)
6979
- `collapsible_headings`
7080
* indent heading collapse controls by level
71-
[#1183](https://github.com/ipython-contrib/pull/1183)
81+
[#1183](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1183)
7282
[@jcb91](https://github.com/jcb91)
7383
* patch TextCell.set_text to catch more changes
74-
[#1184](https://github.com/ipython-contrib/pull/1184)
84+
[#1184](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1184)
7585
[@jcb91](https://github.com/jcb91)
7686
* link complete font-awesome css from cdn, not just some fontfaces
77-
[#1179](https://github.com/ipython-contrib/pull/1179)
87+
[#1179](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1179)
7888
[@jcb91](https://github.com/jcb91)
7989
- `toc2`
8090
* Add a 'download as HTML with toc' for Jupyter >= 5.1
81-
[#1182](https://github.com/ipython-contrib/pull/1182)
91+
[#1182](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1182)
8292
[@jfbercher](https://github.com/jfbercher)
8393
* only set notebook dirty if metadata item changed
84-
[#1178](https://github.com/ipython-contrib/pull/1178)
94+
[#1178](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1178)
8595
[@jcb91](https://github.com/jcb91)
8696
* Bugfix undefined title_sidebar
87-
[#1175](https://github.com/ipython-contrib/pull/1175)
97+
[#1175](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1175)
8898
[@jfbercher](https://github.com/jfbercher)
8999
* move config into toc2.js
90-
[#1167](https://github.com/ipython-contrib/pull/1167)
100+
[#1167](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1167)
91101
[@jcb91](https://github.com/jcb91)
92102
* configurable titles; dialog-alterable metadata settings
93-
[#1124](https://github.com/ipython-contrib/pull/1124)
103+
[#1124](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1124)
94104
[@jcb91](https://github.com/jcb91)
95105
* remove deprecated st var from template
96-
[#1199](https://github.com/ipython-contrib/pull/1199)
106+
[#1199](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1199)
97107
[@jcb91](https://github.com/jcb91)
98108
* [toc2] link complete font-awesome css from cdn
99-
[#1198](https://github.com/ipython-contrib/pull/1198)
109+
[#1198](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1198)
100110
[@jcb91](https://github.com/jcb91)
101111
- `scroll_down` fix notebook `5.x` compatibility
102-
[#1181](https://github.com/ipython-contrib/pull/1181)
112+
[#1181](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1181)
103113
[@jcb91](https://github.com/jcb91)
104114
- `exercise,exercise2` use bootstrap hidden class
105115
rather than jquery show/hide, in order to play nicely with collapsible_headings.
106116
fixes [#990](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/990)
107-
[#1169](https://github.com/ipython-contrib/pull/1169)
117+
[#1169](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1169)
108118
[@jcb91](https://github.com/jcb91)
109119
- `runtools` don't alter selection when running cells
110-
[#1145](https://github.com/ipython-contrib/pull/1145)
120+
[#1145](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1145)
111121
[@jcb91](https://github.com/jcb91)
112122
- `ExecuteTime` add preprocessor to execute notebook updating timing metadata
113-
[#1139](https://github.com/ipython-contrib/pull/1139)
123+
[#1139](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1139)
114124
[@jcb91](https://github.com/jcb91)
115125
- `snippets` Updated README
116-
[#1150](https://github.com/ipython-contrib/pull/1150)
126+
[#1150](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1150)
117127
[@chuaxr](https://github.com/chuaxr)
118128
- `code_prettify` Update `code_prettify.yaml`
119-
[#1162](https://github.com/ipython-contrib/pull/1162)
129+
[#1162](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1162)
120130
[@fehiepsi](https://github.com/fehiepsi)
121131

122132

@@ -189,7 +199,7 @@ New features and bugfixes:
189199
* [#1084](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1084)
190200
[@jfbercher](https://github.com/jfbercher)
191201
fix for
192-
[#1083](https://github.com/ipython-contrib/issue/1083):
202+
[#1083](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1083):
193203
Revert full url in links to relative to the current page.
194204
* [#1091](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1091)
195205
[@fkoessel](https://github.com/fkoessel)
@@ -264,7 +274,7 @@ New features and bugfixes:
264274
[#1066](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1066)
265275
[@jfbercher](https://github.com/jfbercher)
266276
tentative fix for
267-
[#1065](https://github.com/ipython-contrib/issues/1065)
277+
[#1065](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1065)
268278
by updating jqueryui cdn and version
269279
- for various nbextensions
270280
[#1061](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1061)

CONTRIBUTING.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributing to jupyter notebook nbextensions
2+
3+
We are super happy that you intend to contribute to the nbextensions! You can discuss improvements in issues and implement them in pull requests.
4+
5+
## Create an issue
6+
7+
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.
8+
9+
Here is an example issue of how @benelot did it that worked pretty smoothly: [#1193](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1193)
10+
11+
## Setup development
12+
13+
For small things like fixing typos in documentation, you can [make edits through GitHub](https://help.github.com/articles/editing-files-in-another-user-s-repository/), which will handle forking and making a pull request (PR) for you. For anything bigger or more complex, you'll probably want to set up a development environment, a quick procedure for which is as folows:
14+
15+
1. __Fork and clone__
16+
First fork this repo, then clone your fork. In this way you become prepared to make a pull request.
17+
18+
```shell
19+
# clone your fork
20+
git clone https://github.com/<your-github-username>/jupyter_contrib_nbextensions.git
21+
cd jupyter_contrib_nbextensions
22+
```
23+
24+
2. __Setup__
25+
26+
If you're using python in combination with some form of virtual environment (e.g. conda, virtualenv), make sure you have the correct environment (the one from which you run `jupyter notebook`) active before running these commands!
27+
28+
```shell
29+
# run from the main directory, where setup.py is
30+
pip install --editable .
31+
32+
# on windows, remove the --symlink flag and re-run the command each time you make changes
33+
jupyter-contrib-nbextension install --sys-prefix --symlink
34+
```
35+
36+
## Create an extension
37+
38+
Add a folder with the name of your new extension to [jupyter_contrib_nbextensions/nbextensions](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/tree/master/src/jupyter_contrib_nbextensions/nbextensions). Check out the [Jupyter Notebook extension structure link](http://jupyter-contrib-nbextensions.readthedocs.io/en/latest/internals.html) to know what has to be in that folder and what the general conventions are.
39+
40+
## Create a pull request
41+
42+
As you are ready with your code contribution, make a pull-request to the main repo and briefly explain what you have done.
43+
44+
Here is an example pull request of how @benelot did it that worked super well: [#1213](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1213)
45+
46+
Please also update the [unreleased section](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/blob/master/CHANGELOG.md#unreleased-aka-github-master) of the [CHANGELOG.md](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/blob/master/CHANGELOG.md) to note what you've added or fixed.

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# explicit includes
22
include COPYING.rst
33
include README.md
4+
include CONTRIBUTING.md
45
include CHANGELOG.md
56
include tox.ini
67
include .bumpversion.cfg

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,11 @@ Each notebook extension typically has its own directory named after the extensio
243243

244244
For further details, see [the documentation at jupyter-contrib-nbextensions.readthedocs.io](http://jupyter-contrib-nbextensions.readthedocs.io/en/latest/internals.html).
245245

246+
Contributing
247+
============
248+
249+
To learn how to setup a development enivornment and contribution guidelines, see [CONTRIBUTING.md](./CONTRIBUTING.md).
250+
246251
Changes
247252
=======
248253

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/2to3.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Parameters:
1313

1414
- name: 2to3.button_icon
1515
description: |
16-
Toolbar button icon: afont-awesome class defining the icon used for the
17-
toolbar button. See http://fontawesome.io/icons/ for available icons.
16+
Toolbar button icon: a font-awesome class defining the icon used for the
17+
toolbar button. See https://fontawesome.com/icons for available icons.
1818
input_type: text
1919
default: 'fa-space-shuttle'
2020

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ the options are as follows:
4141

4242
- `mod_name.button_icon`:
4343
A font-awesome class defining the icon used for the toolbar button and
44-
actions. See [fontawesome.io/icons] for available icon classes.
44+
actions. See [fontawesome] for available icon classes.
4545
Defaults to `fa-legal`.
4646

4747
- `mod_name.button_label`:
@@ -276,7 +276,7 @@ History
276276
[autopep8]: https://github.com/hhatto/autopep8
277277
[code-prettify]: README_code_prettify.md
278278
[jupyter-autopep8]: README_autopep8.md
279-
[fontawesome.io/icons]: https://fontawesome.io/icons
279+
[fontawesome]: https://fontawesome.com/icons
280280
[internals]: #Internals
281281
[jupyter-autopep8]: https://github.com/kenkoooo/jupyter-autopep8
282282
[jupyter_nbextensions_configurator]: https://github.com/Jupyter-contrib/jupyter_nbextensions_configurator

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/README_2to3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The options are as follows:
4040

4141
- `2to3.button_icon`:
4242
A font-awesome class defining the icon used for the toolbar button and
43-
actions. See [fontawesome.io/icons] for available icon classes.
43+
actions. See [fontawesome] for available icon classes.
4444
Defaults to `fa-legal`.
4545

4646
- `2to3.button_label`:
@@ -127,7 +127,7 @@ ways.
127127
[@takluyver]: https://github.com/takluyver
128128
[code_prettify]: https://github.com/jfbercher/code_prettify
129129
[futurize]: http://python-future.org/automatic_conversion.html
130-
[fontawesome.io/icons]: https://fontawesome.io/icons
130+
[fontawesome]: https://fontawesome.com/icons
131131
[internals]: #Internals
132132
[jupyter_nbextensions_configurator]: https://github.com/Jupyter-contrib/jupyter_nbextensions_configurator
133133
[KerneExecOnCells library]: README.md

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/README_autopep8.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ The options are as follows:
4545
Defaults to `true`.
4646

4747
- `autopep8.button_icon`:
48-
A font-awesome class defining the icon used for the toolbar button and
49-
actions. See [fontawesome.io/icons] for available icon classes.
48+
A font-awesome class defining the icon used for the toolbar button and actions.
49+
See [fontawesome] for available icon classes.
5050
Defaults to `fa-cog`.
5151

5252
- `autopep8.button_label`:
@@ -125,7 +125,7 @@ calls to the active kernel.
125125
[@kenkoooo]: https://github.com/kenkoooo
126126
[autopep8]: https://github.com/hhatto/autopep8
127127
[code_prettify]: https://github.com/jfbercher/code_prettify
128-
[fontawesome.io/icons]: https://fontawesome.io/icons
128+
[fontawesome]: https://fontawesome.com/icons
129129
[internals]: #Internals
130130
[jupyter_nbextensions_configurator]: https://github.com/Jupyter-contrib/jupyter_nbextensions_configurator
131131
[KerneExecOnCells library]: README.md

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/README_code_prettify.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ The options are as follows:
9595

9696
- `code_prettify.button_icon`:
9797
A font-awesome class defining the icon used for the toolbar button and
98-
actions. See [fontawesome.io/icons] for available icon classes.
98+
actions. See [fontawesome] for available icon classes.
9999
Defaults to `fa-legal`.
100100

101101
- `code_prettify.button_label`:
@@ -281,7 +281,7 @@ History
281281
[@jfbercher]: https://github.com/jfbercher
282282
[autopep8]: https://github.com/hhatto/autopep8
283283
[formatR]: https://yihui.name/formatr
284-
[fontawesome.io/icons]: https://fontawesome.io/icons
284+
[fontawesome]: https://fontawesome.com/icons
285285
[ijavascript]: https://n-riesco.github.io/ijavascript
286286
[internals]: #Internals
287287
[js-beautify]: https://github.com/beautify-web/js-beautify

0 commit comments

Comments
 (0)