Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
ncoghlan authored Aug 12, 2024
2 parents 28a57ac + 49b5935 commit 24a8bfa
Show file tree
Hide file tree
Showing 171 changed files with 19,918 additions and 4,495 deletions.
8 changes: 8 additions & 0 deletions .codespell/ignore-words.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
adaptee
ancilliary
ans
anull
arithmetics
asend
ba
ccompiler
clos
complies
crate
dedented
dota
extraversion
falsy
fo
groth
iif
implementor
implementors
nd
ned
re-usable
re-use
recuse
reenable
referencable
Expand Down
63 changes: 43 additions & 20 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
* @python/pep-editors

# PEP infrastructure
.github/dependabot.yml @hugovk
.github/workflows/ @AA-Turner @CAM-Gerlach
Makefile @AA-Turner
requirements.txt @AA-Turner
Makefile @AA-Turner @hugovk
requirements.txt @AA-Turner @hugovk
infra/ @ewdurbin

pep_sphinx_extensions/ @AA-Turner
Expand Down Expand Up @@ -44,12 +45,12 @@ peps/pep-0012.rst @brettcannon @warsaw
peps/pep-0012/ @brettcannon
# peps/pep-0013.rst is owned by the entire core team.
# ...
peps/pep-0020.rst @tim-one
#peps/pep-0020.rst
# ...
peps/pep-0042.rst @jeremyhylton
# ...
peps/pep-0100.rst @malemburg
peps/pep-0101.rst @Yhg1s @pablogsal @ambv @ned-deily
peps/pep-0101.rst @hugovk @Yhg1s @pablogsal @ambv @ned-deily
peps/pep-0102.rst @warsaw @gvanrossum
# peps/pep-0103.rst
# ...
Expand Down Expand Up @@ -78,7 +79,7 @@ peps/pep-0218.rst @rhettinger
# peps/pep-0220.rst
peps/pep-0221.rst @Yhg1s
# peps/pep-0222.rst
peps/pep-0223.rst @tim-one
# peps/pep-0223.rst
peps/pep-0224.rst @malemburg
# peps/pep-0225.rst
peps/pep-0226.rst @jeremyhylton
Expand All @@ -90,8 +91,8 @@ peps/pep-0231.rst @warsaw
peps/pep-0232.rst @warsaw
# peps/pep-0233.rst
peps/pep-0234.rst @gvanrossum
peps/pep-0235.rst @tim-one
peps/pep-0236.rst @tim-one
# peps/pep-0235.rst
# peps/pep-0236.rst
peps/pep-0237.rst @gvanrossum
peps/pep-0238.rst @gvanrossum
# peps/pep-0239.rst
Expand All @@ -110,7 +111,7 @@ peps/pep-0251.rst @warsaw @gvanrossum
peps/pep-0252.rst @gvanrossum
peps/pep-0253.rst @gvanrossum
peps/pep-0254.rst @gvanrossum
peps/pep-0255.rst @nascheme @tim-one
peps/pep-0255.rst @nascheme
# peps/pep-0256.rst
peps/pep-0257.rst @gvanrossum
# peps/pep-0258.rst
Expand Down Expand Up @@ -153,15 +154,15 @@ peps/pep-0293.rst @doerwalter
# peps/pep-0295.rst
# peps/pep-0296.rst
peps/pep-0297.rst @malemburg
peps/pep-0298.rst @theller
# peps/pep-0298.rst
# peps/pep-0299.rst
# peps/pep-0301.rst
peps/pep-0302.rst @pfmoore
# peps/pep-0303.rst
# peps/pep-0304.rst
# peps/pep-0305.rst
peps/pep-0306.rst @jackdied @ncoghlan @benjaminp
peps/pep-0307.rst @gvanrossum @tim-one
peps/pep-0307.rst @gvanrossum
peps/pep-0308.rst @gvanrossum @rhettinger
# peps/pep-0309.rst
peps/pep-0310.rst @pfmoore
Expand Down Expand Up @@ -353,17 +354,17 @@ peps/pep-0490.rst @vstinner
peps/pep-0492.rst @1st1
peps/pep-0493.rst @ncoghlan @malemburg
peps/pep-0494.rst @ned-deily
peps/pep-0495.rst @abalkin @tim-one
peps/pep-0495-gap.png @abalkin @tim-one
peps/pep-0495-gap.svg @abalkin @tim-one
peps/pep-0495-fold.svg @abalkin @tim-one
peps/pep-0495-fold-2.png @abalkin @tim-one
peps/pep-0495-daylightsavings.png @abalkin @tim-one
peps/pep-0495.rst @abalkin
peps/pep-0495-gap.png @abalkin
peps/pep-0495-gap.svg @abalkin
peps/pep-0495-fold.svg @abalkin
peps/pep-0495-fold-2.png @abalkin
peps/pep-0495-daylightsavings.png @abalkin
# peps/pep-0496.rst
# peps/pep-0497.rst
peps/pep-0498.rst @ericvsmith
# peps/pep-0499.rst
peps/pep-0500.rst @abalkin @tim-one
peps/pep-0500.rst @abalkin
peps/pep-0501.rst @ncoghlan
# peps/pep-0502.rst
peps/pep-0503.rst @dstufft
Expand Down Expand Up @@ -441,7 +442,7 @@ peps/pep-0568.rst @njsmith
peps/pep-0569.rst @ambv
peps/pep-0570.rst @larryhastings @pablogsal
# peps/pep-0571.rst
peps/pep-0572.rst @tim-one @gvanrossum
peps/pep-0572.rst @gvanrossum
peps/pep-0573.rst @encukou @ncoghlan @ericsnowcurrently
peps/pep-0574.rst @pitrou
# peps/pep-0575.rst
Expand Down Expand Up @@ -606,16 +607,38 @@ peps/pep-0724.rst @jellezijlstra
peps/pep-0725.rst @pradyunsg
peps/pep-0726.rst @AA-Turner
peps/pep-0727.rst @JelleZijlstra
peps/pep-0728.rst @JelleZijlstra
peps/pep-0729.rst @JelleZijlstra @hauntsaninja
peps/pep-0730.rst @ned-deily
peps/pep-0731.rst @gvanrossum @encukou @vstinner @zooba @iritkatriel
peps/pep-0731.rst @encukou @vstinner @zooba @erlend-aasland @serhiy-storchaka @mdboom
peps/pep-0732.rst @Mariatta
peps/pep-0733.rst @encukou @vstinner @zooba @iritkatriel
peps/pep-0734.rst @ericsnowcurrently
peps/pep-0735.rst @brettcannon
peps/pep-0736.rst @Rosuav
peps/pep-0737.rst @vstinner
peps/pep-0738.rst @encukou
peps/pep-0740.rst @dstufft
peps/pep-0741.rst @vstinner
peps/pep-0742.rst @JelleZijlstra
peps/pep-0743.rst @vstinner @encukou
peps/pep-0744.rst @brandtbucher @savannahostrowski
peps/pep-0745.rst @hugovk
peps/pep-0746.rst @JelleZijlstra
peps/pep-0747.rst @JelleZijlstra
# ...
peps/pep-0749.rst @JelleZijlstra
# ...
peps/pep-0750.rst @gvanrossum @lysnikolaou
peps/pep-0751.rst @brettcannon
# ...
# peps/pep-0754.rst
# ...
peps/pep-0789.rst @njsmith
# ...
peps/pep-0801.rst @warsaw
# ...
peps/pep-2026.rst @hugovk
peps/pep-3000.rst @gvanrossum
peps/pep-3001.rst @birkenfeld
# peps/pep-3002.rst
Expand Down Expand Up @@ -685,7 +708,7 @@ peps/pep-3156.rst @gvanrossum
# peps/pep-3333.rst
# ...
peps/pep-8000.rst @warsaw
peps/pep-8001.rst @brettcannon @tiran @dstufft @ericsnowcurrently @gpshead @ambv @Mariatta @njsmith @pablogsal @rhettinger @taleinat @tim-one @zware
peps/pep-8001.rst @brettcannon @tiran @dstufft @ericsnowcurrently @gpshead @ambv @Mariatta @njsmith @pablogsal @rhettinger @taleinat @zware
peps/pep-8002.rst @warsaw @ambv @pitrou @dhellmann @willingc
peps/pep-8010.rst @warsaw
peps/pep-8011.rst @Mariatta @warsaw
Expand Down
4 changes: 3 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE/Mark a PEP Final.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ If you're unsure about something, just leave it blank and we'll take a look.
* [ ] Any substantial changes since the accepted version approved by the SC/PEP delegate
* [ ] Pull request title in appropriate format (``PEP 123: Mark Final``)
* [ ] ``Status`` changed to ``Final`` (and ``Python-Version`` is correct)
* [ ] Canonical docs/spec linked with a ``canonical-doc`` directive (or ``canonical-pypa-spec``, for packaging PEPs)
* [ ] Canonical docs/spec linked with a ``canonical-doc`` directive
(or ``canonical-pypa-spec`` for packaging PEPs,
or ``canonical-typing-spec`` for typing PEPs)
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: monthly
groups:
actions:
patterns:
- "*"
15 changes: 6 additions & 9 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Lint PEPs

