Skip to content

Commit f4d7204

Browse files
authored
Merge branch 'main' into Requires-Python
2 parents e604f43 + d3e161e commit f4d7204

26 files changed

+223
-106
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Test
33
on:
44
merge_group:
55
push:
6+
branches-ignore:
7+
- gh-readonly-queue/** # Temporary merge queue-related GH-made branches
68
pull_request:
79
schedule:
810
- cron: "0 6 * * *" # daily at 6am

.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
sphinx==4.5.0
2-
sphinx-autobuild==0.7.1
2+
sphinx-autobuild==2021.3.14
33
sphinx-inline-tabs==2021.4.11b9
4-
python-docs-theme==2022.1
4+
python-docs-theme==2023.9
55
sphinx-copybutton==0.5.0
66
pypa-docs-theme @ git+https://github.com/pypa/pypa-docs-theme.git
77
sphinx-toolbox==3.5.0

source/contribute.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ We use `Weblate`_ to manage translations of this project.
7575
Please visit the `packaging.python.org`_ project on Weblate to contribute.
7676

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

8080
.. tip::
8181

8282
Any translations of this project should follow `reStructuredText syntax`_.
8383

8484
.. _Weblate: https://weblate.org/
8585
.. _packaging.python.org: https://hosted.weblate.org/projects/pypa/packaging-python-org/
86-
.. _Github: https://github.com/pypa/packaging.python.org/issues
86+
.. _GitHub: https://github.com/pypa/packaging.python.org/issues
8787
.. _reStructuredText syntax: https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html
8888

8989
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/glossary.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ Glossary
208208
Source Distribution (or "sdist")
209209

210210
A :term:`distribution <Distribution Package>` format (usually generated
211-
using ``python setup.py sdist``) that provides metadata and the
211+
using ``python -m build --sdist``) that provides metadata and the
212212
essential source files needed for installing by a tool like :ref:`pip`,
213213
or for generating a :term:`Built Distribution`.
214214

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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``
@@ -484,7 +484,7 @@ Each file name in ``files`` is interpreted relative to the :file:`setup.py`
484484
script at the top of the project source distribution.
485485

486486
For more information see the distutils section on :ref:`Installing Additional Files
487-
<python:distutils-additional-files>`.
487+
<setuptools:distutils-additional-files>`.
488488

489489
.. note::
490490

@@ -498,7 +498,7 @@ For more information see the distutils section on :ref:`Installing Additional Fi
498498
~~~~~~~~~~~
499499

500500
Although ``setup()`` supports a :ref:`scripts
501-
<python:distutils-installing-scripts>`
501+
<setuptools:distutils-installing-scripts>`
502502
keyword for pointing to pre-made scripts to install, the recommended approach to
503503
achieve cross-platform compatibility is to use :ref:`console_scripts` entry
504504
points (see below).

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

Lines changed: 3 additions & 3 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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -102,7 +102,7 @@ metadata values based on the argument you provide in ``python_requires``.
102102

103103
Within a Python source package (the zip or the tar-gz file you download) is a text file called PKG-INFO.
104104

105-
This file is generated by Distutils or :ref:`setuptools` when it generates the source package.
105+
This file is generated by :ref:`distutils` or :ref:`setuptools` when it generates the source package.
106106
The file contains a set of keys and values, the list of keys is part of the PyPa standard metadata format.
107107

108108
You can see the contents of the generated file like this:

source/guides/github-actions-ci-cd-sample/publish-to-test-pypi.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ jobs:
7373
inputs: >-
7474
./dist/*.tar.gz
7575
./dist/*.whl
76+
- name: Create GitHub Release
77+
run: >-
78+
gh release create
79+
'${{ github.ref_name }}'
80+
--notes ""
7681
- name: Upload artifact signatures to GitHub Release
7782
env:
7883
GITHUB_TOKEN: ${{ github.token }}

0 commit comments

Comments
 (0)