Skip to content

Commit 37ae364

Browse files
committed
Merge branch 'release/3.0.0.4'
2 parents 66c24c7 + 6aaf447 commit 37ae364

File tree

10 files changed

+401
-62
lines changed

10 files changed

+401
-62
lines changed

.github/workflows/python-package.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
python-version: ['3.10', '3.11', '3.12']
18-
pandoc-version: ['3.3']
17+
python-version: ['3.10', '3.11', '3.12', '3.13']
18+
pandoc-version: ['3.5']
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- name: Set up Python ${{ matrix.python-version }}
22-
uses: actions/setup-python@v4
22+
uses: actions/setup-python@v5
2323
with:
2424
python-version: ${{ matrix.python-version }}
2525
- name: Install Hatch
@@ -38,11 +38,11 @@ jobs:
3838
strategy:
3939
matrix:
4040
python-version: ['3.12']
41-
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']
41+
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']
4242
steps:
43-
- uses: actions/checkout@v3
43+
- uses: actions/checkout@v4
4444
- name: Set up Python ${{ matrix.python-version }}
45-
uses: actions/setup-python@v4
45+
uses: actions/setup-python@v5
4646
with:
4747
python-version: ${{ matrix.python-version }}
4848
- name: Install Hatch
@@ -61,11 +61,11 @@ jobs:
6161
strategy:
6262
matrix:
6363
python-version: ['3.12']
64-
pandoc-version: ['3.3']
64+
pandoc-version: ['3.5']
6565
steps:
66-
- uses: actions/checkout@v3
66+
- uses: actions/checkout@v4
6767
- name: Set up Python
68-
uses: actions/setup-python@v4
68+
uses: actions/setup-python@v5
6969
with:
7070
python-version: ${{ matrix.python-version }}
7171
- name: Install Hatch
@@ -80,18 +80,18 @@ jobs:
8080
hatch fmt --check
8181
- name: Dynamic check
8282
run: |
83-
hatch run dynamic-lint:check
83+
hatch run lint:check
8484
8585
cov:
8686
runs-on: ubuntu-latest
8787
strategy:
8888
matrix:
8989
python-version: ['3.12']
90-
pandoc-version: ['3.3']
90+
pandoc-version: ['3.5']
9191
steps:
92-
- uses: actions/checkout@v3
92+
- uses: actions/checkout@v4
9393
- name: Set up Python
94-
uses: actions/setup-python@v4
94+
uses: actions/setup-python@v5
9595
with:
9696
python-version: ${{ matrix.python-version }}
9797
- name: Install Hatch
@@ -104,8 +104,7 @@ jobs:
104104
- name: Test
105105
env:
106106
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
107-
run: |
107+
run: |-
108108
hatch test --cover
109109
hatch run pip install coveralls
110110
hatch run coveralls
111-

