Merge branch 'jupyter:main' into main

jupyter · Apr 8, 2024 · 9d2efdc · 9d2efdc
2 parents fd7eee7 + 89de373
commit 9d2efdc
Show file tree

Hide file tree

Showing 29 changed files with 43 additions and 22 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -118,7 +118,7 @@ jobs:
           sudo apt-get install xvfb x11-utils libxkbcommon-x11-0  libxcb-xinerama0 python3-pyqt5
 
           # pandoc is not up to date in the ubuntu repos, so we install directly
-          wget https://github.com/jgm/pandoc/releases/download/2.14.2/pandoc-2.14.2-1-amd64.deb && sudo dpkg -i pandoc-2.14.2-1-amd64.deb
+          wget https://github.com/jgm/pandoc/releases/download/2.9.2.1/pandoc-2.9.2.1-1-amd64.deb && sudo dpkg -i pandoc-2.9.2.1-1-amd64.deb
 
       - name: Run tests
         run: |

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.27.4
+    rev: 0.28.1
     hooks:
       - id: check-github-workflows
 
@@ -51,7 +51,7 @@ repos:
         args: ["-L", "sur,nd"]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.8.0"
+    rev: "v1.9.0"
     hooks:
       - id: mypy
         files: "^nbconvert"
@@ -81,7 +81,7 @@ repos:
       - id: rst-inline-touching-normal
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.0
+    rev: v0.3.5
     hooks:
       - id: ruff
         types_or: [python, jupyter]
@@ -90,7 +90,7 @@ repos:
         types_or: [python, jupyter]
 
   - repo: https://github.com/scientific-python/cookie
-    rev: "2024.01.24"
+    rev: "2024.03.10"
     hooks:
       - id: sp-repo-review
         additional_dependencies: ["repo-review[cli]"]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 7.16.3
