Skip to content

Commit 541c7a5

Browse files
hugovkhugovk
authored
Merge branch 'main' into add-localization
2 parents a845398 + 3e81cef commit 541c7a5

File tree

5 files changed

+27
-30
lines changed

5 files changed

+27
-30
lines changed

‎.github/workflows/pypi-package.yml

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
permissions:
1212
contents: read
1313

14+
env:
15+
FORCE_COLOR: 1
16+
1417
jobs:
1518
# Always build & lint package.
1619
build-package:
@@ -45,3 +48,5 @@ jobs:
4548

4649
- name: Upload package to PyPI
4750
uses: pypa/gh-action-pypi-publish@release/v1
51+
with:
52+
attestations: true

‎.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
branch: ["origin/main", "3.12", "3.11", "3.10"]
15+
branch: ["origin/main", "3.13", "3.12", "3.11", "3.10"]
1616
steps:
1717
- uses: actions/checkout@v4
1818
- uses: actions/setup-python@v5

‎.pre-commit-config.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.4.0
3+
rev: v0.6.8
44
hooks:
55
- id: ruff
66
args: [--exit-non-zero-on-fix]
77

88
- repo: https://github.com/psf/black-pre-commit-mirror
9-
rev: 24.4.0
9+
rev: 24.8.0
1010
hooks:
1111
- id: black
1212

@@ -22,24 +22,24 @@ repos:
2222
- id: trailing-whitespace
2323

2424
- repo: https://github.com/python-jsonschema/check-jsonschema
25-
rev: 0.28.2
25+
rev: 0.29.2
2626
hooks:
2727
- id: check-dependabot
2828
- id: check-github-workflows
2929

3030
- repo: https://github.com/rhysd/actionlint
31-
rev: v1.6.27
31+
rev: v1.7.2
3232
hooks:
3333
- id: actionlint
3434

3535
- repo: https://github.com/tox-dev/pyproject-fmt
36-
rev: 1.8.0
36+
rev: 2.2.4
3737
hooks:
3838
- id: pyproject-fmt
3939
args: [--max-supported-python=3.13]
4040

4141
- repo: https://github.com/abravalheri/validate-pyproject
42-
rev: v0.16
42+
rev: v0.20.2
4343
hooks:
4444
- id: validate-pyproject
4545

‎pyproject.toml

+13-21
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[build-system]
22
build-backend = "flit_core.buildapi"
33
requires = [
4-
"flit_core>=3.7",
4+
"flit-core>=3.7",
55
]
66

77
[project]
@@ -10,8 +10,8 @@ version = "2024.6"
1010
description = "The Sphinx theme for the CPython docs and related projects"
1111
readme = "README.md"
1212
license.file = "LICENSE"
13-
authors = [{name = "PyPA", email = "distutils-sig@python.org"}]
14-
requires-python = ">=3.8"
13+
authors = [ { name = "PyPA", email = "distutils-sig@python.org" } ]
14+
requires-python = ">=3.9"
1515
classifiers = [
1616
"Development Status :: 5 - Production/Stable",
1717
"Framework :: Sphinx :: Theme",
@@ -20,7 +20,6 @@ classifiers = [
2020
"Operating System :: OS Independent",
2121
"Programming Language :: Python",
2222
"Programming Language :: Python :: 3 :: Only",
23-
"Programming Language :: Python :: 3.8",
2423
"Programming Language :: Python :: 3.9",
2524
"Programming Language :: Python :: 3.10",
2625
"Programming Language :: Python :: 3.11",
@@ -33,22 +32,18 @@ urls.Code = "https://github.com/python/python-docs-theme"
3332
urls.Download = "https://pypi.org/project/python-docs-theme/"
3433
urls.Homepage = "https://github.com/python/python-docs-theme/"
3534
urls."Issue tracker" = "https://github.com/python/python-docs-theme/issues"
36-
[project.entry-points."sphinx.html_themes"]
37-
python_docs_theme = 'python_docs_theme'
35+
entry-points."sphinx.html_themes".python_docs_theme = "python_docs_theme"
3836

3937
[tool.flit.module]
4038
name = "python_docs_theme"
4139

4240
[tool.flit.sdist]
43-
include = [
44-
"python_docs_theme/",
45-
]
41+
include = [ "python_docs_theme/" ]
4642

4743
[tool.ruff]
4844
fix = true
4945

50-
[tool.ruff.lint]
51-
select = [
46+
lint.select = [
5247
"C4", # flake8-comprehensions
5348
"E", # pycodestyle errors
5449
"F", # pyflakes errors
@@ -57,19 +52,16 @@ select = [
5752
"LOG", # flake8-logging
5853
"PGH", # pygrep-hooks
5954
"PYI", # flake8-pyi
60-
"RUF100", # unused noqa (yesqa)
6155
"RUF022", # unsorted-dunder-all
56+
"RUF100", # unused noqa (yesqa)
6257
"UP", # pyupgrade
6358
"W", # pycodestyle warnings
6459
"YTT", # flake8-2020
6560
]
66-
ignore = [
67-
"E203", # Whitespace before ':'
68-
"E221", # Multiple spaces before operator
69-
"E226", # Missing whitespace around arithmetic operator
70-
"E241", # Multiple spaces after ','
61+
lint.ignore = [
62+
"E203", # Whitespace before ':'
63+
"E221", # Multiple spaces before operator
64+
"E226", # Missing whitespace around arithmetic operator
65+
"E241", # Multiple spaces after ','
7166
]
72-
73-
74-
[tool.ruff.lint.isort]
75-
required-imports = ["from __future__ import annotations"]
67+
lint.isort.required-imports = [ "from __future__ import annotations" ]

‎python_docs_theme/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import hashlib
44
import os
5-
from functools import lru_cache
5+
from functools import cache
66
from pathlib import Path
77
from typing import Any
88

@@ -12,7 +12,7 @@
1212
THEME_PATH = Path(__file__).parent.resolve()
1313

1414

15-
@lru_cache(maxsize=None)
15+
@cache
1616
def _asset_hash(path: str) -> str:
1717
"""Append a `?digest=` to an url based on the file content."""
1818
full_path = THEME_PATH / path.replace("_static/", "static/")

0 commit comments

Comments
 (0)