Skip to content

Commit fd2eb2c

Browse files
authored
Merge branch 'main' into update-core-metadata-name-regex
2 parents fb63fa5 + d4975c8 commit fd2eb2c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3333
-648
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
source/guides/github-actions-ci-cd-sample/* @webknjaz
22
source/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows.rst @webknjaz
3+
4+
# build-details.json
5+
source/specifications/build-details/ @FFY00
6+
source/specifications/specs/build-details-*.json @FFY00

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repos:
1515
- id: trailing-whitespace
1616

1717
- repo: https://github.com/codespell-project/codespell
18-
rev: v2.3.0
18+
rev: v2.4.1
1919
hooks:
2020
- id: codespell
2121
args: ["-L", "ned,ist,oder", "--skip", "*.po"]
@@ -37,7 +37,7 @@ repos:
3737
- id: rst-inline-touching-normal
3838

3939
- repo: https://github.com/astral-sh/ruff-pre-commit
40-
rev: v0.7.1
40+
rev: v0.12.2
4141
hooks:
4242
- id: ruff
4343
- id: ruff-format

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ sphinx-autobuild==2021.3.14
44
sphinx-inline-tabs==2023.4.21
55
sphinx-copybutton==0.5.2
66
sphinx-toolbox==3.5.0
7+
sphinx-jsonschema==1.19.1

source/conf.py

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"sphinx_inline_tabs",
2929
"sphinx_copybutton",
3030
"sphinx_toolbox.collapse",
31+
"sphinx-jsonschema",
3132
]
3233

3334
nitpicky = True
@@ -72,9 +73,9 @@
7273

7374
_metrics_js_files = [
7475
(
75-
"https://plausible.io/js/script.js",
76+
"https://analytics.python.org/js/script.outbound-links.js",
7677
{"data-domain": "packaging.python.org", "defer": "defer"},
77-
)
78+
),
7879
]
7980
html_js_files = []
8081
if RTD_CANONICAL_BUILD:
@@ -127,24 +128,31 @@
127128
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-the-linkcheck-builder
128129

129130
linkcheck_ignore = [
130-
"http://localhost:\\d+",
131-
"https://test.pypi.org/project/example-package-YOUR-USERNAME-HERE",
132-
"https://pypi.org/manage/*",
133-
"https://test.pypi.org/manage/*",
131+
r"http://localhost:\d+",
132+
r"https://packaging\.python\.org/en/latest/specifications/schemas/.*",
133+
r"https://test\.pypi\.org/project/example-package-YOUR-USERNAME-HERE",
134+
r"https://pypi\.org/manage/.*",
135+
r"https://test\.pypi\.org/manage/.*",
134136
# Temporarily ignored. Ref:
135137
# https://github.com/pypa/packaging.python.org/pull/1308#issuecomment-1775347690
136-
"https://www.breezy-vcs.org/*",
138+
r"https://www\.breezy-vcs\.org/.*",
137139
# Ignore while StackOverflow is blocking GitHub CI. Ref:
138140
# https://github.com/pypa/packaging.python.org/pull/1474
139-
"https://stackoverflow.com/*",
140-
"https://pyscaffold.org/*",
141-
"https://anaconda.org",
141+
r"https://stackoverflow\.com/.*",
142+
r"https://pyscaffold\.org/.*",
143+
r"https://anaconda\.org",
144+
r"https://www\.cisa\.gov/sbom",
145+
r"https://developers\.redhat\.com/products/softwarecollections/overview",
146+
r"https://math-atlas\.sourceforge\.net/?",
147+
r"https://click\.palletsprojects\.com/.*",
148+
r"https://typer\.tiangolo\.com/.*",
142149
]
143150
linkcheck_retries = 5
144151
# Ignore anchors for common targets when we know they likely won't be found
145152
linkcheck_anchors_ignore_for_url = [
146153
# GitHub synthesises anchors in JavaScript, so Sphinx can't find them in the HTML
147154
r"https://github\.com/",
155+
r"https://docs\.github\.com/",
148156
# While PyPI has its botscraping defenses active, Sphinx can't resolve the anchors
149157
# https://github.com/pypa/packaging.python.org/issues/1744
150158
r"https://pypi\.org/",

source/contribute.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ including:
1111
* Reviewing new contributions
1212
* Revising existing content
1313
* Writing new content
14-
* Translate the guide
14+
* Translating the guide
1515

1616
Most of the work on the |PyPUG| takes place on the
1717
`project's GitHub repository`__. To get started, check out the list of
@@ -103,7 +103,6 @@ If you are not familiar with reStructuredText (RST) syntax, please read `this gu
103103
before translating on Weblate.
104104

105105
**Do not translate the text in reference directly**
106-
107106
When translating the text in reference, please do not translate them directly.
108107

109108
| Wrong: Translate the following text directly:

source/discussions/deploying-python-applications.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Supporting multiple hardware platforms
2323
For Python-only distributions, it *should* be straightforward to deploy on all
2424
platforms where Python can run.
2525

26-
For distributions with binary extensions, deployment is major headache. Not only
26+
For distributions with binary extensions, deployment is a major headache. Not only
2727
must the extensions be built on all the combinations of operating system and
2828
hardware platform, but they must also be tested, preferably on continuous
2929
integration platforms. The issues are similar to the "multiple Python

0 commit comments

Comments
 (0)