Skip to content

Commit d418315

Browse files
committed
Merge branch 'main' into TeachBooks/main
Resolved conflicts in translation files: - Kept corrected translations for Remark (Spanish, Portuguese, Italian, Greek, Romanian) - Kept corrected translation for Proposition (Polish) - Regenerated all locale .mo files with correct translations Conflicts resolved: - sphinx_proof/translations/jsons/Remark.json - sphinx_proof/translations/jsons/Proposition.json - sphinx_proof/translations/locales/*/LC_MESSAGES/proof.mo (6 files)
2 parents 8f22f26 + 9ad5f96 commit d418315

4 files changed

Lines changed: 21 additions & 14 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
pre-commit:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- name: Set up Python 3.11
17-
uses: actions/setup-python@v5
17+
uses: actions/setup-python@v6
1818
with:
1919
python-version: 3.11
2020
- uses: pre-commit/action@v3.0.1
@@ -27,9 +27,9 @@ jobs:
2727
sphinx: [">=5,<6"]
2828

2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v5
3131
- name: Set up Python ${{ matrix.python-version }}
32-
uses: actions/setup-python@v5
32+
uses: actions/setup-python@v6
3333
with:
3434
python-version: ${{ matrix.python-version }}
3535
- name: Install dependencies
@@ -43,7 +43,7 @@ jobs:
4343
run: coverage xml
4444
# TEMPORARY FIX: Disable codecov until we can get it working again
4545
- name: Upload to Codecov
46-
uses: codecov/codecov-action@v5.4.0
46+
uses: codecov/codecov-action@v5.5.1
4747
if: false
4848
with:
4949
name: sphinx-proof-pytests
@@ -54,9 +54,9 @@ jobs:
5454
name: Documentation build
5555
runs-on: ubuntu-latest
5656
steps:
57-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v5
5858
- name: Set up Python 3.11
59-
uses: actions/setup-python@v5
59+
uses: actions/setup-python@v6
6060
with:
6161
python-version: 3.11
6262
- name: Install dependencies
@@ -76,17 +76,17 @@ jobs:
7676
runs-on: ubuntu-latest
7777
steps:
7878
- name: Checkout source
79-
uses: actions/checkout@v4
79+
uses: actions/checkout@v5
8080
- name: Set up Python 3.11
81-
uses: actions/setup-python@v5
81+
uses: actions/setup-python@v6
8282
with:
8383
python-version: 3.11
8484
- name: Build package
8585
run: |
8686
pip install wheel
8787
python setup.py bdist_wheel sdist
8888
- name: Publish
89-
uses: pypa/gh-action-pypi-publish@v1.12.4
89+
uses: pypa/gh-action-pypi-publish@v1.13.0
9090
with:
9191
user: __token__
9292
password: ${{ secrets.PYPI_KEY }}

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ exclude: >
1010
repos:
1111

1212
- repo: https://github.com/pre-commit/pre-commit-hooks
13-
rev: v5.0.0
13+
rev: v6.0.0
1414
hooks:
1515
- id: check-yaml
1616
- id: end-of-file-fixer
1717
- id: trailing-whitespace
1818

1919
- repo: https://github.com/PyCQA/flake8
20-
rev: 7.1.2
20+
rev: 7.3.0
2121
hooks:
2222
- id: flake8
2323

24-
- repo: https://github.com/psf/black
25-
rev: 25.1.0
24+
- repo: https://github.com/psf/black-pre-commit-mirror
25+
rev: 25.9.0
2626
hooks:
2727
- id: black

sphinx_proof/nodes.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@ class unenumerable_node(nodes.Admonition, nodes.Element):
187187
class assumption_node(nodes.Admonition, nodes.Element):
188188
pass
189189

190+
class notation_node(nodes.Admonition, nodes.Element):
191+
pass
192+
190193

191194
class notation_node(nodes.Admonition, nodes.Element):
192195
pass

sphinx_proof/proof_type.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ class AssumptionDirective(ElementDirective):
9494

9595
name = "assumption"
9696

97+
class NotationDirective(ElementDirective):
98+
"""A custom notation directive."""
99+
100+
name = "notation"
97101

98102
class NotationDirective(ElementDirective):
99103
"""A custom notation directive."""

0 commit comments

Comments
 (0)