Skip to content

Commit 44d535c

Browse files
committed
review feedback
1 parent aa84830 commit 44d535c

19 files changed

+196
-138
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ repos:
115115
# Hook to regenerate release schedules
116116
- id: "regen-schedules"
117117
name: "Regenerate release schedules from python-releases.toml"
118-
entry: "python -m release_engineering update-peps"
118+
entry: "python -m release_management update-peps"
119119
language: "python"
120-
files: "^release_engineering/"
120+
files: "^release_management/"
121121
pass_filenames: false
122122
require_serial: true

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ spellcheck: _ensure-pre-commit
110110
## regen-all to regenerate generated source files
111111
.PHONY: regen-all
112112
regen-all:
113-
$(PYTHON) -m release_engineering update-peps
113+
$(PYTHON) -m release_management update-peps
114114

115115
.PHONY: help
116116
help : Makefile

pep_sphinx_extensions/pep_zero_generator/pep_index_generator.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,14 @@
1919

2020
import json
2121
import os
22-
import sys
2322
from pathlib import Path
2423
from typing import TYPE_CHECKING
2524

2625
from pep_sphinx_extensions.pep_zero_generator import parser
2726
from pep_sphinx_extensions.pep_zero_generator import subindices
2827
from pep_sphinx_extensions.pep_zero_generator import writer
2928
from pep_sphinx_extensions.pep_zero_generator.constants import SUBINDICES_BY_TOPIC
30-
if sys.version_info >= (3, 11):
31-
from release_engineering.generate_release_cycle import create_release_cycle
32-
else:
33-
# this function uses tomllib, which requires Python 3.11+
34-
def create_release_cycle():
35-
return ''
29+
from release_management.serialise import create_release_cycle, create_release_json
3630

3731
if TYPE_CHECKING:
3832
from sphinx.application import Sphinx
@@ -83,3 +77,6 @@ def create_pep_zero(app: Sphinx, env: BuildEnvironment, docnames: list[str]) ->
8377

8478
release_cycle = create_release_cycle()
8579
app.outdir.joinpath('release-cycle.json').write_text(release_cycle, encoding="utf-8")
80+
81+
release_json = create_release_json()
82+
app.outdir.joinpath('python-releases.json').write_text(release_json, encoding="utf-8")

peps/pep-0569.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Release Schedule
5151
3.8.0 schedule
5252
--------------
5353

54-
.. feature release schedule
54+
.. release schedule: feature
5555
5656
Actual:
5757

@@ -68,12 +68,12 @@ Actual:
6868
- 3.8.0 candidate 1: Tuesday, 2019-10-01
6969
- 3.8.0 final: Monday, 2019-10-14
7070

71-
.. end of schedule
71+
.. release schedule: ends
7272
7373
Bugfix releases
7474
---------------
7575

76-
.. bugfix release schedule
76+
.. release schedule: bugfix
7777
7878
Actual:
7979

@@ -97,16 +97,16 @@ Actual:
9797
- 3.8.9 final: Friday, 2021-04-02
9898
(security hotfix)
9999
- 3.8.10 final: Monday, 2021-05-03
100-
(final regular bugfix release with binary installers)
100+
(Final regular bugfix release with binary installers)
101101

102-
.. end of schedule
102+
.. release schedule: ends
103103
104104
Source-only security fix releases
105105
---------------------------------
106106

107107
Provided irregularly on an "as-needed" basis until October 7th 2024.
108108

109-
.. security release schedule
109+
.. release schedule: security
110110
111111
- 3.8.11 final: Monday, 2021-06-28
112112
- 3.8.12 final: Monday, 2021-08-30
@@ -120,7 +120,7 @@ Provided irregularly on an "as-needed" basis until October 7th 2024.
120120
- 3.8.20 final: Friday, 2024-09-06
121121
(final security release)
122122

123-
.. end of schedule
123+
.. release schedule: ends
124124
125125
126126
Features for 3.8

peps/pep-0596.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Note: the dates below use a 17-month development period that results
4040
in a 12-month release cadence between feature versions, as defined by
4141
:pep:`602`.
4242

43-
.. feature release schedule
43+
.. release schedule: feature
4444
4545
Actual:
4646

@@ -61,13 +61,13 @@ Actual:
6161
- 3.9.0 candidate 2: Thursday, 2020-09-17
6262
- 3.9.0 final: Monday, 2020-10-05
6363

64-
.. end of schedule
64+
.. release schedule: ends
6565
6666
6767
Bugfix releases
6868
---------------
6969

70-
.. bugfix release schedule
70+
.. release schedule: bugfix
7171
7272
Actual:
7373