on:
push:
pull_request:
workflow_dispatch:
on: [push, pull_request, workflow_dispatch]

permissions:
contents: read
Expand All @@ -24,16 +21,16 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python 3
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"
cache: pip

- name: Run pre-commit hooks
uses: pre-commit/[email protected].0
uses: pre-commit/[email protected].1

- name: Check spelling
uses: pre-commit/[email protected].0
uses: pre-commit/[email protected].1
with:
extra_args: --all-files --hook-stage manual codespell || true

Expand All @@ -42,9 +39,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3"

Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/render.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Render PEPs

on:
push:
pull_request:
workflow_dispatch:
on: [push, pull_request, workflow_dispatch]

permissions:
contents: read
Expand Down Expand Up @@ -35,7 +32,7 @@ jobs:
fetch-depth: 0 # fetch all history so that last modified date-times are accurate

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: pip
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,18 @@ jobs:
- "windows-latest"
- "macos-latest"
- "ubuntu-latest"
# Python 3.9 is on macos-13 but not macos-latest (macos-14-arm64)
# https://github.com/actions/setup-python/issues/696#issuecomment-1637587760
exclude:
- { python-version: "3.9", os: "macos-latest" }
include:
- { python-version: "3.9", os: "macos-13" }


steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: pip
Expand All @@ -60,7 +67,7 @@ jobs:
tox -e py -- -v --cov-report term
- name: Upload coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
flags: ${{ matrix.os }}
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ default_stages: [commit]
repos:
# General file checks and fixers
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.6.0
hooks:
- id: mixed-line-ending
name: "Normalize mixed line endings"
Expand Down Expand Up @@ -42,18 +42,18 @@ repos:
- id: check-yaml
name: "Check YAML"

