Merge branch 'release/3.5.0.0'

Author: chdemko

.github/workflows/python-package.yml

@@ -15,15 +15,16 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
-        pandoc-version: ['3.5']
+        pandoc-version: ['3.6']
     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
     - name: Install dependencies
       run: |
         wget https://github.com/jgm/pandoc/releases/download/${{ matrix.pandoc-version }}/pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
@@ -37,15 +38,16 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.12']
-        pandoc-version: [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']
+        pandoc-version: [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']
     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
     - name: Install dependencies
       run: |
         wget https://github.com/jgm/pandoc/releases/download/${{ matrix.pandoc-version }}/pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
@@ -59,15 +61,16 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.12']
-        pandoc-version: ['3.5']
+        pandoc-version: ['3.6']
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Hatch
-      run: pipx install hatch
+      run: |
+        pipx install hatch
     - name: Install dependencies
       run: |
         wget https://github.com/jgm/pandoc/releases/download/${{ matrix.pandoc-version }}/pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
@@ -84,15 +87,16 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.12']
-        pandoc-version: ['3.5']
+        pandoc-version: ['3.6']
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Hatch
-      run: pipx install hatch
+      run: |
+        pipx install hatch
     - 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 hatchling==1.25.0
     - name: Build and publish
       env:
         HATCH_INDEX_USER: ${{ secrets.PYPI_USERNAME }}

.readthedocs.yml

@@ -11,6 +11,7 @@ build:
     python: '3.11'
   commands:
   - git fetch --unshallow || true
+  - pip install hatchling==1.25.0
   - pip install hatch
   - hatch run docs:build $READTHEDOCS_OUTPUT/html/
 

README.md

@@ -1,13 +1,13 @@
 Install
 =======
 
-[![Python package](https://github.com/chdemko/pandoc-numbering/workflows/Python%20package/badge.svg?branch=develop)](https://github.com/chdemko/pandoc-numbering/actions/workflows/python-package.yml)
+[![Python package](https://img.shields.io/github/actions/workflow/status/chdemko/pandoc-numbering/python-package.yml?logo=github&branch=develop)](https://github.com/chdemko/pandoc-numbering/actions/workflows/python-package.yml)
 [![Hatch project](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5.svg)](https://github.com/pypa/hatch)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://pypi.org/project/black/)
 [![Coveralls](https://img.shields.io/coveralls/github/chdemko/pandoc-numbering/develop.svg?logo=Codecov&logoColor=white)](https://coveralls.io/github/chdemko/pandoc-numbering?branch=develop)
 [![Scrutinizer](https://img.shields.io/scrutinizer/g/chdemko/pandoc-numbering.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/chdemko/pandoc-numbering/)
-[![Code Climate](https://codeclimate.com/github/chdemko/pandoc-numbering/badges/gpa.svg)](https://codeclimate.com/github/chdemko/pandoc-numbering/)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/chdemko/pandoc-numbering?logo=codeclimate&barnch=develop)](https://codeclimate.com/github/chdemko/pandoc-numbering/)
 [![CodeFactor](https://img.shields.io/codefactor/grade/github/chdemko/pandoc-numbering/develop.svg?logo=codefactor)](https://www.codefactor.io/repository/github/chdemko/pandoc-numbering)
 [![Codacy](https://img.shields.io/codacy/grade/36051716c52147bca7a7f4c1ca6bc998.svg?logo=codacy)](https://app.codacy.com/gh/chdemko/pandoc-numbering/dashboard)
 [![PyPI version](https://img.shields.io/pypi/v/pandoc-numbering.svg?logo=pypi&logoColor=white)](https://pypi.org/project/pandoc-numbering/)
@@ -16,7 +16,7 @@ Install
 [![Downloads](https://img.shields.io/pypi/dm/pandoc-numbering?logo=pypi&logoColor=white)](https://pepy.tech/project/pandoc-numbering)
 [![Development Status](https://img.shields.io/pypi/status/pandoc-numbering.svg?logo=pypi&logoColor=white)](https://pypi.org/project/pandoc-numbering/)
 [![Python version](https://img.shields.io/pypi/pyversions/pandoc-numbering.svg?logo=Python&logoColor=white)](https://pypi.org/project/pandoc-numbering/)
-[![Pandoc version](https://img.shields.io/badge/pandoc-2.14%20|%202.15%20|%202.16%20|%202.17%20|%202.18%20|%202.19%20|%203.0%20|%203.1%20|%203.2%20|%203.3%20|%203.4%20|%203.5-blue.svg?logo=markdown)](https://pandoc.org/)
+[![Pandoc version](https://img.shields.io/badge/pandoc-2.14%20..%203.6-blue.svg?logo=markdown)](https://pandoc.org/)
 [![Latest release](https://img.shields.io/github/release-date/chdemko/pandoc-numbering.svg?logo=github)](https://github.com/chdemko/pandoc-numbering/releases)
 [![Last commit](https://img.shields.io/github/last-commit/chdemko/pandoc-numbering/develop?logo=github)](https://github.com/chdemko/pandoc-numbering/commit/develop/)
 [![Repo Size](https://img.shields.io/github/repo-size/chdemko/pandoc-numbering.svg?logo=github)](http://pandoc-numbering.readthedocs.io/en/latest/)

pyproject.toml

@@ -47,6 +47,7 @@ Homepage = "https://github.com/chdemko/pandoc-numbering"
 Documentation = "https://pandoc-numbering.readthedocs.io/"
 Repository = "https://github.com/chdemko/pandoc-numbering"
 Issues = "https://github.com/chdemko/pandoc-numbering/issues"
+Coverage = "https://coveralls.io/github/chdemko/pandoc-numbering"
 
 [project.scripts]
 pandoc-numbering = "pandoc_numbering:main"
@@ -72,16 +73,16 @@ dependencies = [
   "black[jupyter]~=24.10",
   # Style checkers
   "doc8~=1.1",
-  "mypy~=1.12",
+  "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-bugbear~=24.10",
   "flake8-builtins~=2.5",
   "flake8-cognitive-complexity~=0.1",
-  "flake8-comprehensions~=3.15",
+  "flake8-comprehensions~=3.16",
   "flake8-docstrings~=1.7",
   "flake8-expression-complexity~=0.0",
   "flake8-fixme~=1.1",
@@ -100,7 +101,7 @@ dependencies = [
   "pydoclint[flake8]~=0.5",
   "teyit~=0.4",
   "refurb~=2.0",
-  "ruff~=0.7"
+  "ruff~=0.8"
 ]
 
 [tool.hatch.envs.hatch-static-analysis.scripts]
@@ -212,21 +213,23 @@ arg-type-hints-in-docstring = false
 style = "numpy"
 
 [tool.mypy]
-disallow_any_generics = true
-disallow_subclassing_any = true
-# disallow_untyped_calls = true
-# disallow_untyped_defs = true
-# disallow_incomplete_defs = true
-# check_untyped_defs = true
-disallow_untyped_decorators = true
 ignore_missing_imports = true
 no_implicit_optional = true
-no_implicit_reexport = true
-warn_redundant_casts = true
-warn_return_any = true
 # equivalent to --strict option
 warn_unused_configs = true
+disallow_any_generics = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_defs = true
+disallow_incomplete_defs = true
+check_untyped_defs = true
+disallow_untyped_decorators = true
+warn_redundant_casts = true
 warn_unused_ignores = true
+warn_return_any = true
+no_implicit_reexport = true
+strict_equality = true
+extra_checks = true
 mypy_path = "src"
 
 [[tool.mypy.overrides]]

src/pandoc_numbering/_main.py

@@ -83,6 +83,7 @@ class Numbered:
         "_description",
         "_category",
         "_basic_category",
+        "_classes",
         "_first_section_level",
         "_last_section_level",
         "_leading",
@@ -272,6 +273,7 @@ def __init__(self, elem: Element, doc: Doc):
         self._description = None
         self._category = None
         self._basic_category = None
+        self._classes = None
         self._first_section_level = None
         self._last_section_level = None
         self._leading = None
@@ -402,11 +404,16 @@ def _compute_number(self):
         self._number = str(self._doc.count[self._category])
 
     def _compute_tag(self):
+        self._classes = [
+            self._category[:-1].replace(":", "-").replace(".", "-") + "-" + self._number
+        ]
+
         # Determine the final tag
         if self._match.group("name") is None:
             self._tag = self._category + self._number
         else:
             self._tag = self._basic_category + ":" + self._match.group("name")
+            self._classes.append(self._basic_category + "-" + self._match.group("name"))
 
         # Compute collections
         if self._basic_category not in self._doc.collections:
@@ -469,7 +476,7 @@ def _compute_data(self):
                     Span(),
                     Span(
                         identifier=self._tag,
-                        classes=["pandoc-numbering-text"] + classes,
+                        classes=["pandoc-numbering-text"] + classes + self._classes,
                     ),
                 ]
             )
@@ -479,7 +486,7 @@ def _compute_data(self):
                     Span(identifier=self._alias),
                     Span(
                         identifier=self._tag,
-                        classes=["pandoc-numbering-text"] + classes,
+                        classes=["pandoc-numbering-text"] + classes + self._classes,
                     ),
                 ]
             )

tests/test_listings_meta.py

@@ -32,9 +32,9 @@ def test_listing_classic(self):
 -   [[Exercise 1]{.pandoc-numbering-entry .exercise}](#exercise:1)
 -   [[Title]{.pandoc-numbering-entry .exercise}](#exercise:2)
 
-[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise}
+[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise .exercise-1}
 
-[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise}
+[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise .exercise-2}
             """,
         )
 
@@ -68,9 +68,9 @@ def test_listing_identifier_false(self):
 -   [[Exercise 1]{.pandoc-numbering-entry .exercise}](#exercise:1)
 -   [[Title]{.pandoc-numbering-entry .exercise}](#exercise:2)
 
-[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise}
+[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise .exercise-1}
 
-[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise}
+[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise .exercise-2}
             """,
         )
 
@@ -104,9 +104,9 @@ def test_listing_identifier(self):
 -   [[Exercise 1]{.pandoc-numbering-entry .exercise}](#exercise:1)
 -   [[Title]{.pandoc-numbering-entry .exercise}](#exercise:2)
 
-[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise}
+[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise .exercise-1}
 
-[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise}
+[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise .exercise-2}
             """,
         )
 
@@ -142,9 +142,9 @@ def test_listing_options(self):
 -   [[Exercise 1]{.pandoc-numbering-entry .exercise}](#exercise:1)
 -   [[Title]{.pandoc-numbering-entry .exercise}](#exercise:2)
 
-[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise}
+[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise .exercise-1}
 
-[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise}
+[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise .exercise-2}
             """,
         )
 
@@ -203,9 +203,9 @@ def test_listing_latex(self):
 
 `\ifdef{\mainmatter}{}{\phantomsection\label{list-of-exercises}\listofexercise}`{=tex}
 
-`\phantomsection\addcontentsline{exercise}{exercise}{\protect\numberline {1}{\ignorespaces {Exercise}}}`{=tex}[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise}
+`\phantomsection\addcontentsline{exercise}{exercise}{\protect\numberline {1}{\ignorespaces {Exercise}}}`{=tex}[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise .exercise-1}
 
-`\phantomsection\addcontentsline{exercise}{exercise}{\protect\numberline {2}{\ignorespaces {Title}}}`{=tex}[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise}
+`\phantomsection\addcontentsline{exercise}{exercise}{\protect\numberline {2}{\ignorespaces {Title}}}`{=tex}[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise .exercise-2}
             """,
             "latex",
         )
@@ -244,9 +244,9 @@ def test_listing_classic_format(self):
 -   [[1 Exercise]{.pandoc-numbering-entry .exercise}](#exercise:1)
 -   [[2 Exercise (Title)]{.pandoc-numbering-entry .exercise}](#exercise:2)
 
-[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise}
+[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise .exercise-1}
 
-[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise}
+[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise .exercise-2}
             """,
         )
 
@@ -317,9 +317,9 @@ def test_listing_latex_format(self):
 
 `\ifdef{\mainmatter}{}{\phantomsection\label{list-of-exercises}\listofexercise}`{=tex}
 
-`\phantomsection\addcontentsline{exercise}{exercise}{\protect\numberline {1}{\ignorespaces {Exercise}}}`{=tex}[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise}
+`\phantomsection\addcontentsline{exercise}{exercise}{\protect\numberline {1}{\ignorespaces {Exercise}}}`{=tex}[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .exercise .exercise-1}
 
-`\phantomsection\addcontentsline{exercise}{exercise}{\protect\numberline {2}{\ignorespaces {Exercise (Title)}}}`{=tex}[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise}
+`\phantomsection\addcontentsline{exercise}{exercise}{\protect\numberline {2}{\ignorespaces {Exercise (Title)}}}`{=tex}[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .exercise .exercise-2}
             """,
             "latex",
         )

tests/test_numbering_meta.py

@@ -29,9 +29,9 @@ def test_numbering_classes(self):
       - myclass
 ---
 
-[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .myclass}
+[**Exercise 1**]{#exercise:1 .pandoc-numbering-text .myclass .exercise-1}
 
-[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .myclass}
+[]{#exercise:title}[**Exercise 2** *(Title)*]{#exercise:2 .pandoc-numbering-text .myclass .exercise-2}
             """,
         )
 
@@ -60,9 +60,9 @@ def test_numbering_text(self):
       format-text-title: "**%D %d %n/%c: %T %t**"
 ---
 
-[**Exercise exercise 1/2**]{#exercise:1 .pandoc-numbering-text .exercise}
+[**Exercise exercise 1/2**]{#exercise:1 .pandoc-numbering-text .exercise .exercise-1}
 
-[]{#exercise:title}[**Exercise exercise 2/2: Title title**]{#exercise:2 .pandoc-numbering-text .exercise}
+[]{#exercise:title}[**Exercise exercise 2/2: Title title**]{#exercise:2 .pandoc-numbering-text .exercise .exercise-2}
             """,
         )
 
@@ -111,10 +111,10 @@ def test_numbering_levels(self):
 
 ## Second section
 
-[]{#exercise:second-chapter.second-section.1}[**Exercise 2.1**]{#exercise:2.2.1 .pandoc-numbering-text .exercise}
+[]{#exercise:second-chapter.second-section.1}[**Exercise 2.1**]{#exercise:2.2.1 .pandoc-numbering-text .exercise .exercise-2-2-1}
 
-[]{#exercise:second-chapter.second-section.title}[**Exercise 2.2** *(Title)*]{#exercise:2.2.2 .pandoc-numbering-text .exercise}
-            """,
+[]{#exercise:second-chapter.second-section.title}[**Exercise 2.2** *(Title)*]{#exercise:2.2.2 .pandoc-numbering-text .exercise .exercise-2-2-2}
+                """,
         )
 
     def test_numbering_sectioning(self):
@@ -160,8 +160,8 @@ def test_numbering_sectioning(self):
 
 ## Second section
 
-[]{#exercise:second-chapter.second-section.1}[**Exercise 2.1**]{#exercise:2.2.1 .pandoc-numbering-text .exercise}
+[]{#exercise:second-chapter.second-section.1}[**Exercise 2.1**]{#exercise:2.2.1 .pandoc-numbering-text .exercise .exercise-2-2-1}
 
-[]{#exercise:second-chapter.second-section.title}[**Exercise 2.2** *(Title)*]{#exercise:2.2.2 .pandoc-numbering-text .exercise}
+[]{#exercise:second-chapter.second-section.title}[**Exercise 2.2** *(Title)*]{#exercise:2.2.2 .pandoc-numbering-text .exercise .exercise-2-2-2}
             """,
         )