Merge branch 'ahanak-global-title' into develop

Author: chdemko

.github/workflows/python-package.yml

@@ -14,16 +14,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12', '3.13']
-        pandoc-version: ['3.6']
+        python-version: ['3.11', '3.12', '3.13', '3.14']
+        pandoc-version: [3.9]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Hatch
-      run: pipx install hatch
+      run: |
+        pipx install hatch
+        pipx inject --force hatch virtualenv<21
     - name: Install dependencies
       run: |
         wget https://github.com/jgm/pandoc/releases/download/${{ matrix.pandoc-version }}/pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
@@ -37,15 +39,17 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.12']
-        pandoc-version: [2.11.4, '2.12', '2.13', 2.14.2, '2.15', 2.16.2, 2.17.1.1, '2.18', 2.19.2, 3.0.1, 3.1.13, 3.2.1, '3.3', '3.4', 3.5, '3.6']
+        pandoc-version: [2.11.4, '2.12', '2.13', 2.14.2, '2.15', 2.16.2, 2.17.1.1, '2.18', 2.19.2, 3.0.1, 3.1.13, 3.2.1, '3.3', '3.4', 3.5, 3.6.3, 3.7.0.2, 3.8.3]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Hatch
-      run: pipx install hatch
+      run: |
+        pipx install hatch
+        pipx inject --force hatch virtualenv<21
     - name: Install dependencies
       run: |
         wget https://github.com/jgm/pandoc/releases/download/${{ matrix.pandoc-version }}/pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
@@ -59,15 +63,17 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.12']
-        pandoc-version: ['3.6']
+        pandoc-version: [3.9]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Hatch
-      run: pipx install hatch
+      run: |
+        pipx install hatch
+        pipx inject --force hatch virtualenv<21
     - name: Install dependencies
       run: |
         wget https://github.com/jgm/pandoc/releases/download/${{ matrix.pandoc-version }}/pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
@@ -84,15 +90,17 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.12']
-        pandoc-version: ['3.6']
+        pandoc-version: [3.9]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Hatch
-      run: pipx install hatch
+      run: |
+        pipx install hatch
+        pipx inject --force hatch virtualenv<21
     - name: Install dependencies
       run: |
         wget https://github.com/jgm/pandoc/releases/download/${{ matrix.pandoc-version }}/pandoc-${{ matrix.pandoc-version }}-1-amd64.deb

.github/workflows/python-publish.yml

@@ -22,7 +22,9 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Hatch
-      run: pipx install hatch
+      run: |
+        pipx install hatch
+        pipx inject --force hatch virtualenv<21
     - name: Build and publish
       env:
         HATCH_INDEX_USER: ${{ secrets.PYPI_USERNAME }}

.pre-commit-config.yaml

@@ -1,23 +1,23 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
   - id: check-toml
   - id: check-yaml
 
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.14.0
+  rev: v2.16.0
   hooks:
   - id: pretty-format-toml
     args: [--autofix, --no-sort]
   - id: pretty-format-yaml
     args: [--autofix]
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.18.0
+  rev: v3.21.0
   hooks:
   - id: pyupgrade
-    args: [--py310-plus]
+    args: [--py311-plus]
 
 - repo: local
   hooks:
@@ -38,7 +38,7 @@ repos:
     pass_filenames: false
   - id: lock
     name: lock
-    entry: uv lock --upgrade
+    entry: hatch run uv lock --upgrade
     language: system
     pass_filenames: false
 

README.md