.github/workflows/python-publish.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,17 @@ jobs:
1818
with:
1919
fetch-depth: 0
2020
- name: Set up Python
21-
uses: actions/setup-python@v4
21+
uses: actions/setup-python@v5
2222
with:
2323
python-version: ${{ matrix.python-version }}
2424
- name: Install Hatch
2525
run: pipx install hatch
26-
- name: Install dependencies
27-
run: |
28-
hatch run python download.py
29-
hatch run pip install twine
3026
- name: Build and publish
3127
env:
32-
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
33-
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
28+
HATCH_INDEX_USER: ${{ secrets.PYPI_USERNAME }}
29+
HATCH_INDEX_AUTH: ${{ secrets.PYPI_PASSWORD }}
30+
SETUPTOOLS_SCM_PRETEND_VERSION: ${{ github.ref_name }}
3431
run: |
35-
SETUPTOOLS_SCM_PRETEND_VERSION=${{ github.ref_name }} hatch build -t wheel
36-
hatch run twine upload dist/*
32+
hatch run python download.py
33+
hatch build -t wheel
34+
hatch publish dist/*.whl

.pre-commit-config.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.6.0
3+
rev: v5.0.0
44
hooks:
55
- id: check-toml
66
- id: check-yaml
@@ -14,7 +14,7 @@ repos:
1414
args: [--autofix]
1515

1616
- repo: https://github.com/asottile/pyupgrade
17-
rev: v3.17.0
17+
rev: v3.18.0
1818
hooks:
1919
- id: pyupgrade
2020
args: [--py310-plus]
@@ -26,14 +26,18 @@ repos:
2626
entry: hatch fmt --check
2727
language: system
2828
pass_filenames: false
29-
- id: dynamic-lint
30-
name: dynamic-lint
31-
entry: hatch run dynamic-lint:check
29+
- id: lint
30+
name: lint
31+
entry: hatch run lint:check
3232
language: system
3333
pass_filenames: false
3434
- id: test
3535
name: test
3636
entry: hatch test
3737
language: system
3838
pass_filenames: false
39-
39+
- id: lock
40+
name: lock
41+
entry: uv lock --upgrade
42+
language: system
43+
pass_filenames: false

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Installation
1616
[![Downloads](https://img.shields.io/pypi/dm/pandoc-latex-tip?logo=pypi&logoColor=white)](https://pepy.tech/project/pandoc-latex-tip)
1717
[![Development Status](https://img.shields.io/pypi/status/pandoc-latex-tip.svg?logo=pypi&logoColor=white)](https://pypi.org/project/pandoc-numbering/)
1818
[![Python version](https://img.shields.io/pypi/pyversions/pandoc-latex-tip.svg?logo=Python&logoColor=white)](https://pypi.org/project/pandoc-latex-tip/)
19-
[![Pandoc version](https://img.shields.io/badge/pandoc-2.11%20|%202.12%20|%202.13%20|%202.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-blue.svg?logo=markdown)](https://pandoc.org/)
19+
[![Pandoc version](https://img.shields.io/badge/pandoc-2.11%20|%202.12%20|%202.13%20|%202.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/)
2020
[![Latest release](https://img.shields.io/github/release-date/chdemko/pandoc-latex-tip.svg?logo=github)](https://github.com/chdemko/pandoc-latex-tip/releases)
2121
[![Last commit](https://img.shields.io/github/last-commit/chdemko/pandoc-latex-tip/develop?logo=github)](https://github.com/chdemko/pandoc-latex-tip/commit/develop/)
2222
[![Repo Size](https://img.shields.io/github/repo-size/chdemko/pandoc-latex-tip.svg?logo=github)](http://pandoc-latex-tip.readthedocs.io/en/latest/)
@@ -113,10 +113,10 @@ When your changes are ready, run
113113
~~~shell-session
114114
$ hatch test
115115
$ hatch fmt --check
116+
$ hatch run lint:check
116117
$ hatch run docs:build
117118
$ hatch build -t wheel
118119
~~~
119120

120121
for running the tests, checking the style, building the documentation
121122
and building the wheel.
122-

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# If your documentation needs a minimal Sphinx version, state it here.
4040
#
41-
needs_sphinx = "6.0"
41+
needs_sphinx = "8.1"
4242

4343
# Add any Sphinx extension module names here, as strings. They can be
4444
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

pyproject.toml

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dynamic = ["version"]
77
name = "pandoc-latex-tip"
88
description = "A pandoc filter for adding icons on specific elements"
99
readme = "README.md"
10-
requires-python = ">=3.10,<3.13"
10+
requires-python = ">=3.10,<3.14"
1111
license = {text = "BSD-3-Clause"}
1212
license-files = {paths = ["LICENSE"]}
1313
authors = [{name = "Christophe Demko", email = "chdemko@gmail.com"}]
@@ -33,14 +33,15 @@ classifiers = [
3333
"Programming Language :: Python :: 3.10",
3434
"Programming Language :: Python :: 3.11",
3535
"Programming Language :: Python :: 3.12",
36+
"Programming Language :: Python :: 3.13",
3637
# Natural language used
3738
"Natural Language :: English"
3839
]
3940
dependencies = [
4041
"panflute~=2.3",
41-
"pillow~=10.4",
42-
"fonttools~=4.53",
43-
"platformdirs~=4.2",
42+
"pillow~=11.0",
43+
"fonttools~=4.54",
44+
"platformdirs~=4.3",
4445
"PyYAML~=6.0",
4546
"tinycss2~=1.3",
4647
"cleo~=2.1"
@@ -60,26 +61,26 @@ source = "vcs"
6061

6162
[tool.hatch.version.raw-options]
6263
version_scheme = "no-guess-dev"
63-
local_scheme = "node-and-date"
64+
local_scheme = "no-local-version"
6465

6566
[tool.hatch.build.targets.wheel]
66-
packages = ["pandoc_latex_tip"]
67+
packages = ["src/pandoc_latex_tip"]
6768

6869
[tool.hatch.build.targets.wheel.shared-data]
6970
share = "share"
7071

7172
[[tool.hatch.envs.hatch-test.matrix]]
72-
python = ["3.10", "3.11", "3.12"]
73+
python = ["3.10", "3.11", "3.12", "3.13"]
7374

7475
[tool.hatch.envs.hatch-static-analysis]
7576
dependencies = [
7677
# Types
7778
"types-PyYAML~=6.0",
7879
# Formatter
79-
"black[jupyter]~=24.8",
80+
"black[jupyter]~=24.10",
8081
# Style checkers
8182
"doc8~=1.1",
82-
"mypy~=1.11",
83+
"mypy~=1.12",
8384
"flake8~=7.1",
8485
"flake8-pyproject~=1.2",
8586
"flake8-annotations-complexity~=0.0",
@@ -95,56 +96,56 @@ dependencies = [
9596
"flake8-functions~=0.0",
9697
"flake8-import-order~=0.18",
9798
"flake8-mypy~=17.8",
98-
"flake8-pyi~=24.6",
99+
"flake8-pyi~=24.9",
99100
"flake8-pydocstyle~=0.2",
100101
"flake8-return~=1.2",
101102
"flake8-simplify~=0.21",
102103
"flake8-spellcheck~=0.28",
103104
"flake8-use-fstring~=1.4",
104105
"flake8-variables-names~=0.0",
105-
"pep8-naming~=0.13",
106+
"pep8-naming~=0.14",
106107
"darglint~=1.8.1",
107108
"pydoclint[flake8]~=0.5",
108109
"teyit~=0.4",
109110
"refurb~=2.0",
110-
"ruff~=0.6"
111+
"ruff~=0.7"
111112
]
112113

113114
[tool.hatch.envs.hatch-static-analysis.scripts]
114115
format-check = [
115-
"black --check --diff {args:pandoc_latex_tip download.py docs}",
116+
"black --check --diff {args:src download.py docs}",
116117
"doc8 -q {args:docs README.md} -e .rst -e .md"
117118
]
118119
format-fix = [
119-
"black {args:pandoc_latex_tip download.py docs}"
120+
"black {args:src download.py docs}"
120121
]
121122
lint-check = [
122-
"refurb {args:pandoc_latex_tip download.py docs}",
123-
"ruff check {args:pandoc_latex_tip download.py docs}",
123+
"refurb {args:src download.py docs}",
124+
"ruff check {args:src download.py docs}",
124125
"teyit --show-stats --fail-on-change {args:tests}",
125-
"flake8 {args:pandoc_latex_tip download.py docs}"
126+
"flake8 {args:src download.py docs}"
126127
]
127128
lint-fix = [
128-
"ruff check --fix {args:pandoc_latex_tip download.py docs}"
129+
"ruff check --fix {args:src download.py docs}"
129130
]
130131

131-
[tool.hatch.envs.dynamic-lint]
132+
[tool.hatch.envs.lint]
132133
dependencies = [
133134
"slotscheck~=0.19",
134-
"pylint~=3.2"
135+
"pylint~=3.3"
135136
]
136137

137-
[tool.hatch.envs.dynamic-lint.scripts]
138+
[tool.hatch.envs.lint.scripts]
138139
check = [
139-
"slotscheck {args:pandoc_latex_tip}",
140-
"pylint {args:pandoc_latex_tip download.py}"
140+
"slotscheck {args:src}",
141+
"pylint {args:src download.py}"
141142
]
142143

143144
[tool.hatch.envs.docs]
144145
dependencies = [
145-
"myst-parser~=2.0",
146-
"Sphinx~=7.2",
147-
"sphinx-rtd-theme~=2.0",
146+
"myst-parser~=4.0",
147+
"Sphinx~=8.1",
148+
"sphinx-rtd-theme~=3.0",
148149
"sphinx-copybutton~=0.5"
149150
]
150151

@@ -238,4 +239,4 @@ module = "panflute.*"
238239
convention = "numpy"
239240

240241
[tool.coverage.run]
241-
source = ["pandoc_latex_tip"]
242+
source = ["src"]
File renamed without changes.
File renamed without changes.

pandoc_latex_tip/_main.py renamed to src/pandoc_latex_tip/_main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def load_css(self, prefix: str | None) -> dict[str, str]:
134134

135135
return dict(sorted(icons.items(), key=operator.itemgetter(0)))
136136

137-
# pylint: disable=too-many-arguments,too-many-locals
137+
# pylint: disable=too-many-arguments,too-many-locals,too-many-positional-arguments
138138
def export_icon(
139139
self,
140140
icon: str,

0 commit comments

Comments
 (0)