Skip to content

Commit 018aae3

Browse files
committed
Merge branch 'main' into windows-add-sysconfig-abiflags
2 parents 5df9540 + 39fa19a commit 018aae3

4 files changed

Lines changed: 16 additions & 12 deletions

File tree

.github/CODEOWNERS

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,16 @@ Objects/exceptions.c @iritkatriel
107107
# Hashing & cryptographic primitives
108108
**/*hashlib* @gpshead @tiran @picnixz
109109
**/*hashopenssl* @gpshead @tiran @picnixz
110-
**/*pyhash* @gpshead @tiran
111-
**/sha* @gpshead @tiran @picnixz
112-
Modules/md5* @gpshead @tiran @picnixz
113-
**/*blake* @gpshead @tiran @picnixz
114-
Modules/_hacl/** @gpshead
110+
**/*pyhash* @gpshead @tiran @picnixz
111+
Modules/*blake* @gpshead @tiran @picnixz
112+
Modules/*md5* @gpshead @tiran @picnixz
113+
Modules/*sha* @gpshead @tiran @picnixz
114+
Modules/_hacl/** @gpshead @picnixz
115115
**/*hmac* @gpshead @picnixz
116116

117+
# libssl
118+
**/*ssl* @gpshead @picnixz
119+
117120
# logging
118121
**/*logging* @vsajip
119122

.github/workflows/tail-call.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ jobs:
112112
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
113113
brew install llvm@${{ matrix.llvm }}
114114
export SDKROOT="$(xcrun --show-sdk-path)"
115-
export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
116-
export PATH="/usr/local/opt/llvm/bin:$PATH"
115+
export PATH="/opt/homebrew/opt/llvm@${{ matrix.llvm }}/bin:$PATH"
116+
export PATH="/usr/local/opt/llvm@${{ matrix.llvm }}/bin:$PATH"
117117
CC=clang-19 ./configure --with-tail-call-interp
118118
make all --jobs 4
119119
./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3

Misc/ACKS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,6 +1911,7 @@ Matias Torchinsky
19111911
Sandro Tosi
19121912
Richard Townsend
19131913
David Townshend
1914+
Bénédikt Tran
19141915
Nathan Trapuzzano
19151916
Laurence Tratt
19161917
Alberto Trevino

PC/pyconfig.h.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@ WIN32 is still required for the locale module.
102102
/* #define Py_GIL_DISABLED 1 */
103103
#endif
104104

105+
// _DEBUG implies Py_DEBUG
106+
#ifdef _DEBUG
107+
#define Py_DEBUG
108+
#endif
109+
105110
/* Compiler specific defines */
106111

107112
/* ------------------------------------------------------------------------*/
@@ -289,11 +294,6 @@ typedef int pid_t;
289294
# include <stdio.h>
290295
#endif
291296

292-
// _DEBUG implies Py_DEBUG
293-
#ifdef _DEBUG
294-
# define Py_DEBUG
295-
#endif
296-
297297
/* 64 bit ints are usually spelt __int64 unless compiler has overridden */
298298
#ifndef PY_LONG_LONG
299299
# define PY_LONG_LONG __int64

0 commit comments

Comments
 (0)