@@ -16,7 +16,7 @@ Installation
 [![Downloads](https://img.shields.io/pypi/dm/pandoc-beamer-block?logo=pypi&logoColor=white)](https://pepy.tech/project/pandoc-beamer-block)
 [![Development Status](https://img.shields.io/pypi/status/pandoc-beamer-block.svg?logo=pypi&logoColor=white)](https://pypi.org/project/pandoc-beamer-block/)
 [![Python version](https://img.shields.io/pypi/pyversions/pandoc-beamer-block.svg?logo=Python&logoColor=white)](https://pypi.org/project/pandoc-beamer-block/)
-[![Pandoc version](https://img.shields.io/badge/pandoc-2.11%20..%203.6-blue.svg?logo=markdown)](https://pandoc.org/)
+[![Pandoc version](https://img.shields.io/badge/pandoc-2.11%20..%203.9-blue.svg?logo=markdown)](https://pandoc.org/)
 [![Latest release](https://img.shields.io/github/release-date/chdemko/pandoc-beamer-block.svg?logo=github)](https://github.com/chdemko/pandoc-beamer-block/releases)
 [![Last commit](https://img.shields.io/github/last-commit/chdemko/pandoc-beamer-block/develop?logo=github)](https://github.com/chdemko/pandoc-beamer-block/commit/develop/)
 [![Repo Size](https://img.shields.io/github/repo-size/chdemko/pandoc-beamer-block.svg?logo=github)](http://pandoc-beamer-block.readthedocs.io/en/latest/)

docs/usage.md

@@ -19,6 +19,7 @@ pandoc-beamer-block:
   - classes: [info]
   - classes: [alert]
     type: alert
+    title: Danger
 ~~~
 
 The metadata block above is used to add a `block` environment around
@@ -31,6 +32,7 @@ Each entry of `pandoc-beamer-block` is a YAML dictionary containing:
   transformation will be applied. This parameter is mandatory.
 * `type`: the block type (either `alert`, `example`, `info`, `theorem`,
   `proof`, `corollary`, `definition`, `lemma` and `fact`)
+* `title`: an optional default title to use
 
 ## Example
 

pyproject.toml

@@ -7,7 +7,7 @@ dynamic = ["version"]
 name = "pandoc-beamer-block"
 description = "A pandoc filter for adding beamer block on specific div"
 readme = "README.md"
-requires-python = ">=3.10,<3.14"
+requires-python = ">=3.11,<3.15"
 license = {text = "BSD-3-Clause"}
 license-files = {paths = ["LICENSE"]}
 authors = [{name = "Christophe Demko", email = "chdemko@gmail.com"}]
@@ -31,10 +31,10 @@ classifiers = [
   "Topic :: Text Processing :: Filters",
   # Specify the Python versions you support here. In particular, ensure
   # that you indicate whether you support Python 2, Python 3 or both.
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   # Natural language used
   "Natural Language :: English"
 ]
@@ -62,45 +62,20 @@ local_scheme = "no-local-version"
 packages = ["src/pandoc_beamer_block"]
 
 [[tool.hatch.envs.hatch-test.matrix]]
-python = ["3.10", "3.11", "3.12", "3.13"]
+python = ["3.11", "3.12", "3.13", "3.14"]
 
 [tool.hatch.envs.hatch-static-analysis]
 dependencies = [
   # Types
   "types-PyYAML~=6.0",
   # Formatter
-  "black[jupyter]~=24.10",
+  "black[jupyter]~=26.1",
   # Style checkers
-  "doc8~=1.1",
-  "mypy~=1.13",
-  "flake8~=7.1",
-  "flake8-pyproject~=1.2",
-  "flake8-annotations-complexity~=0.0",
-  "flake8-black~=0.3",
-  "flake8-blind-except~=0.2",
-  "flake8-bugbear~=24.8",
-  "flake8-builtins~=2.5",
-  "flake8-cognitive-complexity~=0.1",
-  "flake8-comprehensions~=3.15",
-  "flake8-docstrings~=1.7",
-  "flake8-expression-complexity~=0.0",
-  "flake8-fixme~=1.1",
-  "flake8-functions~=0.0",
-  "flake8-import-order~=0.18",
-  "flake8-mypy~=17.8",
-  "flake8-pyi~=24.9",
-  "flake8-pydocstyle~=0.2",
-  "flake8-return~=1.2",
-  "flake8-simplify~=0.21",
-  "flake8-spellcheck~=0.28",
-  "flake8-use-fstring~=1.4",
-  "flake8-variables-names~=0.0",
-  "pep8-naming~=0.14",
-  "darglint~=1.8.1",
-  "pydoclint[flake8]~=0.5",
+  "doc8~=2.0",
+  "mypy~=1.19",
   "teyit~=0.4",
-  "refurb~=2.0",
-  "ruff~=0.8"
+  "refurb~=2.3",
+  "ruff~=0.15"
 ]
 
 [tool.hatch.envs.hatch-static-analysis.scripts]
@@ -114,8 +89,7 @@ format-fix = [
 lint-check = [
   "refurb {args:src docs}",
   "ruff check {args:src docs}",
-  "teyit --show-stats --fail-on-change {args:tests}",
-  "flake8 {args:src docs}"
+  "teyit --show-stats --fail-on-change {args:tests}"
 ]
 lint-fix = [
   "ruff check --fix {args:src docs}"
@@ -124,7 +98,7 @@ lint-fix = [
 [tool.hatch.envs.lint]
 dependencies = [
   "slotscheck~=0.19",
-  "pylint~=3.3"
+  "pylint~=4.0"
 ]
 
 [tool.hatch.envs.lint.scripts]
@@ -135,9 +109,9 @@ check = [
 
 [tool.hatch.envs.docs]
 dependencies = [
-  "myst-parser~=4.0",
-  "Sphinx~=8.1",
-  "sphinx-rtd-theme~=3.0",
+  "myst-parser~=5.0",
+  "Sphinx~=9.1",
+  "sphinx-rtd-theme~=3.1",
   "sphinx-copybutton~=0.5"
 ]
 

src/pandoc_beamer_block/_main.py

@@ -33,6 +33,7 @@ def prepare(doc: Doc):
             ):
                 definition["classes"] = frozenset(definition["classes"])
                 definition["type"] = definition.get("type", "info")
+                definition["title"] = definition.get("title", "")
                 doc.defined.append(definition)
 
 
@@ -110,7 +111,7 @@ def block(elem: Element, doc: Doc) -> list[Element] | None:
                         output_format="latex",
                     )
                 else:
-                    title = ""
+                    title = definition["title"]
 
                 if definition["type"] == "alert":
                     return latex(elem, "alertblock", title)

tests/test_block.py

@@ -127,6 +127,7 @@ def test_title_complex(self):
 ---
 pandoc-beamer-block:
   - classes: ['class1', 'class2']
+    title: Ignored
 ---
 ::: {.class1 .class2 title="**My Title**"}
 :::
@@ -141,3 +142,25 @@ def test_title_complex(self):
         )
         self.assertIn("\\begin{block}{\\textbf{My Title}}", text)
         self.assertIn("\\end{block}", text)
+
+    def test_title_default(self):
+        doc = BlockTest.conversion(
+            """
+---
+pandoc-beamer-block:
+  - classes: ['class1']
+    title: My Title
+---
+::: class1 :::
+:::
+            """,
+            "beamer",
+        )
+        text = convert_text(
+            doc,
+            input_format="panflute",
+            output_format="latex",
+            extra_args=["--wrap=none"],
+        )
+        self.assertIn("\\begin{block}{My Title}", text)
+        self.assertIn("\\end{block}", text)