+
+([Full Changelog](https://github.com/jupyter/nbconvert/compare/v7.16.2...9019037e300dfdbac5a8cb330d0b09eb82e12f62))
+
+### Maintenance and upkeep improvements
+
+- Remove pytest pin [#2129](https://github.com/jupyter/nbconvert/pull/2129) ([@blink1073](https://github.com/blink1073))
+- Add Compatibility with Pandoc 2.9.2 [#2128](https://github.com/jupyter/nbconvert/pull/2128) ([@blink1073](https://github.com/blink1073))
+- Pin to Pytest 7 [#2124](https://github.com/jupyter/nbconvert/pull/2124) ([@blink1073](https://github.com/blink1073))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter/nbconvert/graphs/contributors?from=2024-03-04&to=2024-03-21&type=c))
+
+[@blink1073](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Ablink1073+updated%3A2024-03-04..2024-03-21&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
 ## 7.16.2
 
 ([Full Changelog](https://github.com/jupyter/nbconvert/compare/v7.16.1...8dac97afa73d59e6afcad04ca076355576b6eb51))
@@ -16,8 +34,6 @@
 
 [@yuvipanda](https://github.com/search?q=repo%3Ajupyter%2Fnbconvert+involves%3Ayuvipanda+updated%3A2024-02-19..2024-03-04&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 7.16.1
 
 ([Full Changelog](https://github.com/jupyter/nbconvert/compare/v7.16.0...443b30703078e6f7d5b1044f25fb77e219136aac))

diff --git a/check_requirements.py b/check_requirements.py
@@ -1,4 +1,5 @@
 """Verify that the "all" reqs are in sync."""
+
 import sys
 
 from tomli import load

diff --git a/docs/api_examples/template_path/make_html.py b/docs/api_examples/template_path/make_html.py
@@ -3,6 +3,7 @@
 
 Note: nbconvert 6.0 changed ``template_path`` to ``template_paths``
 """
+
 import nbformat
 from traitlets.config import Config
 

diff --git a/docs/autogen_config.py b/docs/autogen_config.py
@@ -6,6 +6,7 @@
 jupyter_nbconvert_config.py.
 
 """
+
 import os.path
 
 from nbconvert.nbconvertapp import NbConvertApp

diff --git a/hatch_build.py b/hatch_build.py
@@ -1,4 +1,5 @@
 """Custom build script for hatch backend"""
+
 import os
 import sys
 from urllib.request import urlopen

diff --git a/nbconvert/__main__.py b/nbconvert/__main__.py
@@ -1,4 +1,5 @@
 """nbconvert cli entry point."""
+
 from .nbconvertapp import main
 
 main()
diff --git a/nbconvert/_version.py b/nbconvert/_version.py
@@ -1,9 +1,10 @@
 """nbconvert version info."""
+
 import re
 from typing import List
 
 # Version string must appear intact for versioning
-__version__ = "7.16.2"
+__version__ = "7.16.3"
 
 # Build up version_info tuple for backwards compatibility
 pattern = r"(?P<major>\d+).(?P<minor>\d+).(?P<patch>\d+)(?P<rest>.*)"

diff --git a/nbconvert/conftest.py b/nbconvert/conftest.py
@@ -1,4 +1,5 @@
 """pytest configuration."""
+
 import asyncio
 import os
 

diff --git a/nbconvert/exporters/qt_exporter.py b/nbconvert/exporters/qt_exporter.py
@@ -1,4 +1,5 @@
 """A qt exporter."""
+
 import os
 import sys
 import tempfile

diff --git a/nbconvert/exporters/qt_screenshot.py b/nbconvert/exporters/qt_screenshot.py
@@ -1,4 +1,5 @@
 """A qt screenshot exporter."""
+
 import os
 
 try:

diff --git a/nbconvert/filters/filter_links.py b/nbconvert/filters/filter_links.py
@@ -1,6 +1,7 @@
 """A pandoc filter used in converting notebooks to Latex.
 Converts links between notebooks to Latex cross-references.
 """
+
 import re
 
 from pandocfilters import RawInline, applyJSONFilters, stringify  # type:ignore[import-untyped]

diff --git a/nbconvert/filters/markdown.py b/nbconvert/filters/markdown.py
@@ -6,7 +6,6 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-
 import re
 
 try:

diff --git a/nbconvert/filters/markdown_mistune.py b/nbconvert/filters/markdown_mistune.py
@@ -5,7 +5,6 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-
 import base64
 import mimetypes
 import os

diff --git a/nbconvert/filters/pandoc.py b/nbconvert/filters/pandoc.py
@@ -2,6 +2,7 @@
 Convert between any two formats using pandoc,
 and related filters
 """
+
 import os
 
 from pandocfilters import Image, applyJSONFilters  # type:ignore[import-untyped]

diff --git a/nbconvert/preprocessors/coalescestreams.py b/nbconvert/preprocessors/coalescestreams.py
@@ -1,4 +1,5 @@
 """Preprocessor for merging consecutive stream outputs for easier handling."""
+
 import re
 
 # Copyright (c) IPython Development Team.

diff --git a/nbconvert/preprocessors/convertfigures.py b/nbconvert/preprocessors/convertfigures.py
@@ -6,7 +6,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-
 from traitlets import Unicode
 
 from .base import Preprocessor

diff --git a/nbconvert/preprocessors/csshtmlheader.py b/nbconvert/preprocessors/csshtmlheader.py
@@ -1,5 +1,4 @@
-"""Module that pre-processes the notebook for export to HTML.
-"""
+"""Module that pre-processes the notebook for export to HTML."""
 
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.

diff --git a/nbconvert/preprocessors/execute.py b/nbconvert/preprocessors/execute.py
@@ -3,6 +3,7 @@
 
 """Module containing a preprocessor that executes the code cells
 and updates outputs"""
+
 from __future__ import annotations
 
 import typing as t

diff --git a/nbconvert/preprocessors/highlightmagics.py b/nbconvert/preprocessors/highlightmagics.py
@@ -7,7 +7,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-
 import re
 
 from traitlets import Dict

diff --git a/nbconvert/preprocessors/latex.py b/nbconvert/preprocessors/latex.py
@@ -13,7 +13,6 @@
 # Imports
 # -----------------------------------------------------------------------------
 
-
 from traitlets import List, Unicode
 
 from .base import Preprocessor

diff --git a/nbconvert/utils/_contextlib_chdir.py b/nbconvert/utils/_contextlib_chdir.py
@@ -1,6 +1,5 @@
 """Backport of Python 3.11's contextlib.chdir."""
 
-
 import os
 from contextlib import AbstractContextManager
 

diff --git a/nbconvert/utils/iso639_1.py b/nbconvert/utils/iso639_1.py
@@ -1,4 +1,4 @@
-""" List of ISO639-1 language code"""
+"""List of ISO639-1 language code"""
 
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.

diff --git a/nbconvert/utils/lexers.py b/nbconvert/utils/lexers.py
@@ -1,4 +1,5 @@
 """Deprecated as of 5.0; import from IPython.lib.lexers instead."""
+
 from warnings import warn
 
 warn("nbconvert.utils.lexers is deprecated as of 5.0. Use IPython.lib.lexers", stacklevel=2)

diff --git a/nbconvert/utils/pandoc.py b/nbconvert/utils/pandoc.py
@@ -2,7 +2,6 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-
 import re
 import shutil
 import subprocess
@@ -13,7 +12,7 @@
 
 from .exceptions import ConversionException
 
-_minimal_version = "2.14.2"
+_minimal_version = "2.9.2"
 _maximal_version = "4.0.0"
 
 

diff --git a/nbconvert/utils/text.py b/nbconvert/utils/text.py
@@ -1,4 +1,5 @@
 """Text related utils."""
+
 import os
 import re
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -66,7 +66,7 @@ qtpng = ["pyqtwebengine>=5.15"]
 qtpdf = ["nbconvert[qtpng]"]
 webpdf = ["playwright"]
 test = [
-    "pytest>=7,<8",
+    "pytest>=7",
     "ipykernel",
     "ipywidgets>=7.5",
     "flaky",
@@ -190,7 +190,6 @@ disable_error_code = ["no-untyped-def", "no-untyped-call"]
 warn_unreachable = true
 
 [tool.ruff]
-target-version = "py38"
 line-length = 100
 
 [tool.ruff.format]

diff --git a/tests/filters/test_ansi.py b/tests/filters/test_ansi.py
@@ -5,7 +5,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-
 from nbconvert.filters.ansi import ansi2html, ansi2latex, strip_ansi
 from tests.base import TestsBase
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     Note: nbconvert 6.0 changed ``template_path`` to ``template_paths``
     """
     import nbformat
     from traitlets.config import Config
@@ Expand Down @@