diff --git a/CHANGELOG.md b/CHANGELOG.md index c42f0a1f7..71057399c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,7 +46,7 @@ ### Bugs fixed -- \[HTMLExporter\] Initialize resources before widget filtering [#2118](https://github.com/jupyter/nbconvert/pull/2118) ([@yuvipanda](https://github.com/yuvipanda)) +- [HTMLExporter] Initialize resources before widget filtering [#2118](https://github.com/jupyter/nbconvert/pull/2118) ([@yuvipanda](https://github.com/yuvipanda)) ### Contributors to this release @@ -389,7 +389,7 @@ ### Enhancements made -- \[Accessibility\] some accessibility improvements [#2021](https://github.com/jupyter/nbconvert/pull/2021) ([@brichet](https://github.com/brichet)) +- [Accessibility] some accessibility improvements [#2021](https://github.com/jupyter/nbconvert/pull/2021) ([@brichet](https://github.com/brichet)) - Adopt playwright [#2013](https://github.com/jupyter/nbconvert/pull/2013) ([@brichet](https://github.com/brichet)) - Update to Jupyterlab 4 [#2012](https://github.com/jupyter/nbconvert/pull/2012) ([@brichet](https://github.com/brichet)) diff --git a/README.md b/README.md index 5f2287c47..22af74f7b 100644 --- a/README.md +++ b/README.md @@ -102,8 +102,8 @@ Jupyter uses a shared copyright model. Each contributor maintains copyright over their contributions to Jupyter. But, it is important to note that these contributions are typically only changes to the repositories. Thus, the Jupyter source code, in its entirety is not the copyright of any single person or -institution. Instead, it is the collective copyright of the entire Jupyter -Development Team. If individual contributors want to maintain a record of what +institution. Instead, it is the collective copyright of the entire Jupyter +Development Team. If individual contributors want to maintain a record of what changes/contributions they have specific copyright on, they should indicate their copyright in the commit message of the change, when they commit the change to one of the Jupyter repositories. diff --git a/nbconvert/__init__.py b/nbconvert/__init__.py index bd860d30b..9ccd3d584 100644 --- a/nbconvert/__init__.py +++ b/nbconvert/__init__.py @@ -32,18 +32,9 @@ __all__ = [ - "__version__", - "version_info", - "filters", - "postprocessors", - "preprocessors", - "writers", "ASCIIDocExporter", - "ExporterNameError", - "export", - "get_export_names", - "get_exporter", "Exporter", + "ExporterNameError", "FilenameExtension", "HTMLExporter", "LatexExporter", @@ -58,4 +49,13 @@ "SlidesExporter", "TemplateExporter", "WebPDFExporter", + "__version__", + "export", + "filters", + "get_export_names", + "get_exporter", + "postprocessors", + "preprocessors", + "version_info", + "writers", ] diff --git a/nbconvert/exporters/__init__.py b/nbconvert/exporters/__init__.py index c043f8fce..35819a643 100644 --- a/nbconvert/exporters/__init__.py +++ b/nbconvert/exporters/__init__.py @@ -17,12 +17,9 @@ __all__ = [ "ASCIIDocExporter", - "ExporterNameError", - "ExporterDisabledError", - "export", - "get_export_names", - "get_exporter", "Exporter", + "ExporterDisabledError", + "ExporterNameError", "FilenameExtension", "HTMLExporter", "LatexExporter", @@ -32,10 +29,13 @@ "PythonExporter", "QtPDFExporter", "QtPNGExporter", - "ResourcesDict", "RSTExporter", + "ResourcesDict", "ScriptExporter", "SlidesExporter", "TemplateExporter", "WebPDFExporter", + "export", + "get_export_names", + "get_exporter", ] diff --git a/nbconvert/exporters/base.py b/nbconvert/exporters/base.py index b71f10258..cc985d0db 100644 --- a/nbconvert/exporters/base.py +++ b/nbconvert/exporters/base.py @@ -22,11 +22,11 @@ # ----------------------------------------------------------------------------- __all__ = [ - "export", "Exporter", - "get_exporter", - "get_export_names", "ExporterNameError", + "export", + "get_export_names", + "get_exporter", ] diff --git a/nbconvert/filters/__init__.py b/nbconvert/filters/__init__.py index 27bedca1e..e5370966c 100644 --- a/nbconvert/filters/__init__.py +++ b/nbconvert/filters/__init__.py @@ -35,38 +35,38 @@ ) __all__ = [ - "indent", - "ansi2html", - "ansi2latex", - "strip_ansi", - "citation2latex", + "ConvertExplicitlyRelativePaths", "DataTypeFilter", "Highlight2HTML", "Highlight2Latex", + "add_anchor", + "add_prompts", + "ansi2html", + "ansi2latex", + "ascii_only", + "citation2latex", + "clean_html", + "comment_lines", + "convert_pandoc", "escape_latex", + "get_lines", + "get_metadata", + "html2text", + "indent", + "ipython2python", + "markdown2asciidoc", "markdown2html", - "markdown2html_pandoc", "markdown2html_mistune", + "markdown2html_pandoc", "markdown2latex", "markdown2rst", - "markdown2asciidoc", - "get_metadata", - "convert_pandoc", - "ConvertExplicitlyRelativePaths", - "wrap_text", - "html2text", - "clean_html", - "add_anchor", - "strip_dollars", - "strip_files_prefix", - "comment_lines", - "get_lines", - "ipython2python", - "posix_path", "path2url", - "add_prompts", - "ascii_only", + "posix_path", "prevent_list_blocks", + "strip_ansi", + "strip_dollars", + "strip_files_prefix", "strip_trailing_newline", "text_base64", + "wrap_text", ] diff --git a/nbconvert/filters/ansi.py b/nbconvert/filters/ansi.py index a9882e10e..12949a1e5 100644 --- a/nbconvert/filters/ansi.py +++ b/nbconvert/filters/ansi.py @@ -7,7 +7,7 @@ import markupsafe -__all__ = ["strip_ansi", "ansi2html", "ansi2latex"] +__all__ = ["ansi2html", "ansi2latex", "strip_ansi"] _ANSI_RE = re.compile("\x1b\\[(.*?)([@-~])") diff --git a/nbconvert/filters/markdown.py b/nbconvert/filters/markdown.py index fe0cb10e2..e02b0b40c 100644 --- a/nbconvert/filters/markdown.py +++ b/nbconvert/filters/markdown.py @@ -27,12 +27,12 @@ def markdown2html_mistune(source: str) -> str: from .pandoc import convert_pandoc __all__ = [ + "markdown2asciidoc", "markdown2html", - "markdown2html_pandoc", "markdown2html_mistune", + "markdown2html_pandoc", "markdown2latex", "markdown2rst", - "markdown2asciidoc", ] diff --git a/nbconvert/filters/strings.py b/nbconvert/filters/strings.py index 81a0453ad..32ff133a9 100644 --- a/nbconvert/filters/strings.py +++ b/nbconvert/filters/strings.py @@ -23,22 +23,22 @@ from nbconvert.preprocessors.sanitize import _get_default_css_sanitizer __all__ = [ - "wrap_text", - "html2text", - "clean_html", "add_anchor", - "strip_dollars", - "strip_files_prefix", + "add_prompts", + "ascii_only", + "clean_html", "comment_lines", "get_lines", + "html2text", "ipython2python", - "posix_path", "path2url", - "add_prompts", - "ascii_only", + "posix_path", "prevent_list_blocks", + "strip_dollars", + "strip_files_prefix", "strip_trailing_newline", "text_base64", + "wrap_text", ] diff --git a/nbconvert/preprocessors/__init__.py b/nbconvert/preprocessors/__init__.py index d752edf90..3e29ae171 100644 --- a/nbconvert/preprocessors/__init__.py +++ b/nbconvert/preprocessors/__init__.py @@ -18,18 +18,18 @@ from .tagremove import TagRemovePreprocessor __all__ = [ + "CSSHTMLHeaderPreprocessor", "CellExecutionError", - "Preprocessor", "ClearMetadataPreprocessor", "ClearOutputPreprocessor", "CoalesceStreamsPreprocessor", "ConvertFiguresPreprocessor", - "CSSHTMLHeaderPreprocessor", "ExecutePreprocessor", "ExtractAttachmentsPreprocessor", "ExtractOutputPreprocessor", "HighlightMagicsPreprocessor", "LatexPreprocessor", + "Preprocessor", "RegexRemovePreprocessor", "SVG2PDFPreprocessor", "TagRemovePreprocessor", diff --git a/tests/exporters/test_webpdf.py b/tests/exporters/test_webpdf.py index ef9f8ed77..ad6b7a9aa 100644 --- a/tests/exporters/test_webpdf.py +++ b/tests/exporters/test_webpdf.py @@ -33,7 +33,7 @@ class TestWebPDFExporter(ExportersTestsBase): exporter_class = WebPDFExporter # type:ignore - @pytest.mark.network() + @pytest.mark.network def test_export(self): """ Can a TemplateExporter export something? diff --git a/tests/test_nbconvertapp.py b/tests/test_nbconvertapp.py index f181d9539..adbac14d0 100644 --- a/tests/test_nbconvertapp.py +++ b/tests/test_nbconvertapp.py @@ -151,7 +151,7 @@ def test_filename_spaces(self): assert os.path.isfile("notebook with spaces.pdf") @flaky - @pytest.mark.network() + @pytest.mark.network @pytest.mark.skipif(not PLAYWRIGHT_INSTALLED, reason="Playwright not installed") def test_webpdf_with_chromium(self): """