- repo: https://github.com/psf/black
rev: 23.7.0
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 24.4.2
hooks:
- id: black
name: "Format with Black"
args:
- '--target-version=py39'
- '--target-version=py310'
files: 'pep_sphinx_extensions/tests/.*'
files: '^(peps/conf\.py|pep_sphinx_extensions/tests/.*)$'

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.287
rev: v0.5.1
hooks:
- id: ruff
name: "Lint with Ruff"
Expand All @@ -68,7 +68,7 @@ repos:
name: "Format tox.ini"

- repo: https://github.com/sphinx-contrib/sphinx-lint
rev: v0.6.8
rev: v0.9.1
hooks:
- id: sphinx-lint
name: "Sphinx lint"
Expand All @@ -89,7 +89,7 @@ repos:

# Manual codespell check
- repo: https://github.com/codespell-project/codespell
rev: v2.2.5
rev: v2.3.0
hooks:
- id: codespell
name: "Check for common misspellings in text files"
Expand Down
22 changes: 22 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
# Project page: https://readthedocs.org/projects/pep-previews/

version: 2

build:
os: ubuntu-22.04
tools:
python: "3"

commands:
- asdf plugin add uv
- asdf install uv latest
- asdf global uv latest
- make dirhtml JOBS=$(nproc) BUILDDIR=_readthedocs/html

sphinx:
builder: dirhtml

search:
ignore: ['*']
8 changes: 4 additions & 4 deletions .ruff.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
output-format = "full"
target-version = "py39"

[lint]
ignore = [
"E501", # Line too long
]
Expand All @@ -9,7 +13,3 @@ select = [
"PT", # flake8-pytest-style
"W", # pycodestyle warnings
]

show-source = true

target-version = "py39"
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ this link**, as it does not provide the option to populate the PR template.

However, you *can* use the ``gh`` command line tool. ``gh pr create`` will allow
you to create a pull request, will prompt you for the template you wish to use,
and then give you the option of continuing editing in your broswer.
and then give you the option of continuing editing in your browser.

Alternatively, after pushing your branch, you can visit
`https://github.com/python/peps <https://github.com/python/peps>`__, and follow
Expand Down
Loading

0 comments on commit 24a8bfa

Please sign in to comment.