Skip to content

Commit 9eb18e3

Browse files
authored
Merge branch 'main' into aholmes-fix-github-release-automation
2 parents ba7a8d9 + 309d259 commit 9eb18e3

27 files changed

+270
-183
lines changed

.pre-commit-config.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,32 @@ repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
33
rev: v4.4.0
44
hooks:
5+
- id: check-added-large-files
6+
- id: check-case-conflict
7+
- id: check-merge-conflict
8+
- id: check-symlinks
9+
- id: check-yaml
10+
- id: end-of-file-fixer
11+
- id: mixed-line-ending
512
- id: trailing-whitespace
13+
14+
- repo: https://github.com/codespell-project/codespell
15+
rev: v2.2.6
16+
hooks:
17+
- id: codespell
18+
args: ["-L", "ned"]
19+
20+
- repo: local
21+
hooks:
22+
- id: disallow-caps
23+
name: Disallow improper capitalization
24+
language: pygrep
25+
entry: PyBind|Numpy|Cmake|CCache|Github|PyTest
26+
exclude: .pre-commit-config.yaml
27+
28+
- repo: https://github.com/pre-commit/pygrep-hooks
29+
rev: v1.10.0
30+
hooks:
31+
- id: rst-backticks
32+
- id: rst-directive-colons
33+
- id: rst-inline-touching-normal

noxfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def build(session, autobuild=False):
3939

4040
if autobuild:
4141
command = "sphinx-autobuild"
42-
extra_args = "-H", "0.0.0.0"
42+
extra_args = "--host", "0.0.0.0"
4343
else:
4444
# NOTE: This branch adds options that are unsupported by autobuild
4545
command = "sphinx-build"

requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
sphinx==4.5.0
2-
sphinx-autobuild==0.7.1
3-
sphinx-inline-tabs==2021.4.11b9
1+
sphinx==7.2.6
2+
sphinx-autobuild==2021.3.14
3+
sphinx-inline-tabs==2023.4.21
44
python-docs-theme==2023.9
5-
sphinx-copybutton==0.5.0
5+
sphinx-copybutton==0.5.2
66
pypa-docs-theme @ git+https://github.com/pypa/pypa-docs-theme.git
77
sphinx-toolbox==3.5.0

source/conf.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
#
8989
# This is also used if you do content translation via gettext catalogs.
9090
# Usually you set "language" from the command line for these cases.
91-
language = None
91+
language = 'en'
9292

9393
locale_dirs = ['../locales']
9494

@@ -379,11 +379,11 @@
379379

380380
# -- Options for extlinks extension ---------------------------------------
381381
extlinks = {
382-
'issue': (f'{github_repo_issues_url}/%s', '#'), # noqa: WPS323
383-
'pr': (f'{github_repo_url}/pull/%s', 'PR #'), # noqa: WPS323
384-
'commit': (f'{github_repo_url}/commit/%s', ''), # noqa: WPS323
385-
'gh': (f'{github_url}/%s', 'GitHub: '), # noqa: WPS323
386-
'user': (f'{github_sponsors_url}/%s', '@'), # noqa: WPS323
382+
'issue': (f'{github_repo_issues_url}/%s', '#%s'), # noqa: WPS323
383+
'pr': (f'{github_repo_url}/pull/%s', 'PR #%s'), # noqa: WPS323
384+
'commit': (f'{github_repo_url}/commit/%s', '%s'), # noqa: WPS323
385+
'gh': (f'{github_url}/%s', 'GitHub: %s'), # noqa: WPS323
386+
'user': (f'{github_sponsors_url}/%s', '@%s'), # noqa: WPS323
387387
}
388388