@@ -89,17 +89,17 @@ Actual:
8989
- 3.9.11 final: Wednesday, 2022-03-16
9090
- 3.9.12 final: Wednesday, 2022-03-23
9191
- 3.9.13 final: Tuesday, 2022-05-17
92-
(final regular bugfix release with binary installers)
92+
(Final regular bugfix release with binary installers)
9393

94-
.. end of schedule
94+
.. release schedule: ends
9595
9696
9797
Source-only security fix releases
9898
---------------------------------
9999

100100
Provided irregularly on an "as-needed" basis until October 2025.
101101

102-
.. security release schedule
102+
.. release schedule: security
103103
104104
- 3.9.14 final: Tuesday, 2022-09-06
105105
- 3.9.15 final: Tuesday, 2022-10-11
@@ -110,9 +110,9 @@ Provided irregularly on an "as-needed" basis until October 2025.
110110
- 3.9.20 final: Friday, 2024-09-06
111111
- 3.9.21 final: Tuesday, 2024-12-03
112112
- 3.9.22 final: Tuesday, 2025-04-08
113-
- 3.9.23: Tuesday, 2025-06-03
113+
- 3.9.23 final: Tuesday, 2025-06-03
114114

115-
.. end of schedule
115+
.. release schedule: ends
116116
117117
118118
3.9 Lifespan

peps/pep-0619.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Note: the dates below use a 17-month development period that results
3737
in a 12-month release cadence between feature versions, as defined by
3838
:pep:`602`.
3939

40-
.. feature release schedule
40+
.. release schedule: feature
4141
4242
Actual:
4343

@@ -58,12 +58,12 @@ Actual:
5858
- 3.10.0 candidate 2: Tuesday, 2021-09-07
5959
- 3.10.0 final: Monday, 2021-10-04
6060

61-
.. end of schedule
61+
.. release schedule: ends
6262
6363
Bugfix releases
6464
---------------
6565

66-
.. bugfix release schedule
66+
.. release schedule: bugfix
6767
6868
Actual:
6969

@@ -78,26 +78,26 @@ Actual:
7878
- 3.10.9 final: Tuesday, 2022-12-06
7979
- 3.10.10 final: Wednesday, 2023-02-08
8080
- 3.10.11 final: Wednesday, 2023-04-05
81-
(final regular bugfix release with binary installers)
81+
(Final regular bugfix release with binary installers)
8282

83-
.. end of schedule
83+
.. release schedule: ends
8484
8585
Source-only security fix releases
8686
---------------------------------
8787

8888
Provided irregularly on an "as-needed" basis until October 2026.
8989

90-
.. security release schedule
90+
.. release schedule: security
9191
9292
- 3.10.12 final: Tuesday, 2023-06-06
9393
- 3.10.13 final: Thursday, 2023-08-24
9494
- 3.10.14 final: Tuesday, 2024-03-19
9595
- 3.10.15 final: Saturday, 2024-09-07
9696
- 3.10.16 final: Tuesday, 2024-12-03
9797
- 3.10.17 final: Tuesday, 2025-04-08
98-
- 3.10.18: Tuesday, 2025-06-03
98+
- 3.10.18 final: Tuesday, 2025-06-03
9999

100-
.. end of schedule
100+
.. release schedule: ends
101101
102102
3.10 Lifespan
103103
-------------

peps/pep-0664.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Note: the dates below use a 17-month development period that results
3838
in a 12-month release cadence between feature versions, as defined by
3939
:pep:`602`.
4040

41-
.. feature release schedule
41+
.. release schedule: feature
4242
4343
Actual:
4444

@@ -60,12 +60,12 @@ Actual:
6060
- 3.11.0 candidate 2: Monday, 2022-09-12
6161
- 3.11.0 final: Monday, 2022-10-24
6262

63-
.. end of schedule
63+
.. release schedule: ends
6464
6565
Bugfix releases
6666
---------------
6767

68-
.. bugfix release schedule
68+
.. release schedule: bugfix
6969
7070
Actual:
7171

@@ -78,23 +78,23 @@ Actual:
7878
- 3.11.7 final: Monday, 2023-12-04
7979
- 3.11.8 final: Tuesday, 2024-02-06
8080
- 3.11.9 final: Tuesday, 2024-04-02
81-
(final regular bugfix release with binary installers)
81+
(Final regular bugfix release with binary installers)
8282

83-
.. end of schedule
83+
.. release schedule: ends
8484
8585
Source-only security fix releases
8686
---------------------------------
8787

8888
Provided irregularly on an "as-needed" basis until October 2027.
8989

