Skip to content

Commit f4fd092

Browse files
ericsnowcurrentlyericsnowcurrently
authored
Merge branch '3.14' into 3.14-unrevert-use-pycode-getxidata
2 parents 1a5a117 + c6cc282 commit f4fd092

File tree

84 files changed

+1061
-333
lines changed

Some content is hidden

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

84 files changed

+1061
-333
lines changed

‎.github/workflows/tail-call.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,3 @@ jobs:
137137
CC=clang-20 ./configure --with-tail-call-interp --disable-gil
138138
make all --jobs 4
139139
./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
140-

‎.pre-commit-config.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,14 @@ repos:
4343
exclude: ^Lib/test/test_tomllib/
4444
- id: check-yaml
4545
- id: end-of-file-fixer
46-
types: [python]
46+
types_or: [python, yaml]
4747
exclude: Lib/test/tokenizedata/coding20731.py
48+
- id: end-of-file-fixer
49+
files: '^\.github/CODEOWNERS$'
4850
- id: trailing-whitespace
49-
types_or: [c, inc, python, rst]
51+
types_or: [c, inc, python, rst, yaml]
5052
- id: trailing-whitespace
51-
files: '\.(gram)$'
53+
files: '^\.github/CODEOWNERS|\.(gram)$'
5254

5355
- repo: https://github.com/python-jsonschema/check-jsonschema
5456
rev: 0.33.0

‎.readthedocs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,3 @@ build:
3232
- make -C Doc venv html
3333
- mkdir _readthedocs
3434
- mv Doc/build/html _readthedocs/html
35-

‎Include/patchlevel.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
#define PY_MINOR_VERSION 14
2222
#define PY_MICRO_VERSION 0
2323
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_BETA
24-
#define PY_RELEASE_SERIAL 1
24+
#define PY_RELEASE_SERIAL 2
2525

2626
/* Version as a string */
27-
#define PY_VERSION "3.14.0b1+"
27+
#define PY_VERSION "3.14.0b2+"
2828
/*--end constants--*/
2929

3030

0 commit comments

Comments
 (0)