Skip to content
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

add support for new marked version >=4.0.0 to fix #151 and support nbclassic >=0.5 #152

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ This project was spun out of work from
Installation
------------

**Note:** `jupyter_nbextensions_configurator` versions > 0.6.1 requires
[notebook](https://github.com/jupyter/notebook) >= 6.5 (and
[nbclassic](https://github.com/jupyter/nbclassic) >= 0.5). For prior versions of notebook or nbclassic,
install `jupyter_nbextensions_configurator` <= 0.6.1.

For those using conda, you can now get `jupyter_nbextensions_configurator` from
the excellent [conda-forge](https://conda-forge.github.io/)
[channel](https://anaconda.org/conda-forge) in a single command:
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ def main():
install_requires=[
'jupyter_contrib_core >=0.3.3',
'jupyter_core',
'notebook >=6.0',
'notebook >=6.5',
'nbclassic >=0.5',
'pyyaml',
'tornado',
'traitlets',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ define([
'base/js/page',
'base/js/security',
'notebook/js/mathjaxutils',
'components/marked/lib/marked',
'components/marked/lib/marked.umd',
'codemirror/lib/codemirror',
// CodeMirror modules below don't export anything, just loading them does everything necessary
'codemirror/addon/runmode/runmode',
Expand Down Expand Up @@ -152,7 +152,7 @@ define([
var text = text_and_math[0];
var math = text_and_math[1];
var options = custom_marked_options;
marked(text, options, function (err, html) {
marked.marked(text, options, function (err, html) {
html = mathjaxutils.replace_math(html, math);
html = security.sanitize_html(html);
html = $($.parseHTML(html));
Expand Down