90-
.. security release schedule
90+
.. release schedule: security
9191
9292
- 3.11.10 final: Saturday, 2024-09-07
9393
- 3.11.11 final: Tuesday, 2024-12-03
9494
- 3.11.12 final: Tuesday, 2025-04-08
95-
- 3.11.13: Tuesday, 2025-06-03
95+
- 3.11.13 final: Tuesday, 2025-06-03
9696

97-
.. end of schedule
97+
.. release schedule: ends
9898
9999
3.11 Lifespan
100100
-------------

peps/pep-0693.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Note: the dates below use a 17-month development period that results
3232
in a 12-month release cadence between feature versions, as defined by
3333
:pep:`602`.
3434

35-
.. feature release schedule
35+
.. release schedule: feature
3636
3737
Actual:
3838

@@ -54,12 +54,12 @@ Actual:
5454
- 3.12.0 candidate 3: Tuesday, 2023-09-19
5555
- 3.12.0 final: Monday, 2023-10-02
5656

57-
.. end of schedule
57+
.. release schedule: ends
5858
5959
Bugfix releases
6060
---------------
6161

62-
.. bugfix release schedule
62+
.. release schedule: bugfix
6363
6464
Actual:
6565

@@ -73,9 +73,9 @@ Actual:
7373
- 3.12.8 final: Tuesday, 2024-12-03
7474
- 3.12.9 final: Tuesday, 2025-02-04
7575
- 3.12.10 final: Tuesday, 2025-04-08
76-
(final regular bugfix release with binary installers)
76+
(Final regular bugfix release with binary installers)
7777

78-
.. end of schedule
78+
.. release schedule: ends
7979
8080
Source-only security fix releases
8181
---------------------------------

peps/pep-0719.rst

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Note: the dates below use a 17-month development period that results
3333
in a 12-month release cadence between feature versions, as defined by
3434
:pep:`602`.
3535

36-
.. feature release schedule
36+
.. release schedule: feature
3737
3838
Actual:
3939

@@ -54,34 +54,35 @@ Actual:
5454
- 3.13.0 candidate 3: Tuesday, 2024-10-01
5555
- 3.13.0 final: Monday, 2024-10-07
5656

57-
.. end of schedule
57+
.. release schedule: ends
5858
5959
Bugfix releases
6060
---------------
6161

62-
.. bugfix release schedule
62+
.. release schedule: bugfix
6363
6464
Actual:
6565

6666
- 3.13.1 final: Tuesday, 2024-12-03
6767
- 3.13.2 final: Tuesday, 2025-02-04
6868
- 3.13.3 final: Tuesday, 2025-04-08
69-
- 3.13.4: Tuesday, 2025-06-03
70-
- 3.13.5: Wednesday, 2025-06-11
69+
- 3.13.4 final: Tuesday, 2025-06-03
70+
- 3.13.5 final: Wednesday, 2025-06-11
71+
(hotfix)
7172

7273
Expected:
7374

74-
- 3.13.6: Tuesday, 2025-08-05
75-
- 3.13.7: Tuesday, 2025-10-07
76-
- 3.13.8: Tuesday, 2025-12-02
77-
- 3.13.9: Tuesday, 2026-02-03
78-
- 3.13.10: Tuesday, 2026-04-07
79-
- 3.13.11: Tuesday, 2026-06-09
80-
- 3.13.12: Tuesday, 2026-08-04
81-
- 3.13.13: Tuesday, 2026-10-06
82-
(final regular bugfix release with binary installers)
83-
84-
.. end of schedule
75+
- 3.13.6 final: Tuesday, 2025-08-05
76+
- 3.13.7 final: Tuesday, 2025-10-07
77+
- 3.13.8 final: Tuesday, 2025-12-02
78+
- 3.13.9 final: Tuesday, 2026-02-03
79+
- 3.13.10 final: Tuesday, 2026-04-07
80+
- 3.13.11 final: Tuesday, 2026-06-09
81+
- 3.13.12 final: Tuesday, 2026-08-04
82+
- 3.13.13 final: Tuesday, 2026-10-06
83+
(Final regular bugfix release with binary installers)
84+
85+
.. release schedule: ends
8586
8687
8788
Source-only security fix releases

peps/pep-0745.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The dates below use a 17-month development period that results
3333
in a 12-month release cadence between feature versions, as defined by
3434
:pep:`602`.
3535

36-
.. feature release schedule
36+
.. release schedule: feature
3737
3838
Actual:
3939

@@ -57,7 +57,7 @@ Expected:
5757
- 3.14.0 candidate 2: Tuesday, 2025-08-26
5858
- 3.14.0 final: Tuesday, 2025-10-07
5959

60-
.. end of schedule
60+
.. release schedule: ends
6161
6262
Subsequent bugfix releases every two months.
6363

0 commit comments

Comments
 (0)