389389
linkcheck_ignore = [

source/contribute.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,12 @@ Documentation types
3232
===================
3333

3434
This project consists of four distinct documentation types with specific
35-
purposes. When proposing new additions to the project please pick the
35+
purposes. The project aspires to follow the `Diátaxis process`_
36+
for creating quality documentation. When proposing new additions to the project please pick the
3637
appropriate documentation type.
3738

39+
.. _Diátaxis process: https://diataxis.fr/
40+
3841
Tutorials
3942
---------
4043

@@ -75,15 +78,15 @@ We use `Weblate`_ to manage translations of this project.
7578
Please visit the `packaging.python.org`_ project on Weblate to contribute.
7679

7780
If you are experiencing issues while you are working on translations,
78-
please open an issue on `Github`_.
81+
please open an issue on `GitHub`_.
7982

8083
.. tip::
8184

8285
Any translations of this project should follow `reStructuredText syntax`_.
8386

8487
.. _Weblate: https://weblate.org/
8588
.. _packaging.python.org: https://hosted.weblate.org/projects/pypa/packaging-python-org/
86-
.. _Github: https://github.com/pypa/packaging.python.org/issues
89+
.. _GitHub: https://github.com/pypa/packaging.python.org/issues
8790
.. _reStructuredText syntax: https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html
8891

8992
Adding a language

source/discussions/deploying-python-applications.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ directory, independent of any other Python installation on the computer.
7373

7474
A big advantage of Pynsist is that the Windows packages can be built on Linux.
7575
There are several examples for different kinds of programs (console, GUI) in
76-
the `documentation <pynsist:index>`. The tool is released
76+
the :any:`documentation <pynsist:index>`. The tool is released
7777
under the MIT-licence.
7878

7979
Application bundles

source/flow.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,12 @@ For example, here is a table for using :ref:`hatch`:
8282
requires = ["hatchling"]
8383
build-backend = "hatchling.build"
8484
85-
With such a table in the :file:`pyproject.toml` file, a "frontend" tool like
86-
:ref:`build` can run your chosen build tool's "backend" to create the build
87-
artifacts. Your build tool may also provide its own frontend. An install tool
85+
With such a table in the :file:`pyproject.toml` file,
86+
a ":term:`frontend <Build Frontend>`" tool like
87+
:ref:`build` can run your chosen
88+
build tool's ":term:`backend <Build Backend>`"
89+
to create the build artifacts.
90+
Your build tool may also provide its own frontend. An install tool
8891
like :ref:`pip` also acts as a frontend when it runs your build tool's backend
8992
to install from a source distribution.
9093

source/glossary.rst

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,36 @@ Glossary
1212
extensions.
1313

1414

15+
Build Backend
16+
17+
A library that takes a source tree or
18+
:term:`source distribution <Source Distribution (or "sdist")>`
19+
and builds a source distribution or :term:`wheel <Wheel>` from it.
20+
The build is delegated to the backend by a
21+
:term:`frontend <Build Frontend>`.
22+
All backends offer a standardized interface.
23+
24+
Examples of build backends are
25+
:ref:`flit's flit-core <flit>`,
26+
:ref:`hatch's hatchling <hatch>`,
27+
:ref:`maturin`,
28+
:ref:`meson-python`,
29+
:ref:`scikit-build-core`,
30+
and :ref:`setuptools`.
31+
32+
33+
Build Frontend
34+
35+
A tool that users might run
36+
that takes arbitrary source trees or
37+
:term:`source distributions <Source Distribution (or "sdist")>`
38+
and builds source distributions or :term:`wheels <Wheel>` from them.
39+
The actual building is delegated to each source tree's
40+
:term:`build backend <Build Backend>`.
41+
42+
Examples of build frontends are :ref:`pip` and :ref:`build`.
43+
44+
1545
Built Distribution
1646

1747
A :term:`Distribution <Distribution Package>` format containing files

source/guides/distributing-packages-using-setuptools.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ development as a whole. For example, it does not provide guidance or tool
1515
recommendations for version control, documentation, or testing.
1616

1717
For more reference material, see :std:doc:`Building and Distributing
18-
Packages <userguide/index>` in the :ref:`setuptools` docs, but note
18+
Packages <setuptools:userguide/index>` in the :ref:`setuptools` docs, but note
1919
that some advisory content there may be outdated. In the event of
2020
conflicts, prefer the advice in the Python Packaging User Guide.
2121

@@ -241,7 +241,7 @@ can be specified with the ``long_description_content_type`` argument, which can
241241
be one of ``text/plain``, ``text/x-rst``, or ``text/markdown``, corresponding
242242
to no formatting, `reStructuredText (reST)
243243
<https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#reference-names>`_,
244-
and the Github-flavored Markdown dialect of `Markdown
244+
and the GitHub-flavored Markdown dialect of `Markdown
245245
<https://daringfireball.net/projects/markdown/>`_ respectively.
246246

247247
``url``
@@ -717,7 +717,7 @@ Lastly, if you don't want to install any dependencies at all, you can run:
717717
718718
For more information, see the
719719
:doc:`Development Mode <setuptools:userguide/development_mode>` section
720-
of the :doc:`setuptools docs <setuptools>`.
720+
of the :ref:`setuptools` docs.
721721

722722
.. _`Packaging your project`:
723723

source/guides/dropping-older-python-versions.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ explicitly set ``universal`` to ``0``:
4141
# setup.cfg
4242
4343
[bdist_wheel]
44-
universal = 0 # Make the generated wheels have `py3` tag
44+
universal = 0 # Make the generated wheels have "py3" tag
4545
4646
.. tip::
4747

@@ -71,7 +71,7 @@ Steps:
7171
7272
py -m pip install --upgrade setuptools twine
7373
74-
`setuptools` version should be above 24.0.0.
74+
``setuptools`` version should be above 24.0.0.
7575

7676
2. Specify the version ranges for supported Python distributions
7777
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)